Mercurial > hg > forks > libbpg
comparison bpgenc.c @ 17:91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
bpg_add_md_contents() respectively.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Wed, 26 Apr 2017 18:22:11 +0300 |
parents | 86b6c976ef2d |
children | 403c67bcb76a |
comparison
equal
deleted
inserted
replaced
16:86b6c976ef2d | 17:91f27e9fdb60 |
---|---|
907 free(md); | 907 free(md); |
908 md = md_next; | 908 md = md_next; |
909 } | 909 } |
910 } | 910 } |
911 | 911 |
912 void insert_md(BPGMetaData **list, BPGMetaData *node) | 912 void bpg_insert_md(BPGMetaData **list, BPGMetaData *node) |
913 { | 913 { |
914 if (*list == NULL) | 914 if (*list == NULL) |
915 { | 915 { |
916 *list = node; | 916 *list = node; |
917 node->next = NULL; | 917 node->next = NULL; |
921 node->next = *list; | 921 node->next = *list; |
922 *list = node; | 922 *list = node; |
923 } | 923 } |
924 } | 924 } |
925 | 925 |
926 int add_md_contents(BPGMetaData **list, const int tag, const size_t len, const void *buf) | 926 int bpg_add_md_contents(BPGMetaData **list, const int tag, const size_t len, const void *buf) |
927 { | 927 { |
928 BPGMetaData *md; | 928 BPGMetaData *md; |
929 | 929 |
930 if ((md = bpg_md_alloc(tag)) == NULL) | 930 if ((md = bpg_md_alloc(tag)) == NULL) |
931 goto err; | 931 goto err; |
933 if ((md->buf = malloc(len)) == NULL) | 933 if ((md->buf = malloc(len)) == NULL) |
934 goto err; | 934 goto err; |
935 | 935 |
936 md->buf_len = len; | 936 md->buf_len = len; |
937 memcpy(md->buf, buf, len); | 937 memcpy(md->buf, buf, len); |
938 insert_md(list, md); | 938 bpg_insert_md(list, md); |
939 return 0; | 939 return 0; |
940 | 940 |
941 err: | 941 err: |
942 bpg_md_free(md); | 942 bpg_md_free(md); |
943 return -1; | 943 return -1; |
1146 } | 1146 } |
1147 } | 1147 } |
1148 | 1148 |
1149 // Get meta data | 1149 // Get meta data |
1150 if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &tmp_len, &tmp_buf)) | 1150 if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &tmp_len, &tmp_buf)) |
1151 add_md_contents(pmd, BPG_EXTENSION_TAG_ICCP, tmp_len, tmp_buf); | 1151 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_ICCP, tmp_len, tmp_buf); |
1152 | 1152 |
1153 if (TIFFGetField(tif, TIFFTAG_XMLPACKET, &tmp_len, &tmp_buf)) | 1153 if (TIFFGetField(tif, TIFFTAG_XMLPACKET, &tmp_len, &tmp_buf)) |
1154 add_md_contents(pmd, BPG_EXTENSION_TAG_XMP, tmp_len, tmp_buf); | 1154 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_XMP, tmp_len, tmp_buf); |
1155 | 1155 |
1156 err: | 1156 err: |
1157 if (buf != NULL) | 1157 if (buf != NULL) |
1158 _TIFFfree(buf); | 1158 _TIFFfree(buf); |
1159 | 1159 |
1321 png_bytep iccp_buf; | 1321 png_bytep iccp_buf; |
1322 png_uint_32 iccp_buf_len; | 1322 png_uint_32 iccp_buf_len; |
1323 | 1323 |
1324 if (png_get_iCCP(png_ptr, info_ptr, | 1324 if (png_get_iCCP(png_ptr, info_ptr, |
1325 &name, &comp_type, &iccp_buf, &iccp_buf_len) == PNG_INFO_iCCP) | 1325 &name, &comp_type, &iccp_buf, &iccp_buf_len) == PNG_INFO_iCCP) |
1326 add_md_contents(pmd, BPG_EXTENSION_TAG_ICCP, iccp_buf_len, iccp_buf); | 1326 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_ICCP, iccp_buf_len, iccp_buf); |
1327 } | 1327 } |
1328 | 1328 |
1329 png_destroy_read_struct(&png_ptr, &info_ptr, NULL); | 1329 png_destroy_read_struct(&png_ptr, &info_ptr, NULL); |
1330 | 1330 |
1331 return img; | 1331 return img; |