ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Util: Fix non-USE_PNG build

This commit is contained in:
Vicki Pfau 2023-03-27 00:16:26 -07:00
parent 3c353b572b
commit 7ef8cd961f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/util/image.c
View File

@ -39,6 +39,7 @@ struct mImage* mImageLoad(const char* path) {
return image; return image;
} }
#ifdef USE_PNG
static struct mImage* mImageLoadPNG(struct VFile* vf) { static struct mImage* mImageLoadPNG(struct VFile* vf) {
png_structp png = PNGReadOpen(vf, PNG_HEADER_BYTES); png_structp png = PNGReadOpen(vf, PNG_HEADER_BYTES);
png_infop info = png_create_info_struct(png); png_infop info = png_create_info_struct(png);
@ -92,13 +93,16 @@ static struct mImage* mImageLoadPNG(struct VFile* vf) {
} }
return image; return image;
} }
#endif
struct mImage* mImageLoadVF(struct VFile* vf) { struct mImage* mImageLoadVF(struct VFile* vf) {
vf->seek(vf, 0, SEEK_SET); vf->seek(vf, 0, SEEK_SET);
#ifdef USE_PNG
if (isPNG(vf)) { if (isPNG(vf)) {
return mImageLoadPNG(vf); return mImageLoadPNG(vf);
} }
vf->seek(vf, 0, SEEK_SET); vf->seek(vf, 0, SEEK_SET);
#endif
return NULL; return NULL;
} }

4
src/util/test/image.c
View File

@ -441,6 +441,7 @@ M_TEST_DEFINE(oobWrite) {
assert_memory_equal(buffer, (&(uint8_t[8]) { 0xFF, 0xFF, 0xFF, 0xFF }), sizeof(buffer)); assert_memory_equal(buffer, (&(uint8_t[8]) { 0xFF, 0xFF, 0xFF, 0xFF }), sizeof(buffer));
} }
#ifdef USE_PNG
M_TEST_DEFINE(loadPng24) { M_TEST_DEFINE(loadPng24) {
const uint8_t data[] = { const uint8_t data[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d,
@ -499,6 +500,7 @@ M_TEST_DEFINE(loadPng32) {
mImageDestroy(image); mImageDestroy(image);
} }
#endif
M_TEST_SUITE_DEFINE(Image, M_TEST_SUITE_DEFINE(Image,
cmocka_unit_test(pitchRead), cmocka_unit_test(pitchRead),
@ -507,6 +509,8 @@ M_TEST_SUITE_DEFINE(Image,
cmocka_unit_test(pitchWrite), cmocka_unit_test(pitchWrite),
cmocka_unit_test(strideWrite), cmocka_unit_test(strideWrite),
cmocka_unit_test(oobWrite), cmocka_unit_test(oobWrite),
#ifdef USE_PNG
cmocka_unit_test(loadPng24), cmocka_unit_test(loadPng24),
cmocka_unit_test(loadPng32), cmocka_unit_test(loadPng32),
#endif
) )