summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2008-07-29 17:27:22 -0600
committerBrian Paul <[email protected]>2008-07-29 17:27:22 -0600
commit6f1abb9c215583d11980294f7469da41ec14b7da (patch)
treea6ab8447746a266a96b80d38e5441e9615ab04c1 /src/mesa/main
parent1b465f287fd26d14797eca7c7a3f6cd339923e00 (diff)
mesa: fix issues causing warnings on Windows
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/texstore.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 89774291f2f..853205ac957 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -368,11 +368,13 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
dst += srcWidth * 4;
}
+ /* size after optional convolution */
+ convWidth = srcWidth;
+ convHeight = srcHeight;
+
/* do convolution */
{
GLfloat *src = tempImage + img * (srcWidth * srcHeight * 4);
- convWidth = srcWidth;
- convHeight = srcHeight;
if (dims == 1) {
ASSERT(ctx->Pixel.Convolution1DEnabled);
_mesa_convolve_1d_image(ctx, &convWidth, src, convImage);