diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-08 15:23:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-08 15:23:46 +0000 |
| commit | 01915e90e6912f06d43d443a09157f7bbc96ddc5 (patch) | |
| tree | fc86ff76a45027c01d45902bed894d12f161088c /src/mesa/main | |
| parent | eac57f009ea347cfce0d70452c1bdeb0e6c9eeae (diff) | |
More g++ warning fixes. Fixes for CHAN_BITS==16, it seems to work.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/colormac.h | 4 | ||||
| -rw-r--r-- | src/mesa/main/texobj.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/colormac.h b/src/mesa/main/colormac.h index d26420132a..c5c129eaa4 100644 --- a/src/mesa/main/colormac.h +++ b/src/mesa/main/colormac.h @@ -1,4 +1,4 @@ -/* $Id: colormac.h,v 1.7 2001/03/07 03:20:38 brianp Exp $ */ +/* $Id: colormac.h,v 1.8 2001/03/08 15:23:46 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -70,7 +70,7 @@ #define INT_TO_CHAN(i) ((i) < 0 ? 0 : (GLchan) ((i) >> 15)) #define UINT_TO_CHAN(i) ((GLchan) ((i) >> 16)) -#define CHAN_TO_FLOAT(c) ((GLfloat) ((c) * (1.0 / CHAN_MAXF) + 0.5F)) +#define CHAN_TO_FLOAT(c) ((GLfloat) ((c) * (1.0 / CHAN_MAXF))) #define CLAMPED_FLOAT_TO_CHAN(c, f) \ c = ((GLchan) IROUND((f) * CHAN_MAXF)) diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c index 3f0aa196c5..ca405bd78e 100644 --- a/src/mesa/main/texobj.c +++ b/src/mesa/main/texobj.c @@ -1,4 +1,4 @@ -/* $Id: texobj.c,v 1.42 2001/03/03 20:33:28 brianp Exp $ */ +/* $Id: texobj.c,v 1.43 2001/03/08 15:23:46 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -214,8 +214,8 @@ _mesa_test_texobj_completeness( const GLcontext *ctx, if (t->Dimensions == 6) { /* make sure that all six cube map level 0 images are the same size */ - const GLint w = t->Image[baseLevel]->Width2; - const GLint h = t->Image[baseLevel]->Height2; + const GLuint w = t->Image[baseLevel]->Width2; + const GLuint h = t->Image[baseLevel]->Height2; if (!t->NegX[baseLevel] || t->NegX[baseLevel]->Width2 != w || t->NegX[baseLevel]->Height2 != h || |