Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/quicktime/ReaderWriterQT.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/osgPlugins/quicktime/ReaderWriterQT.cpp (modified) (19 diffs)

OpenSceneGraph/trunk/src/osgPlugins/quicktime/ReaderWriterQT.cpp

@@ -44 +44 @@
 
     // This class is used as a helper to de-initialize
-    // properly quicktime, when the last media loaded 
-    // with the quicktime plugin is released. 
-    // All loaded media must be added to the observer 
-    // (see ReaderWriterQT::readImage() function) 
+    // properly quicktime, when the last media loaded
+    // with the quicktime plugin is released.
+    // All loaded media must be added to the observer
+    // (see ReaderWriterQT::readImage() function)
     class QuicktimeInitializer : public osg::Observer
     {
     public:
 
-       QuicktimeInitializer (): 
+       QuicktimeInitializer ():
           _instanceCount(0),
              _setup(false)
@@ -59 +59 @@
           virtual ~QuicktimeInitializer()
           {
-             // When we get here, the exit() function 
-             // should have been called, when last media was released. 
-             // In case no media has been added after initialization, 
+             // When we get here, the exit() function
+             // should have been called, when last media was released.
+             // In case no media has been added after initialization,
              // let's perform an extra check
              if (_setup && _instanceCount == 0)
@@ -75 +75 @@
           }
 
-          virtual void objectDeleted(void*) 
+          virtual void objectDeleted(void*)
           {
              -- _instanceCount;
@@ -142 +142 @@
 
         supportsExtension("live","Live video streaming");
-        
+
         supportsProtocol("http", "streaming media per http");
         supportsProtocol("rtsp", "streaming media per rtsp");
@@ -184 +184 @@
    virtual bool acceptsLiveExtension(const std::string& extension) const
    {
-       return osgDB::equalCaseInsensitive(extension,"live");     
+       return osgDB::equalCaseInsensitive(extension,"live");
    }
 
@@ -194 +194 @@
 
          #ifdef QT_HANDLE_IMAGES_ALSO
-         osgDB::equalCaseInsensitive(extension,"jpg") || 
+         osgDB::equalCaseInsensitive(extension,"jpg") ||
          osgDB::equalCaseInsensitive(extension,"jpeg") ||
-         osgDB::equalCaseInsensitive(extension,"tif") ||               
-         osgDB::equalCaseInsensitive(extension,"tiff") || 
+         osgDB::equalCaseInsensitive(extension,"tif") ||
+         osgDB::equalCaseInsensitive(extension,"tiff") ||
          osgDB::equalCaseInsensitive(extension,"gif") ||
          osgDB::equalCaseInsensitive(extension,"png") ||
@@ -204 +204 @@
          osgDB::equalCaseInsensitive(extension,"tga") ||
          osgDB::equalCaseInsensitive(extension,"psd") ||
-         #endif 
+         #endif
 
          acceptsMovieExtension(extension) ||
@@ -217 +217 @@
          return readImage(osgDB::getNameLessExtension(file),options);
       }
-      
+
       if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
 
@@ -282 +282 @@
               if (num_video_components)
               {
-                  // Note from Riccardo Corsi 
+                  // Note from Riccardo Corsi
                   // Quicktime initialization is done here, when a media is found
-                  // and before any image or movie is loaded. 
-                  // After the first call the function does nothing. 
+                  // and before any image or movie is loaded.
+                  // After the first call the function does nothing.
                   // The cleaning up is left to the QuicktimeInitializer (see below)
                   _qtExitObserver.init();
@@ -306 +306 @@
       // only find the file if it isn't a URL
       std::string fileName = file;
-      
-      
-      // Note from Riccardo Corsi 
+
+
+      // Note from Riccardo Corsi
       // Quicktime initialization is done here, when a media is found
-      // and before any image or movie is loaded. 
-      // After the first call the function does nothing. 
+      // and before any image or movie is loaded.
+      // After the first call the function does nothing.
       // The cleaning up is left to the QuicktimeInitializer (see below)
       _qtExitObserver.init();
@@ -324 +324 @@
             if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
          }
-         
+
          // note from Robert Osfield when integrating, we should probably have so
          // error handling mechanism here.  Possibly move the load from
@@ -338 +338 @@
          return moov;
       }
