Show
Ignore:
Timestamp:
03/21/12 18:36:20 (3 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgWrappers/serializers/osgTerrain/ImageLayer.cpp

    r12292 r13041  
    1111 
    1212static bool readImage( osgDB::InputStream& is, osgTerrain::ImageLayer& il ) 
    13 {       
    14              
    15     if(!is.isBinary()) is >> osgDB::BEGIN_BRACKET;     
     13{ 
    1614 
    17     bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ?  
    18             osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false;           
     15    if(!is.isBinary()) is >> osgDB::BEGIN_BRACKET; 
    1916 
    20      
     17    bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ? 
     18            osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false; 
     19 
     20 
    2121    osg::ref_ptr<osg::Image> image = is.readImage(!deferExternalLayerLoading); 
    2222    if (image.valid()) 
    2323    { 
    24         if(image->valid())  
     24        if(image->valid()) 
    2525        { 
    26             il.setImage(image.get());           
    27         }  
    28     }  
    29     if(!is.isBinary()) is >> osgDB::END_BRACKET;         
     26            il.setImage(image.get()); 
     27        } 
     28    } 
     29    if(!is.isBinary()) is >> osgDB::END_BRACKET; 
    3030 
    3131   return true; 
     
    3333 
    3434static bool writeImage( osgDB::OutputStream& os, const osgTerrain::ImageLayer& il ) 
    35 {  
    36     const osg::Image* image = il.getImage();    
     35{ 
     36    const osg::Image* image = il.getImage(); 
    3737 
    38     if(!os.isBinary()) os << osgDB::BEGIN_BRACKET << std::endl;                 
     38    if(!os.isBinary()) os << osgDB::BEGIN_BRACKET << std::endl; 
    3939    os.writeImage(image); 
    40     if(!os.isBinary()) os << osgDB::END_BRACKET << std::endl;  
    41            
    42     return true;   
     40    if(!os.isBinary()) os << osgDB::END_BRACKET << std::endl; 
     41 
     42    return true; 
    4343} 
    4444 
     
    4747                         osgTerrain::ImageLayer, 
    4848                         "osg::Object osgTerrain::Layer osgTerrain::ImageLayer" ) 
    49 {     
    50    ADD_USER_SERIALIZER( Image );    
     49{ 
     50   ADD_USER_SERIALIZER( Image ); 
    5151}