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

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/ive/ReaderWriterIVE.cpp

    r11493 r13041  
    1515{ 
    1616    public: 
    17      
     17 
    1818        ReaderWriterIVE() 
    1919        { 
     
    3131            supportsOption("OutputTextureFiles","Write out the texture images to file"); 
    3232        } 
    33      
     33 
    3434        virtual const char* className() const { return "IVE Reader/Writer"; } 
    3535 
     
    5858            return readImage(istream, local_opt.get()); 
    5959        } 
    60          
     60 
    6161        virtual ReadResult readNode(const std::string& file, const Options* options) const 
    6262        { 
     
    6767            if (fileName.empty()) return ReadResult::FILE_NOT_FOUND; 
    6868 
    69             // code for setting up the database path so that internally referenced file are searched for on relative paths.  
     69            // code for setting up the database path so that internally referenced file are searched for on relative paths. 
    7070            osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options; 
    7171            local_opt->getDatabasePathList().push_front(osgDB::getFilePath(fileName)); 
     
    7474            return readNode(istream,local_opt.get()); 
    7575        } 
    76          
     76 
    7777        virtual ReadResult readObject(std::istream& fin, const Options* options) const 
    7878        { 
     
    8383        { 
    8484            ive::DataInputStream in(&fin, options); 
    85             if (in.getException())  
     85            if (in.getException()) 
    8686            { 
    8787                return in.getException()->getError(); 
     
    9595            // Create datainputstream. 
    9696            ive::DataInputStream in(&fin, options); 
    97             if (in.getException())  
     97            if (in.getException()) 
    9898            { 
    9999                return in.getException()->getError(); 
     
    116116            std::string ext = getFileExtension(fileName); 
    117117            if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED; 
    118             // code for setting up the database path so that internally referenced file are searched for on relative paths.  
     118            // code for setting up the database path so that internally referenced file are searched for on relative paths. 
    119119            osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options; 
    120120            if(local_opt->getDatabasePathList().empty()) 
     
    135135            if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED; 
    136136 
    137             // code for setting up the database path so that internally referenced file are searched for on relative paths.  
     137            // code for setting up the database path so that internally referenced file are searched for on relative paths. 
    138138            osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options; 
    139139            if(local_opt->getDatabasePathList().empty()) 
     
    144144            osgDB::ofstream fout(fileName.c_str(), std::ios::out | std::ios::binary); 
    145145            if (!fout) return WriteResult::ERROR_IN_WRITING_FILE; 
    146      
     146 
    147147            WriteResult result = writeNode(node, fout, local_opt.get()); 
    148148            fout.close(); 
    149149            return result; 
    150150        } 
    151          
     151 
    152152        virtual WriteResult writeObject(const Object& object,std::ostream& fout, const osgDB::ReaderWriter::Options* options) const 
    153153        { 
     
    164164            out.writeImage(ive::IMAGE_INCLUDE_DATA, const_cast<osg::Image*>(&image)); 
    165165            if (fout.fail()) return WriteResult::ERROR_IN_WRITING_FILE; 
    166             if (out.getException())  
     166            if (out.getException()) 
    167167            { 
    168168                OSG_WARN<<"Error writing IVE image: "<< out.getException()->getError() << std::endl; 
     
    179179 
    180180            if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE; 
    181             if (out.getException())  
     181            if (out.getException()) 
    182182            { 
    183183                OSG_WARN<<"Error writing IVE image: "<< out.getException()->getError() << std::endl;