-        
-        
+
+
         // no live-video, no movie-file, so try to load as an image
-        
+
         fileName = osgDB::findDataFile( file,  options);
         if (fileName.empty()) return ReadResult::FILE_NOT_FOUND;
-            
+
         QuicktimeImportExport importer;
 
@@ -364 +364 @@
       return image.release();
    }
-   
-    virtual ReadResult readImage (std::istream& is, const osgDB::ReaderWriter::Options* options=NULL) const 
+
+    virtual ReadResult readImage (std::istream& is, const osgDB::ReaderWriter::Options* options=NULL) const
     {
         std::string filename = "";
         long sizeHint(0);
-        // check options for a file-type-hint 
+        // check options for a file-type-hint
         if (options) {
             std::istringstream iss(options->getOptionString());
             std::string opt;
-            while (iss >> opt) 
+            while (iss >> opt)
             {
                 int index = opt.find( "=" );
@@ -390 +390 @@
 
         _qtExitObserver.init();
-        
+
         QuicktimeImportExport importer;
         osg::ref_ptr<osg::Image> image = importer.readFromStream(is, filename, sizeHint);
-        
+
         if (!importer.success() || (image == NULL)) {
             OSG_WARN << "Error reading from stream "  << importer.getLastErrorString() << std::endl;
@@ -400 +400 @@
         _qtExitObserver.addMedia(image.get());
         return image.release();
-        
+
     }
 
@@ -422 +422 @@
         extmap.insert(std::pair<std::string, OSType>("psd",  kQTFileTypePhotoShop));
         extmap.insert(std::pair<std::string, OSType>("sgi",  kQTFileTypeSGIImage));
-        
+
         std::map<std::string, OSType>::iterator cur = extmap.find(ext);
 
@@ -430 +430 @@
 
         osgDB::ofstream os(fileName.c_str(), std::ios::binary | std::ios::trunc | std::ios::out);
-        if(os.good()) 
+        if(os.good())
         {
             QuicktimeImportExport exporter;
             exporter.writeToStream(os, const_cast<osg::Image*>(&img), fileName);
-            
-            if (exporter.success()) 
+
+            if (exporter.success())
                 return WriteResult::FILE_SAVED;
-        } 
-
-        return WriteResult::ERROR_IN_WRITING_FILE; 
+        }
+
+        return WriteResult::ERROR_IN_WRITING_FILE;
     }
-   
+
     virtual WriteResult writeImage (const osg::Image& img, std::ostream& os, const Options* options=NULL) const
     {
         std::string filename = "file.jpg"; // use jpeg if not otherwise specified
-        
+
         if (options) {
             std::istringstream iss(options->getOptionString());
             std::string opt;
-            while (iss >> opt) 
+            while (iss >> opt)
             {
                 int index = opt.find( "=" );
@@ -459 +459 @@
             }
         }
-        
+
         _qtExitObserver.init();
 
         QuicktimeImportExport exporter;
         exporter.writeToStream(os, const_cast<osg::Image*>(&img), filename);
-            
-        if (exporter.success()) 
+
+        if (exporter.success())
             return WriteResult::FILE_SAVED;
-        
-        return WriteResult::ERROR_IN_WRITING_FILE;         
+
+        return WriteResult::ERROR_IN_WRITING_FILE;
     }
 
@@ -495 +495 @@
       r->addFileExtensionAlias("dv",   "qt");
       r->addFileExtensionAlias("mp4",  "qt");
-      r->addFileExtensionAlias("m4v",  "qt");         
+      r->addFileExtensionAlias("m4v",  "qt");
       #endif
    }