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

OpenSceneGraph/trunk/src/osgPlugins/png/ReaderWriterPNG.cpp

@@ -41 +41 @@
         _message += message;
     }
-    friend std::ostream& operator<<(std::ostream& stream, const PNGError& err) 
+    friend std::ostream& operator<<(std::ostream& stream, const PNGError& err)
     {
         stream << err._message;
@@ -89 +89 @@
             supportsExtension("png","PNG Image format");
         }
-        
+
         virtual const char* className() const { return "PNG Image Reader/Writer"; }
 
@@ -121 +121 @@
                 case(GL_BGR): color = PNG_COLOR_TYPE_RGB; png_set_bgr(png); break;
                 case(GL_BGRA): color = PNG_COLOR_TYPE_RGB_ALPHA; png_set_bgr(png); break;
-                default: return WriteResult::ERROR_IN_WRITING_FILE; break;                
+                default: return WriteResult::ERROR_IN_WRITING_FILE; break;
             }
 
@@ -169 +169 @@
             png_uint_32 i;
             png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- 
+
             // Set custom error handlers
             png_set_error_fn(png, png_get_error_ptr(png), user_error_fn, user_warning_fn);
@@ -285 +285 @@
                   case(PNG_COLOR_TYPE_PALETTE): pixelFormat = GL_RGB; break;
                   case(PNG_COLOR_TYPE_RGB_ALPHA): pixelFormat = GL_RGBA; break;
-                  default: break;                
+                  default: break;
                 }
 
@@ -302 +302 @@
                 //    delete [] data;
 
-                if (pixelFormat==0) 
+                if (pixelFormat==0)
                     return ReadResult::FILE_NOT_HANDLED;
 
@@ -309 +309 @@
                 pOsgImage->setImage(width, height, 1,
                     internalFormat,
-                    pixelFormat, 
+                    pixelFormat,
                     dataType,
                     data,