diff options
author | Brian Paul <[email protected]> | 2001-03-07 05:06:11 +0000 |
---|---|---|
committer | Brian Paul <[email protected]> | 2001-03-07 05:06:11 +0000 |
commit | b51b0a847d7e7daaea69f77ab569086ef81c24a2 (patch) | |
tree | 165cf8b023e6c7b1f66dacc46a6c37110ef27ea7 /src/mesa/main/teximage.c | |
parent | 249aebdd357d20f6326137c967c6b3923bef6c05 (diff) |
fixed a bunch of g++ warnings/errors. Compiling with g++ can help find lots of potential problems
Diffstat (limited to 'src/mesa/main/teximage.c')
-rw-r--r-- | src/mesa/main/teximage.c | 89 |
1 files changed, 44 insertions, 45 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 79a4353abaa..53fcffb5128 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1,4 +1,4 @@ -/* $Id: teximage.c,v 1.82 2001/03/05 22:18:23 brianp Exp $ */ +/* $Id: teximage.c,v 1.83 2001/03/07 05:06:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -56,50 +56,49 @@ #ifdef DEBUG static void PrintTexture(const struct gl_texture_image *img) { - int i, j, c; - GLchan *data = img->Data; - - if (!data) { - printf("No texture data\n"); - return; - } - - switch (img->Format) { - case GL_ALPHA: - case GL_LUMINANCE: - case GL_INTENSITY: - case GL_COLOR_INDEX: - c = 1; - break; - case GL_LUMINANCE_ALPHA: - c = 2; - break; - case GL_RGB: - c = 3; - break; - case GL_RGBA: - c = 4; - break; - default: - _mesa_problem(NULL, "error in PrintTexture\n"); - return; - } - - - for (i = 0; i < img->Height; i++) { - for (j = 0; j < img->Width; j++) { - if (c==1) - printf("%02x ", data[0]); - else if (c==2) - printf("%02x%02x ", data[0], data[1]); - else if (c==3) - printf("%02x%02x%02x ", data[0], data[1], data[2]); - else if (c==4) - printf("%02x%02x%02x%02x ", data[0], data[1], data[2], data[3]); - data += c; - } - printf("\n"); - } + GLuint i, j, c; + const GLchan *data = (const GLchan *) img->Data; + + if (!data) { + printf("No texture data\n"); + return; + } + + switch (img->Format) { + case GL_ALPHA: + case GL_LUMINANCE: + case GL_INTENSITY: + case GL_COLOR_INDEX: + c = 1; + break; + case GL_LUMINANCE_ALPHA: + c = 2; + break; + case GL_RGB: + c = 3; + break; + case GL_RGBA: + c = 4; + break; + default: + _mesa_problem(NULL, "error in PrintTexture\n"); + return; + } + + for (i = 0; i < img->Height; i++) { + for (j = 0; j < img->Width; j++) { + if (c==1) + printf("%02x ", data[0]); + else if (c==2) + printf("%02x%02x ", data[0], data[1]); + else if (c==3) + printf("%02x%02x%02x ", data[0], data[1], data[2]); + else if (c==4) + printf("%02x%02x%02x%02x ", data[0], data[1], data[2], data[3]); + data += c; + } + printf("\n"); + } } #endif |