Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/ive/ImageLayer.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgPlugins/ive/ImageLayer.cpp
r12292 r13041 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 1 /* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2008 Robert Osfield 2 2 * 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 3 * This library is open source and may be redistributed and/or modified under 4 * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 5 5 * (at your option) any later version. The full license is in LICENSE file 6 6 * included with this distribution, and on the openscenegraph.org website. 7 * 7 * 8 8 * This library is distributed in the hope that it will be useful, 9 9 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 11 * OpenSceneGraph Public License for more details. 12 12 */ … … 50 50 if (id != IVEIMAGELAYER) 51 51 in_THROW_EXCEPTION("ImageLayer::read(): Expected ImageLayer identification."); 52 52 53 53 // Read Layer's identification. 54 54 id = in->readInt(); … … 62 62 63 63 64 bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ? 64 bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ? 65 65 osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false; 66 66 67 67 // Should we read image data from stream 68 68 IncludeImageMode includeImg = (IncludeImageMode)in->readChar(); 69 69 70 70 if (includeImg==IMAGE_REFERENCE_FILE && deferExternalLayerLoading) 71 71 {
