X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fcommon%2Freadpng.c;fp=frontend%2Fcommon%2Freadpng.c;h=722dc26e729677c3c7420f6a8bc5c6ee8d14182d;hp=540f54380abb4de4d8e302716e9ae53fb6554c1d;hb=29ddd9e8a2bd7d3c8baf6023a05e8cf407bd2212;hpb=84365ca2e1751440f0af970abd3b8517ae97a055 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++) {