From fd8f62f94127f5a1489dcb2992beea7005a4cd1b Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 21 Jan 2005 19:31:56 +0000
Subject: [PATCH] build fix

---
 include/osg/BlendEquation |  3 +++
 include/osg/Image         | 22 ++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/include/osg/BlendEquation b/include/osg/BlendEquation
index 49cdaa031..e111e8d44 100644
--- a/include/osg/BlendEquation
+++ b/include/osg/BlendEquation
@@ -23,6 +23,9 @@
 #define GL_FUNC_ADD                             0x8006
 #define GL_FUNC_SUBTRACT                        0x800A
 #define GL_FUNC_REVERSE_SUBTRACT                0x800B
+#endif
+
+#ifndef GL_LOGIC_OP
 #define GL_LOGIC_OP                             0x0BF1
 #endif
 
diff --git a/include/osg/Image b/include/osg/Image
index 45472f075..5f0588a6c 100644
--- a/include/osg/Image
+++ b/include/osg/Image
@@ -11,8 +11,6 @@
  * OpenSceneGraph Public License for more details.
 */
 
-// -*-c++-*-
-
 #ifndef OSG_IMAGE
 #define OSG_IMAGE 1
 
@@ -100,14 +98,14 @@ class SG_EXPORT Image : public Object
             
         /** 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.
-		*/
+        */
         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.
           * Create memory for storage if required, reuse existing pixel coords if possible.
-		*/
+        */
         void readImageFromCurrentTexture(unsigned int contextID, bool copyMipMapsIfAvailable);
 
 
@@ -123,7 +121,7 @@ class SG_EXPORT Image : public Object
           * If this Image is empty then image data is created to
           * accomodate the source image in its offset position.
           * If source is NULL then no operation happens, this Image is left unchanged.
-		*/
+        */
         void copySubImage(int s_offset,int t_offset,int r_offset,osg::Image* source);
 
 
@@ -194,7 +192,7 @@ class SG_EXPORT Image : public Object
           * Mipmapped textures require the image dimensions to be
           * power of two and are within the maxiumum texture size for
           * the host machine.
-		*/
+        */
         void ensureValidSizeForTexturing(GLint maxTextureSize);
       
         /** Dirty the image, which increments the modified flag, to force osg::Texture to reload the image. */
@@ -238,14 +236,14 @@ class SG_EXPORT Image : public Object
         };
         
         inline unsigned char* getMipmapData(unsigned int mipmapLevel)
-	{
-	   return _data+getMipmapOffset(mipmapLevel);
-	}
+        {
+           return _data+getMipmapOffset(mipmapLevel);
+        }
 
         inline const unsigned char* getMipmapData(unsigned int mipmapLevel) const
-	{
-	   return _data+getMipmapOffset(mipmapLevel);
-	}
+        {
+           return _data+getMipmapOffset(mipmapLevel);
+        }
         
         /** Return true if this image is translucent - i.e. it has alpha values that are less 1.0 (when normalized). */
         bool isImageTranslucent() const;