walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Changes in pngconvert.c

This commit is contained in:
szukw000 2018-01-07 17:23:51 +01:00
parent 6e6f8354a0
commit 433154415f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/jp2/convertpng.c
View File

@ -75,10 +75,10 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
png_uint_32 width, height = 0U; png_uint_32 width, height = 0U;
int color_type; int color_type;
FILE *reader = NULL; FILE *reader = NULL;
OPJ_BYTE** rows = NULL; OPJ_BYTE** rows;
OPJ_INT32* row32s = NULL; OPJ_INT32* row32s;
/* j2k: */ /* j2k: */
opj_image_t *image = NULL; opj_image_t *image;
opj_image_cmptparm_t cmptparm[4]; opj_image_cmptparm_t cmptparm[4];
OPJ_UINT32 nr_comp; OPJ_UINT32 nr_comp;
OPJ_BYTE sigbuf[8]; OPJ_BYTE sigbuf[8];
@ -94,20 +94,28 @@ opj_image_t *pngtoimage(const char *read_idf, opj_cparameters_t * params)
if (fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE if (fread(sigbuf, 1, MAGIC_SIZE, reader) != MAGIC_SIZE
|| memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0) { || memcmp(sigbuf, PNG_MAGIC, MAGIC_SIZE) != 0) {
fprintf(stderr, "pngtoimage: %s is no valid PNG file\n", read_idf); fprintf(stderr, "pngtoimage: %s is no valid PNG file\n", read_idf);
goto fin; return NULL;
} }
if ((png = png_create_read_struct(PNG_LIBPNG_VER_STRING, if ((png = png_create_read_struct(PNG_LIBPNG_VER_STRING,
NULL, NULL, NULL)) == NULL) { NULL, NULL, NULL)) == NULL) {
goto fin; fclose(reader);
return NULL;
} }
if ((info = png_create_info_struct(png)) == NULL) { if ((info = png_create_info_struct(png)) == NULL) {
goto fin; fclose(reader);
png_destroy_read_struct(&png, NULL, NULL);
return NULL;
} }
if (setjmp(png_jmpbuf(png))) { if (setjmp(png_jmpbuf(png))) {
goto fin; png_destroy_read_struct(&png, &info, NULL);
fclose(reader);
return NULL;
} }
rows = NULL;
row32s = NULL;
image = NULL;
png_init_io(png, reader); png_init_io(png, reader);
png_set_sig_bytes(png, MAGIC_SIZE); png_set_sig_bytes(png, MAGIC_SIZE);