Changeset 13205 for OpenSceneGraph/trunk/src/osg/ImageUtils.cpp

Timestamp:

06/18/13 21:09:33 (5 hours ago)

Author:

robert

Message:

Added #define OSG_USE_DEPRECATED_GEOMETRY_METHODS usage into code to allow code to compile enen when CMake configuration has set the #define to off in include/osg/Config.

Files:

• OpenSceneGraph/trunk/src/osg/ImageUtils.cpp (modified) (2 diffs)

OpenSceneGraph/trunk/src/osg/ImageUtils.cpp

@@ -616 +616 @@
 
 
-struct ModulateAlphaByColourOperator
-{
-    ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
+
+struct ModulateAlphaByColorOperator
+{
+    ModulateAlphaByColorOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); }
 
     osg::Vec4 _colour;
@@ -651 +652 @@
             return image;
         }
-        case (MODULATE_ALPHA_BY_COLOUR):
+        case (MODULATE_ALPHA_BY_COLOR):
         {
             OSG_NOTICE<<"doing conversion MODULATE_ALPHA_BY_COLOUR"<<std::endl;
-            osg::modifyImage(image, ModulateAlphaByColourOperator(colour));
+            osg::modifyImage(image, ModulateAlphaByColorOperator(colour));
             return image;
         }