diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-07 05:06:11 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2001-03-07 05:06:11 +0000 |
| commit | b51b0a847d7e7daaea69f77ab569086ef81c24a2 (patch) | |
| tree | 165cf8b023e6c7b1f66dacc46a6c37110ef27ea7 /src/mesa/math/m_matrix.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/math/m_matrix.c')
| -rw-r--r-- | src/mesa/math/m_matrix.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c index 534040394b..8f8320f256 100644 --- a/src/mesa/math/m_matrix.c +++ b/src/mesa/math/m_matrix.c @@ -1,4 +1,4 @@ -/* $Id: m_matrix.c,v 1.6 2001/02/05 18:48:52 brianp Exp $ */ +/* $Id: m_matrix.c,v 1.7 2001/03/07 05:06:12 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -766,16 +766,16 @@ static void analyse_from_scratch( GLmatrix *mat ) /* Do the real work */ - if (mask == MASK_IDENTITY) { + if (mask == (GLuint) MASK_IDENTITY) { mat->type = MATRIX_IDENTITY; } - else if ((mask & MASK_2D_NO_ROT) == MASK_2D_NO_ROT) { + else if ((mask & MASK_2D_NO_ROT) == (GLuint) MASK_2D_NO_ROT) { mat->type = MATRIX_2D_NO_ROT; if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE) mat->flags = MAT_FLAG_GENERAL_SCALE; } - else if ((mask & MASK_2D) == MASK_2D) { + else if ((mask & MASK_2D) == (GLuint) MASK_2D) { GLfloat mm = DOT2(m, m); GLfloat m4m4 = DOT2(m+4,m+4); GLfloat mm4 = DOT2(m,m+4); @@ -794,7 +794,7 @@ static void analyse_from_scratch( GLmatrix *mat ) mat->flags |= MAT_FLAG_ROTATION; } - else if ((mask & MASK_3D_NO_ROT) == MASK_3D_NO_ROT) { + else if ((mask & MASK_3D_NO_ROT) == (GLuint) MASK_3D_NO_ROT) { mat->type = MATRIX_3D_NO_ROT; /* Check for scale */ @@ -808,7 +808,7 @@ static void analyse_from_scratch( GLmatrix *mat ) mat->flags |= MAT_FLAG_GENERAL_SCALE; } } - else if ((mask & MASK_3D) == MASK_3D) { + else if ((mask & MASK_3D) == (GLuint) MASK_3D) { GLfloat c1 = DOT3(m,m); GLfloat c2 = DOT3(m+4,m+4); GLfloat c3 = DOT3(m+8,m+8); |