# HG changeset patch # User Matti Hamalainen # Date 1481112298 -7200 # Node ID 5a1eec3c43ccf0f653e5c37b9c55996b3acf85b5 # Parent 6dc09314d44bd3aa3f4cd867e1af23114095678c Get rid of indirect metadata variable sillyness in load_image(). diff -r 6dc09314d44b -r 5a1eec3c43cc bpgenc.c --- a/bpgenc.c Wed Dec 07 12:27:40 2016 +0200 +++ b/bpgenc.c Wed Dec 07 14:04:58 2016 +0200 @@ -1541,7 +1541,6 @@ { FILE *f; Image *img = NULL; - BPGMetaData *md; uint8_t buf[PROBE_BUF_SIZE]; *pmd = NULL; @@ -1555,17 +1554,16 @@ fseek(f, 0, SEEK_SET); if (png_sig_cmp(buf, 0, PROBE_BUF_SIZE) == 0) - img = read_png(&md, f, color_space, bit_depth, limited_range, premultiplied_alpha); + img = read_png(pmd, f, color_space, bit_depth, limited_range, premultiplied_alpha); else if (memcmp(buf, PROBE_TIFF_MAGIC_LE, sizeof(PROBE_TIFF_MAGIC_LE)) == 0 || memcmp(buf, PROBE_TIFF_MAGIC_BE, sizeof(PROBE_TIFF_MAGIC_BE)) == 0) - img = read_tiff(&md, infilename, color_space, bit_depth, limited_range, premultiplied_alpha); + img = read_tiff(pmd, infilename, color_space, bit_depth, limited_range, premultiplied_alpha); else - img = read_jpeg(&md, f, bit_depth); + img = read_jpeg(pmd, f, bit_depth); err: fclose(f); - *pmd = md; return img; }