The-Homebrew-Cloud/N64FlashcartMenu
2
0
Fork 0
mirror of https://github.com/Polprzewodnikowy/N64FlashcartMenu.git synced 2024-11-22 10:39:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed last row decoding in PNG decoder

Browse Source
This commit is contained in:
Mateusz Faderewski 2023-07-26 18:41:38 +02:00
parent 8d5aa4ecb1
commit f235f25205
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/menu/png_decoder.c
View File

@ -11,6 +11,7 @@ png_err_t png_decode (char *path, surface_t *image, int max_width, int max_heigh
FILE *file; FILE *file;
size_t image_size; size_t image_size;
struct spng_ihdr ihdr; struct spng_ihdr ihdr;
struct spng_row_info row_info;
uint8_t *row_buffer; uint8_t *row_buffer;
uint16_t *image_buffer; uint16_t *image_buffer;
@ -64,8 +65,7 @@ png_err_t png_decode (char *path, surface_t *image, int max_width, int max_heigh
} }
*image = surface_alloc(FMT_RGBA16, ihdr.width, ihdr.height); *image = surface_alloc(FMT_RGBA16, ihdr.width, ihdr.height);
image_buffer = image->buffer; if (image->buffer == NULL) {
if (image_buffer == NULL) {
spng_ctx_free(ctx); spng_ctx_free(ctx);
fclose(file); fclose(file);
return PNG_ERR_OUT_OF_MEM; return PNG_ERR_OUT_OF_MEM;
@ -78,7 +78,14 @@ png_err_t png_decode (char *path, surface_t *image, int max_width, int max_heigh
return PNG_ERR_OUT_OF_MEM; return PNG_ERR_OUT_OF_MEM;
} }
while ((err = spng_decode_row(ctx, row_buffer, ihdr.width * 3)) == SPNG_OK) { do {
if ((err = spng_get_row_info(ctx, &row_info)) != SPNG_OK) {
break;
}
err = spng_decode_row(ctx, row_buffer, ihdr.width * 3);
if (err == SPNG_OK || err == SPNG_EOI) {
image_buffer = image->buffer + (row_info.row_num * image->stride);
for (int i = 0; i < ihdr.width * 3; i += 3) { for (int i = 0; i < ihdr.width * 3; i += 3) {
uint8_t r = row_buffer[i + 0] >> 3; uint8_t r = row_buffer[i + 0] >> 3;
uint8_t g = row_buffer[i + 1] >> 3; uint8_t g = row_buffer[i + 1] >> 3;
@ -86,12 +93,13 @@ png_err_t png_decode (char *path, surface_t *image, int max_width, int max_heigh
*image_buffer++ = (r << 11) | (g << 6) | (b << 1) | 1; *image_buffer++ = (r << 11) | (g << 6) | (b << 1) | 1;
} }
} }
} while (err == SPNG_OK);
spng_ctx_free(ctx); spng_ctx_free(ctx);
free(row_buffer); free(row_buffer);
fclose(file); fclose(file);
if ((err != SPNG_OK) && (err != SPNG_EOI)) { if (err != SPNG_EOI) {
surface_free(image); surface_free(image);
return PNG_ERR_BAD_FILE; return PNG_ERR_BAD_FILE;
} }