From: notaz <notasas@gmail.com>
Date: Wed, 12 Sep 2012 23:33:26 +0000 (+0300)
Subject: frontend: readpng: fix width/height confusion
X-Git-Tag: r16~20
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=29ddd9e8a2bd7d3c8baf6023a05e8cf407bd2212;ds=sidebyside

frontend: readpng: fix width/height confusion
---

diff --git a/frontend/common/readpng.c b/frontend/common/readpng.c
index 540f5438..722dc26e 100644
--- a/frontend/common/readpng.c
+++ b/frontend/common/readpng.c
@@ -73,12 +73,12 @@ int readpng(void *dest, const char *fname, readpng_what what, int req_w, int req
 				lprintf(__FILE__ ": bg image uses %ibpc, needed 8bpc\n", png_get_bit_depth(png_ptr, info_ptr));
 				break;
 			}
-			height = png_get_image_width(png_ptr, info_ptr);
-			if (height > req_h)
-				height = req_h;
-			width = png_get_image_height(png_ptr, info_ptr);
+			width = png_get_image_width(png_ptr, info_ptr);
 			if (width > req_w)
 				width = req_w;
+			height = png_get_image_height(png_ptr, info_ptr);
+			if (height > req_h)
+				height = req_h;
 
 			for (h = 0; h < height; h++)
 			{
@@ -164,12 +164,12 @@ int readpng(void *dest, const char *fname, readpng_what what, int req_w, int req
 				lprintf(__FILE__ ": image uses %ibpc, needed 8bpc\n", png_get_bit_depth(png_ptr, info_ptr));
 				break;
 			}
-			height = png_get_image_height(png_ptr, info_ptr);
-			if (height > req_h)
-				height = req_h;
 			width = png_get_image_width(png_ptr, info_ptr);
 			if (width > req_w)
 				width = req_w;
+			height = png_get_image_height(png_ptr, info_ptr);
+			if (height > req_h)
+				height = req_h;
 
 			for (h = 0; h < height; h++)
 			{