Changeset 13041 for OpenSceneGraph/trunk/src/osgWrappers/serializers/osgTerrain/ImageLayer.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgWrappers/serializers/osgTerrain/ImageLayer.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgWrappers/serializers/osgTerrain/ImageLayer.cpp

@@ -11 +11 @@
 
 static bool readImage( osgDB::InputStream& is, osgTerrain::ImageLayer& il )
-{      
-            
-    if(!is.isBinary()) is >> osgDB::BEGIN_BRACKET;    
+{
 
-    bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ? 
-            osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false;          
+    if(!is.isBinary()) is >> osgDB::BEGIN_BRACKET;
 
-    
+    bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ?
+            osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false;
+
+
     osg::ref_ptr<osg::Image> image = is.readImage(!deferExternalLayerLoading);
     if (image.valid())
     {
-        if(image->valid()) 
+        if(image->valid())
         {
-            il.setImage(image.get());          
-        } 
-    } 
-    if(!is.isBinary()) is >> osgDB::END_BRACKET;        
+            il.setImage(image.get());
+        }
+    }
+    if(!is.isBinary()) is >> osgDB::END_BRACKET;
 
    return true;
@@ -33 +33 @@
 
 static bool writeImage( osgDB::OutputStream& os, const osgTerrain::ImageLayer& il )
-{ 
-    const osg::Image* image = il.getImage();   
+{
+    const osg::Image* image = il.getImage();
 
-    if(!os.isBinary()) os << osgDB::BEGIN_BRACKET << std::endl;                
+    if(!os.isBinary()) os << osgDB::BEGIN_BRACKET << std::endl;
     os.writeImage(image);
-    if(!os.isBinary()) os << osgDB::END_BRACKET << std::endl; 
-          
-    return true;  
+    if(!os.isBinary()) os << osgDB::END_BRACKET << std::endl;
+
+    return true;
 }
 
@@ -47 +47 @@
                          osgTerrain::ImageLayer,
                          "osg::Object osgTerrain::Layer osgTerrain::ImageLayer" )
-{    
-   ADD_USER_SERIALIZER( Image );   
+{
+   ADD_USER_SERIALIZER( Image );
 }