From Magnus Kessler, "After a closer look at this particular issue, I used some grep and sed magic

to fix all occurrences of "macro's" and "paramter".
"
This commit is contained in:
Robert Osfield
2010-09-30 16:57:02 +00:00
parent 17aaa4db94
commit e5bc43f04c
37 changed files with 62 additions and 62 deletions

View File

@@ -36,7 +36,7 @@ int PointSprite::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_coordOriginMode)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}

View File

@@ -61,7 +61,7 @@ PolygonStipple::~PolygonStipple()
int PolygonStipple::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(PolygonStipple,sa)
// compare each parameter in turn against the rhs.
@@ -71,7 +71,7 @@ int PolygonStipple::compare(const StateAttribute& sa) const
else if (_mask[i]>rhs._mask[i]) return 1;
}
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void PolygonStipple::setMask(const GLubyte* givenMask)

View File

@@ -4,7 +4,7 @@
* Copyright (C) 2008 Zebra Imaging
*
* This application is open source and may be redistributed and/or modified
* freely and without restriction, both in commericial and non commericial
* freely and without restriction, both in commercial and non commercial
* applications, as long as this copyright notice is maintained.
*
* This application is distributed in the hope that it will be useful,
@@ -141,7 +141,7 @@ Program::~Program()
int Program::compare(const osg::StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Program,sa)
if( _shaderList.size() < rhs._shaderList.size() ) return -1;
@@ -169,7 +169,7 @@ int Program::compare(const osg::StateAttribute& sa) const
if (result!=0) return result;
}
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}

View File

@@ -61,7 +61,7 @@ StencilTwoSided::~StencilTwoSided()
int StencilTwoSided::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(StencilTwoSided,sa)
// compare each parameter in turn against the rhs.
@@ -81,7 +81,7 @@ int StencilTwoSided::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_zpass[BACK])
COMPARE_StateAttribute_Parameter(_writeMask[BACK])
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void StencilTwoSided::apply(State& state) const

View File

@@ -48,7 +48,7 @@ Texture1D::~Texture1D()
int Texture1D::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Texture1D,sa)
if (_image!=rhs._image) // smart pointer comparison.
@@ -89,7 +89,7 @@ int Texture1D::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_textureWidth)
COMPARE_StateAttribute_Parameter(_subloadCallback)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void Texture1D::setImage(Image* image)

View File

@@ -52,7 +52,7 @@ Texture2D::~Texture2D()
int Texture2D::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Texture2D,sa)
if (_image!=rhs._image) // smart pointer comparison.
@@ -102,7 +102,7 @@ int Texture2D::compare(const StateAttribute& sa) const
#endif
COMPARE_StateAttribute_Parameter(_subloadCallback)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void Texture2D::setImage(Image* image)

View File

@@ -51,7 +51,7 @@ Texture2DArray::~Texture2DArray()
int Texture2DArray::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Texture2DArray,sa)
bool noImages = true;
@@ -97,7 +97,7 @@ int Texture2DArray::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_textureDepth)
COMPARE_StateAttribute_Parameter(_subloadCallback)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void Texture2DArray::setImage(unsigned int layer, Image* image)

View File

@@ -53,7 +53,7 @@ Texture2DMultisample::~Texture2DMultisample()
int Texture2DMultisample::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Texture2DMultisample,sa)
@@ -79,7 +79,7 @@ int Texture2DMultisample::compare(const StateAttribute& sa) const
}
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void Texture2DMultisample::apply(State& state) const

View File

@@ -58,7 +58,7 @@ Texture3D::~Texture3D()
int Texture3D::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(Texture3D,sa)
if (_image!=rhs._image) // smart pointer comparison.
@@ -101,7 +101,7 @@ int Texture3D::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_textureDepth)
COMPARE_StateAttribute_Parameter(_subloadCallback)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void Texture3D::setImage(Image* image)

View File

@@ -73,7 +73,7 @@ TextureCubeMap::~TextureCubeMap()
int TextureCubeMap::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Paramter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(TextureCubeMap,sa)
bool noImages = true;
@@ -117,12 +117,12 @@ int TextureCubeMap::compare(const StateAttribute& sa) const
int result = compareTexture(rhs);
if (result!=0) return result;
// compare each paramter in turn against the rhs.
// compare each parameter in turn against the rhs.
COMPARE_StateAttribute_Parameter(_textureWidth)
COMPARE_StateAttribute_Parameter(_textureHeight)
COMPARE_StateAttribute_Parameter(_subloadCallback)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}

View File

@@ -76,7 +76,7 @@ TextureRectangle::~TextureRectangle()
int TextureRectangle::compare(const StateAttribute& sa) const
{
// check the types are equal and then create the rhs variable
// used by the COMPARE_StateAttribute_Parameter macro's below.
// used by the COMPARE_StateAttribute_Parameter macros below.
COMPARE_StateAttribute_Types(TextureRectangle,sa)
if (_image!=rhs._image) // smart pointer comparison.
@@ -118,7 +118,7 @@ int TextureRectangle::compare(const StateAttribute& sa) const
COMPARE_StateAttribute_Parameter(_textureHeight)
COMPARE_StateAttribute_Parameter(_subloadCallback)
return 0; // passed all the above comparison macro's, must be equal.
return 0; // passed all the above comparison macros, must be equal.
}
void TextureRectangle::setImage(Image* image)

View File

@@ -593,7 +593,7 @@ VisualInfo *VisualChooser::choose( Display *dpy, int screen, bool strict_adheren
{
if (*k == WGL_SWAP_METHOD_ARB)
{
// attribute come in sequential attribute,paramter pairs
// attribute come in sequential attribute,parameter pairs
// as WGL specifications so we need to delete two entries
attribs.erase(k,k+2);
break;