Changeset 13041 for OpenSceneGraph/trunk/include/osg/Image

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osg/Image (modified) (23 diffs)

OpenSceneGraph/trunk/include/osg/Image

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * OpenSceneGraph Public License for more details.
 */
@@ -94 +94 @@
 
 #ifndef GL_OES_compressed_ETC1_RGB8_texture
-    #define GL_ETC1_RGB8_OES        0x8D64   
+    #define GL_ETC1_RGB8_OES        0x8D64
 #endif
 
@@ -109 +109 @@
 
         Image();
-        
+
         /** Copy constructor using CopyOp to manage deep vs shallow copy. */
         Image(const Image& image,const CopyOp& copyop=CopyOp::SHALLOW_COPY);
@@ -130 +130 @@
         void setFileName(const std::string& fileName);
         inline const std::string& getFileName() const { return _fileName; }
-        
+
         enum WriteHint {
             NO_PREFERENCE,
@@ -136 +136 @@
             EXTERNAL_FILE
         };
-        
+
         void setWriteHint(WriteHint writeHint) { _writeHint = writeHint; }
         WriteHint getWriteHint() const { return _writeHint; }
-        
+
         enum AllocationMode {
             NO_DELETE,
@@ -145 +145 @@
             USE_MALLOC_FREE
         };
-        
+
         /** Set the method used for deleting data once it goes out of scope. */
         void setAllocationMode(AllocationMode mode) { _allocationMode = mode; }
@@ -157 +157 @@
                            GLenum pixelFormat,GLenum type,
                            int packing=1);
-        
-        
+
+
         /** Set the image dimensions, format and data. */
         virtual void setImage(int s,int t,int r,
@@ -166 +166 @@
                       AllocationMode mode,
                       int packing=1, int rowLength=0);
-            
+
         /** Read pixels from current frame buffer at specified position and size, using glReadPixels.
           * Create memory for storage if required, reuse existing pixel coords if possible.
@@ -172 +172 @@
         virtual void readPixels(int x,int y,int width,int height,
                         GLenum pixelFormat,GLenum type);
-            
+
 
         /** Read the contents of the current bound texture, handling compressed pixelFormats if present.
@@ -196 +196 @@
 
 
-        enum Origin 
+        enum Origin
         {
             BOTTOM_LEFT,
             TOP_LEFT
         };
-        
+
         /** Set the origin of the image.
           * The default value is BOTTOM_LEFT and is consistent with OpenGL.
@@ -208 +208 @@
           * to handle this origin position. */
         void setOrigin(Origin origin) { _origin = origin; }
-        
+
         /** Get the origin of the image.*/
         Origin getOrigin() const { return _origin; }
-        
+
 
         /** Width of image. */
@@ -218 +218 @@
         /** Height of image. */
         inline int t() const { return _t; }
-        
+
         /** Depth of image. */
         inline int r() const { return _r; }
@@ -224 +224 @@
         void setRowLength(int length);
         inline int getRowLength() const { return _rowLength; }
-        
+
         void setInternalTextureFormat(GLint internalFormat);
         inline GLint getInternalTextureFormat() const { return _internalTextureFormat; }
-        
+
         void setPixelFormat(GLenum pixelFormat);
         inline GLenum getPixelFormat() const { return _pixelFormat; }
-        
+
         void setDataType(GLenum dataType);
-        inline GLenum getDataType() const { return _dataType; }        
-        
+        inline GLenum getDataType() const { return _dataType; }
+
         void setPacking(unsigned int packing) { _packing = packing; }
         inline unsigned int getPacking() const { return _packing; }
@@ -245 +245 @@
         /** Get the pixel aspect ratio.*/
         inline float getPixelAspectRatio() const { return _pixelAspectRatio; }
-        
+
         /** Return the number of bits required for each pixel. */
         inline unsigned int getPixelSizeInBits() const { return computePixelSizeInBits(_pixelFormat,_dataType); }
@@ -258 +258 @@
         /** Return the number of bytes each image (_s*_t) of pixels occupies. */
         inline unsigned int getImageSizeInBytes() const { return getRowSizeInBytes()*_t; }
-        
-        /** Return the number of bytes between each successive image. 
+
+        /** Return the number of bytes between each successive image.
           * Note, getImageSizeInBytes() will only equal getImageStepInBytes() when isDataContiguous() return true. */
         inline unsigned int getImageStepInBytes() const { return getRowStepInBytes()*_t; }
@@ -276 +276 @@
           * take care to access the data per row rather than treating the whole data as a single block. */
         inline unsigned char* data() { return _data; }
-        
+
         /** Raw const image data.
           * Note, data in successive rows may not be contiguous, isDataContiguous() return false then you should
@@ -287 +287 @@
             return _data+(column*getPixelSizeInBits())/8+row*getRowStepInBytes()+image*getImageSizeInBytes();
         }
-        
+
         inline const unsigned char* data(int column, int row=0,int image=0) const
         {
@@ -319 +319 @@
         protected:
 
-            
+
             void assign();
-            
+
             const osg::Image*                   _image;
             int                                 _rowNum;
@@ -342 +342 @@
         /** Flip the image horizontally, around s dimension. */
         void flipHorizontal();
-        
+
         /** Flip the image vertically, around t dimension. */
         void flipVertical();
@@ -379 +379 @@
         /** Send offsets into data. It is assumed that first mipmap offset (index 0) is 0.*/
         inline void setMipmapLevels(const MipmapDataType& mipmapDataVector) { _mipmapData = mipmapDataVector; }
-        
+
         inline const MipmapDataType& getMipmapLevels() const { return _mipmapData; }
 
@@ -390 +390 @@
             return 0;
         };
-        
+
         inline unsigned char* getMipmapData(unsigned int mipmapLevel)
         {
@@ -407 +407 @@
         virtual bool isImageTranslucent() const;
 
-        /** Set the optional PixelBufferObject used to map the image memory efficiently to graphics memory. */ 
+        /** Set the optional PixelBufferObject used to map the image memory efficiently to graphics memory. */
         void setPixelBufferObject(PixelBufferObject* buffer) { setBufferObject(buffer); }
 
@@ -465 +465 @@
         AllocationMode _allocationMode;
         unsigned char* _data;
-        
+
         void deallocateData();
-        
+
         void setData(unsigned char* data,AllocationMode allocationMode);
 
         MipmapDataType _mipmapData;
-        
+
         ref_ptr<PixelBufferObject> _bufferObject;
 };