diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp index 0891db9a8..362f3032a 100644 --- a/examples/osgvolume/osgvolume.cpp +++ b/examples/osgvolume/osgvolume.cpp @@ -589,10 +589,10 @@ int main( int argc, char **argv ) while(arguments.read("--r_maxTextureSize",r_maximumTextureSize)) {} // set up colour space operation. - osg::ColorSpaceOperation colourSpaceOperation = osg::NO_COLOUR_SPACE_OPERATION; + osg::ColorSpaceOperation colourSpaceOperation = osg::NO_COLOR_SPACE_OPERATION; osg::Vec4 colourModulate(0.25f,0.25f,0.25f,0.25f); while(arguments.read("--modulate-alpha-by-luminance")) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_LUMINANCE; } - while(arguments.read("--modulate-alpha-by-colour", colourModulate.x(),colourModulate.y(),colourModulate.z(),colourModulate.w() )) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_COLOUR; } + while(arguments.read("--modulate-alpha-by-colour", colourModulate.x(),colourModulate.y(),colourModulate.z(),colourModulate.w() )) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_COLOR; } while(arguments.read("--replace-alpha-with-luminance")) { colourSpaceOperation = osg::REPLACE_ALPHA_WITH_LUMINANCE; } while(arguments.read("--replace-rgb-with-luminance")) { colourSpaceOperation = osg::REPLACE_RGB_WITH_LUMINANCE; } @@ -936,7 +936,7 @@ int main( int argc, char **argv ) } - if (colourSpaceOperation!=osg::NO_COLOUR_SPACE_OPERATION) + if (colourSpaceOperation!=osg::NO_COLOR_SPACE_OPERATION) { for(Images::iterator itr = images.begin(); itr != images.end(); diff --git a/include/osg/ImageUtils b/include/osg/ImageUtils index 55d763ea0..2d1db317a 100644 --- a/include/osg/ImageUtils +++ b/include/osg/ImageUtils @@ -163,9 +163,9 @@ extern OSG_EXPORT osg::Image* createSpotLightImage(const osg::Vec4& centerColour enum ColorSpaceOperation { - NO_COLOUR_SPACE_OPERATION, + NO_COLOR_SPACE_OPERATION, MODULATE_ALPHA_BY_LUMINANCE, - MODULATE_ALPHA_BY_COLOUR, + MODULATE_ALPHA_BY_COLOR, REPLACE_ALPHA_WITH_LUMINANCE, REPLACE_RGB_WITH_LUMINANCE }; diff --git a/include/osgPresentation/SlideShowConstructor b/include/osgPresentation/SlideShowConstructor index 247b5389e..ed90f05ac 100644 --- a/include/osgPresentation/SlideShowConstructor +++ b/include/osgPresentation/SlideShowConstructor @@ -293,7 +293,7 @@ public: cutoffValue(0.1), sampleDensityValue(0.005), sampleDensityWhenMovingValue(0.0), - colorSpaceOperation(osg::NO_COLOUR_SPACE_OPERATION), + colorSpaceOperation(osg::NO_COLOR_SPACE_OPERATION), colorModulate(1.0f,1.0f,1.0f,1.0f) { region[0] = region[1] = region[2] = 0.0f; diff --git a/src/osg/ImageUtils.cpp b/src/osg/ImageUtils.cpp index f88cb11ef..4075ebc52 100644 --- a/src/osg/ImageUtils.cpp +++ b/src/osg/ImageUtils.cpp @@ -615,9 +615,10 @@ osg::Image* createSpotLightImage(const osg::Vec4& centerColour, const osg::Vec4& } -struct ModulateAlphaByColourOperator + +struct ModulateAlphaByColorOperator { - ModulateAlphaByColourOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); } + ModulateAlphaByColorOperator(const osg::Vec4& colour):_colour(colour) { _lum = _colour.length(); } osg::Vec4 _colour; float _lum; @@ -650,10 +651,10 @@ osg::Image* colorSpaceConversion(ColorSpaceOperation op, osg::Image* image, cons osg::modifyImage(image, ModulateAlphaByLuminanceOperator()); return image; } - case (MODULATE_ALPHA_BY_COLOUR): + case (MODULATE_ALPHA_BY_COLOR): { OSG_NOTICE<<"doing conversion MODULATE_ALPHA_BY_COLOUR"< converted_image = osg::colorSpaceConversion(volumeData.colorSpaceOperation, image.get(), volumeData.colorModulate);