From c049d4bc897f92fd25ed961f1acedaa9d33cc5af Mon Sep 17 00:00:00 2001 From: Daniel Borca Date: Mon, 6 Dec 2004 08:11:14 +0000 Subject: [PATCH] explicit cast in a few places --- src/mesa/main/texcompress_fxt1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c index ca9b9aa0c99..57af65299de 100644 --- a/src/mesa/main/texcompress_fxt1.c +++ b/src/mesa/main/texcompress_fxt1.c @@ -327,7 +327,7 @@ typedef struct { -#define F(i) 1 /* can be used to obtain an oblong metric: 0.30 / 0.59 / 0.11 */ +#define F(i) (GLfloat)1 /* can be used to obtain an oblong metric: 0.30 / 0.59 / 0.11 */ #define SAFECDOT 1 /* for paranoids */ #define MAKEIVEC(NV, NC, IV, B, V0, V1) \ @@ -526,7 +526,7 @@ fxt1_choose (GLfloat vec[][MAX_COMP], GLint nv, for (j = 0; j < nv; j++) { for (i = 0; i < nc; i++) { - vec[j][i] = ((nv - 1 - j) * input[minCol][i] + j * input[maxCol][i] + (nv - 1) / 2) / (nv - 1); + vec[j][i] = ((nv - 1 - j) * input[minCol][i] + j * input[maxCol][i] + (nv - 1) / 2) / (GLfloat)(nv - 1); } } #endif -- 2.30.2