notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
handle bad cd images better
[pcsx_rearmed.git]
/
frontend
/
common
/
readpng.c
diff --git
a/frontend/common/readpng.c
b/frontend/common/readpng.c
index
540f543
..
722dc26
100644
(file)
--- 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;
}
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;
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++)
{
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;
}
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;
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++)
{
for (h = 0; h < height; h++)
{