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

OpenSceneGraph/trunk/src/osgPlugins/tiff/ReaderWriterTIFF.cpp

@@ -348 +348 @@
         unsigned short *ptr1 = (unsigned short *)ptr;
         unsigned short *data1 = (unsigned short *)data;
-        
+
         while (n--)
         {
@@ -359 +359 @@
         float *ptr1 = (float *)ptr;
         float *data1 = (float *)data;
-        
+
         while (n--)
         {
@@ -405 +405 @@
         unsigned short *green1 = (unsigned short *)green;
         unsigned short *blue1 = (unsigned short *)blue;
-        
+
         while (n--)
         {
@@ -420 +420 @@
         float *green1 = (float *)green;
         float *blue1 = (float *)blue;
-        
+
         while (n--)
         {
@@ -453 +453 @@
         unsigned short *blue1 = (unsigned short *)blue;
         unsigned short *alpha1 = (unsigned short *)alpha;
-        
+
         while (n--)
         {
@@ -469 +469 @@
         float *blue1 = (float *)blue;
         float *alpha1 = (float *)alpha;
-        
+
         while (n--)
         {
@@ -596 +596 @@
         return NULL;
     }
-    
+
     if (TIFFGetField(in, TIFFTAG_IMAGEWIDTH, &w) != 1 ||
         TIFFGetField(in, TIFFTAG_IMAGELENGTH, &h) != 1 ||
@@ -606 +606 @@
     }
 
-        
+
     TIFFGetField(in, TIFFTAG_DATATYPE, &dataType);
     OSG_INFO<<"TIFFTAG_DATATYPE="<<dataType<<std::endl;
@@ -621 +621 @@
     // so set format to 3.
     if (photometric == PHOTOMETRIC_PALETTE)
-        format = 3; 
+        format = 3;
     else
         format = samplesperpixel * bitspersample / 8;
-    
-    
+
+
     int bytespersample = bitspersample / 8;
     int bytesperpixel = bytespersample * samplesperpixel;
-    
+
     OSG_INFO<<"format="<<format<<std::endl;
     OSG_INFO<<"bytespersample="<<bytespersample<<std::endl;
     OSG_INFO<<"bytesperpixel="<<bytesperpixel<<std::endl;
-    
+
     buffer = new unsigned char [w*h*format];
 
@@ -768 +768 @@
 {
     public:
-    
+
         ReaderWriterTIFF()
         {
@@ -774 +774 @@
             supportsExtension("tif","Tiff image format");
         }
-        
+
         virtual const char* className() const { return "TIFF Image Reader"; }
         virtual bool acceptsExtension(const std::string& extension) const
-        { 
+        {
             if( osgDB::equalCaseInsensitive(extension,"tiff")) return true;
             if( osgDB::equalCaseInsensitive(extension,"tif") ) return true;
@@ -793 +793 @@
             imageData = simage_tiff_load(fin, width_ret, height_ret, numComponents_ret, bitspersample_ret);
 
-            if (imageData==NULL) 
+            if (imageData==NULL)
             {
                 char err_msg[256];
-                simage_tiff_error( err_msg, sizeof(err_msg)); 
+                simage_tiff_error( err_msg, sizeof(err_msg));
                 OSG_WARN << err_msg << std::endl;
                 return ReadResult::FILE_NOT_HANDLED;
@@ -814 +814 @@
 
 
-            unsigned int dataType = 
-                bitspersample_ret == 8 ? GL_UNSIGNED_BYTE : 
+            unsigned int dataType =
+                bitspersample_ret == 8 ? GL_UNSIGNED_BYTE :
                 bitspersample_ret == 16 ? GL_UNSIGNED_SHORT :
                 bitspersample_ret == 32 ? GL_FLOAT : (GLenum)-1;
@@ -848 +848 @@
                                     libtiffStreamMapProc, //Custom map function
                                     libtiffStreamUnmapProc); //Custom unmap function
-            
+
             if(image == NULL)
             {
@@ -898 +898 @@
             TIFFSetField(image, TIFFTAG_SAMPLESPERPIXEL,samplesPerPixel);
             TIFFSetField(image, TIFFTAG_PHOTOMETRIC, photometric);
-            TIFFSetField(image, TIFFTAG_COMPRESSION, COMPRESSION_PACKBITS); 
+            TIFFSetField(image, TIFFTAG_COMPRESSION, COMPRESSION_PACKBITS);
             TIFFSetField(image, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
             TIFFSetField(image, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
 
-            //uint32 rowsperstrip = TIFFDefaultStripSize(image, -1); 
+            //uint32 rowsperstrip = TIFFDefaultStripSize(image, -1);
             //TIFFSetField(image, TIFFTAG_ROWSPERSTRIP, rowsperstrip);
-            
+
             // Write the information to the file
             for(int i = 0; i < img.t(); ++i) {