From 3ed9823152c12a9ec5cc89baf1052e0abafa4354 Mon Sep 17 00:00:00 2001 From: Bill Meltsner Date: Tue, 9 Feb 2010 12:37:55 -0500 Subject: [PATCH] fixed a bug in Image::setFilter where it switched the min/mag parameters --- src/modules/graphics/opengl/Image.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/modules/graphics/opengl/Image.cpp b/src/modules/graphics/opengl/Image.cpp index 72a242ee3..5c5fd1482 100644 --- a/src/modules/graphics/opengl/Image.cpp +++ b/src/modules/graphics/opengl/Image.cpp @@ -123,6 +123,7 @@ namespace opengl void Image::setFilter(Image::Filter f) { GLint gmin, gmag; + gmin = gmag = 0; // so that they're not used uninitialized switch(f.min) { @@ -146,8 +147,8 @@ namespace opengl bind(); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gmin); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gmag); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gmin); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gmag); } Image::Filter Image::getFilter() const