FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Warning fixes for Clang-3.6

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@15016 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-07-23 11:11:58 +00:00
parent 71c6d27b57
commit 2208303496
31 changed files with 59 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osg/glu/libutil/mipmap.cpp
View File

@@ -5557,13 +5557,11 @@ static void empty_image(const PixelStorageModes *psm,
* Decimation of packed pixel types
*--------------------------------------------------------------------------
*/
static void extract332(int isSwap,
static void extract332(int /*isSwap*/,
const void *packedPixel, GLfloat extractComponents[])
{
GLubyte ubyte= *(const GLubyte *)packedPixel;
isSwap= isSwap; /* turn off warnings */
/* 11100000 == 0xe0 */
/* 00011100 == 0x1c */
/* 00000011 == 0x03 */
@@ -5593,13 +5591,11 @@ static void shove332(const GLfloat shoveComponents[],
((GLubyte)((shoveComponents[2] * 3)+0.5) ) & 0x03;
} /* shove332() */
static void extract233rev(int isSwap,
static void extract233rev(int /*isSwap*/,
const void *packedPixel, GLfloat extractComponents[])
{
GLubyte ubyte= *(const GLubyte *)packedPixel;
isSwap= isSwap; /* turn off warnings */
/* 0000,0111 == 0x07 */
/* 0011,1000 == 0x38 */
/* 1100,0000 == 0xC0 */
@@ -8559,10 +8555,8 @@ GLint GLAPIENTRY gluBuild3DMipmaps(GLTexImage3DProc gluTexImage3D,
data);
} /* gluBuild3DMipmaps() */
static GLdouble extractUbyte(int isSwap, const void *ubyte)
static GLdouble extractUbyte(int /*isSwap*/, const void *ubyte)
{
isSwap= isSwap; /* turn off warnings */
return (GLdouble)(*((const GLubyte *)ubyte));
} /* extractUbyte() */
@@ -8573,10 +8567,8 @@ static void shoveUbyte(GLdouble value, int index, void *data)
((GLubyte *)data)[index]= (GLubyte)value;
} /* shoveUbyte() */
static GLdouble extractSbyte(int isSwap, const void *sbyte)
static GLdouble extractSbyte(int /*isSwap*/, const void *sbyte)
{
isSwap= isSwap; /* turn off warnings */
return (GLdouble)(*((const GLbyte *)sbyte));
} /* extractSbyte() */