change max dimensions back to 640x480, fix bug in png loading

This commit is contained in:
Daryl Borth 2021-03-16 19:41:30 -06:00
parent 44fa7fd6ff
commit 93ba7c6449
2 changed files with 3 additions and 3 deletions

View File

@ -1023,7 +1023,7 @@ static int MenuGameSelection()
GuiImage preview; GuiImage preview;
preview.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE); preview.SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
preview.SetPosition(174, -8); preview.SetPosition(174, -8);
u8* imgBuffer = MEM_ALLOC(640 * 512 * 4); u8* imgBuffer = MEM_ALLOC(640 * 480 * 4);
int previousBrowserIndex = -1; int previousBrowserIndex = -1;
char imagePath[MAXJOLIET + 1]; char imagePath[MAXJOLIET + 1];
@ -1114,7 +1114,7 @@ static int MenuGameSelection()
snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], getImageFolder(), browserList[browser.selIndex].displayname); snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], getImageFolder(), browserList[browser.selIndex].displayname);
int width, height; int width, height;
if(DecodePNGFromFile(imagePath, &width, &height, imgBuffer, 640, 512)) if(DecodePNGFromFile(imagePath, &width, &height, imgBuffer, 640, 480))
{ {
preview.SetImage(imgBuffer, width, height); preview.SetImage(imgBuffer, width, height);
preview.SetScale( MIN(225.0f / width, 235.0f / height) ); preview.SetScale( MIN(225.0f / width, 235.0f / height) );

View File

@ -643,7 +643,7 @@ u8 * DecodePNGFromFile(const char *filepath, int * width, int * height, u8 *dstP
PNGUPROP imgProp; PNGUPROP imgProp;
u8 *dst = NULL; u8 *dst = NULL;
if(PNGU_GetImageProperties(ctx, &imgProp) == PNGU_OK && imgProp.imgWidth <= maxwidth && imgProp.imgHeight < maxheight) if(PNGU_GetImageProperties(ctx, &imgProp) == PNGU_OK && imgProp.imgWidth <= maxwidth && imgProp.imgHeight <= maxheight)
dst = PNGU_DecodeTo4x4RGBA8 (ctx, imgProp.imgWidth, imgProp.imgHeight, width, height, dstPtr, maxwidth, maxheight); dst = PNGU_DecodeTo4x4RGBA8 (ctx, imgProp.imgWidth, imgProp.imgHeight, width, height, dstPtr, maxwidth, maxheight);
PNGU_ReleaseImageContext (ctx); PNGU_ReleaseImageContext (ctx);