Changeset 8712

Timestamp:

08/04/08 11:05:29 (5 years ago)

Author:

robert

Message:

From Ulrich Hertlien, "attached is a patch to src/osgPlugins/quicktime/QTImportExport.cpp that fixes loading images using the quicktime loader. Also fixes some minor bugs like uninitialized variables and incorrect deletes.

I'm a bit puzzled why this didn't pop up for more people as it's quite severe: basically the filename was never set!""

Files:

• OpenSceneGraph/trunk/src/osgPlugins/quicktime/QTImportExport.cpp (modified) (8 diffs)

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

@@ -248 +248 @@
      // Convert From CString in filename to a PascalString in pstr
      if (filename.length() > 255) {
-         CopyCStringToPascal(filename.c_str(), pstr);
          //hmm...not good, pascal string limit is 255!
          //do some error handling maybe?!
+         throw QTImportExportException(0, "filename length limit exceeded");
      }
+     CopyCStringToPascal(filename.c_str(), pstr);
  
     // Add filename extension
@@ -283 +284 @@
     int depth = 32;
     unsigned int xsize, ysize;
-    unsigned char* imageData;
+    unsigned char* imageData = 0;
     
     // Data Handle for file data ( & load data from file )
@@ -360 +361 @@
         DisposeHandle(dataRef);
     } 
-    catch (QTImportExportException e) 
+    catch (QTImportExportException& e) 
     {
         setError(e.what());
@@ -384 +385 @@
 
     
+    unsigned int bytesPerPixel = depth / 8;
     unsigned int glpixelFormat;
-            
-    switch(depth >> 3) {
+    switch(bytesPerPixel) {
         case 3 :
             glpixelFormat = GL_RGB;
@@ -394 +395 @@
             break;
         default :
-            delete imageData;
+            delete[] imageData;
             setError("unknown pixelformat");
             return NULL;
@@ -400 +401 @@
     }
     
-    unsigned char* swizzled = pepareBufferForOSG(imageData, depth >> 3, xsize, ysize);
+    unsigned char* swizzled = pepareBufferForOSG(imageData, bytesPerPixel, xsize, ysize);
     
     delete[] imageData;
@@ -407 +408 @@
     image->setFileName(fileTypeHint.c_str());
     image->setImage(xsize,ysize,1,
-        depth >> 3,
+        bytesPerPixel,
         glpixelFormat,
         GL_UNSIGNED_BYTE,
@@ -511 +512 @@
     
     
-    catch (QTImportExportException e) 
+    catch (QTImportExportException& e) 
     {
         setError(e.what());