RaySollium99/libpicofe
1
0
Fork 0
mirror of https://github.com/RaySollium99/libpicofe.git synced 2025-09-05 14:57:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

error checking for png

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@451 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2008-05-21 19:05:55 +00:00
parent 2b395ee02a
commit ff63afa1b6
3 changed files with 46 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/emu.c
View file

@ -224,7 +224,7 @@ int emu_cdCheck(int *pregion)
return type; return type;
} }
static int extract_text(char *dest, unsigned char *src, int len, int swab) static int extract_text(char *dest, const unsigned char *src, int len, int swab)
{ {
char *p = dest; char *p = dest;
int i; int i;

38
common/readpng.c
View file

@ -12,23 +12,24 @@
#define BG_HEIGHT 240 #define BG_HEIGHT 240
#endif #endif
void readpng(void *dest, const char *fname, readpng_what what) int readpng(void *dest, const char *fname, readpng_what what)
{ {
FILE *fp; FILE *fp;
png_structp png_ptr = NULL; png_structp png_ptr = NULL;
png_infop info_ptr = NULL; png_infop info_ptr = NULL;
png_bytepp row_ptr = NULL; png_bytepp row_ptr = NULL;
int ret = -1;
if (dest == NULL || fname == NULL) if (dest == NULL || fname == NULL)
{ {
return; return -1;
} }
fp = fopen(fname, "rb"); fp = fopen(fname, "rb");
if (fp == NULL) if (fp == NULL)
{ {
lprintf(__FILE__ ": failed to open: %s\n", fname); lprintf(__FILE__ ": failed to open: %s\n", fname);
return; return -1;
} }
png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
@ -36,7 +37,7 @@ void readpng(void *dest, const char *fname, readpng_what what)
{ {
lprintf(__FILE__ ": png_create_read_struct() failed\n"); lprintf(__FILE__ ": png_create_read_struct() failed\n");
fclose(fp); fclose(fp);
return; return -1;
} }
info_ptr = png_create_info_struct(png_ptr); info_ptr = png_create_info_struct(png_ptr);
@ -145,12 +146,41 @@ void readpng(void *dest, const char *fname, readpng_what what)
} }
break; break;
} }
case READPNG_320_24:
case READPNG_480_24:
{
int height, width, h;
int needw = (what == READPNG_480_24) ? 480 : 320;
unsigned char *dst = dest;
if (info_ptr->pixel_depth != 24)
{
lprintf(__FILE__ ": image uses %ibpp, needed 24bpp\n", info_ptr->pixel_depth);
break;
}
height = info_ptr->height;
if (height > 240) height = 240;
width = info_ptr->width;
if (width > needw) width = needw;
for (h = 0; h < height; h++)
{
int len = width;
unsigned char *src = row_ptr[h];
dst += (needw - width) * 3;
for (len = width; len > 0; len--, dst+=3, src+=3)
dst[0] = src[2], dst[1] = src[1], dst[2] = src[0];
}
break;
}
} }
ret = 0;
done: done:
png_destroy_read_struct(&png_ptr, info_ptr ? &info_ptr : NULL, (png_infopp)NULL); png_destroy_read_struct(&png_ptr, info_ptr ? &info_ptr : NULL, (png_infopp)NULL);
fclose(fp); fclose(fp);
return ret;
} }

13
common/readpng.h
View file

@ -2,9 +2,18 @@ typedef enum
{ {
READPNG_BG = 1, READPNG_BG = 1,
READPNG_FONT, READPNG_FONT,
READPNG_SELECTOR READPNG_SELECTOR,
READPNG_320_24,
READPNG_480_24
} }
readpng_what; readpng_what;
void readpng(void *dest, const char *fname, readpng_what what); #ifdef __cplusplus
extern "C" {
#endif
int readpng(void *dest, const char *fname, readpng_what what);
#ifdef __cplusplus
}
#endif