X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2Fmoof%2Fimage.cc;h=64b2f2eb1a6a19b5219669380e154ac9eef34508;hp=b5100d5ccc3b19fddec90d6dad793bc2af3bf14c;hb=1fb5f7e36af1a4de040bc2989133703b0e0d4a9f;hpb=151f60a78d5e45c8d46c3e793fdefee306c6dc4c

diff --git a/src/moof/image.cc b/src/moof/image.cc
index b5100d5..64b2f2e 100644
--- a/src/moof/image.cc
+++ b/src/moof/image.cc
@@ -133,7 +133,7 @@ image::image(const std::string& path) :
 	rows = new png_bytep[height_];
 	for (int i = 0; i < height_; ++i)
 	{
-		rows[i] = (png_bytep)(pixels_ + i * channels_ * width_);
+		rows[height_-1-i] = (png_bytep)(pixels_ + i * channels_ * width_);
 	}
 
 	png_read_image(pngObj, rows);
@@ -299,10 +299,10 @@ void image::context_recreated()
  */
 void image::set_properties() const
 {
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t_);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, min_filter_);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mag_filter_);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrap_s_);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrap_t_);
 }