Browse Source

fixed a bug in Image::setFilter where it switched the min/mag parameters

Bill Meltsner 15 years ago
parent
commit
3ed9823152
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/modules/graphics/opengl/Image.cpp

+ 3 - 2
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