diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-11-25 18:26:37 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-11-25 18:26:37 +0300 |
| commit | 7c7b6e4e4ccb67ea885fce90af3b0167894a30db (patch) | |
| tree | 1d8620742b63be5afe1285b71bb5942abe71aeab /plugins/AdvaImg/src/LibPNG/pngget.c | |
| parent | 867c7e500c975c579796a3047962738774270ee0 (diff) | |
update libpng to 1.6.34
Diffstat (limited to 'plugins/AdvaImg/src/LibPNG/pngget.c')
| -rw-r--r-- | plugins/AdvaImg/src/LibPNG/pngget.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/plugins/AdvaImg/src/LibPNG/pngget.c b/plugins/AdvaImg/src/LibPNG/pngget.c index 2779548336..c4a558b188 100644 --- a/plugins/AdvaImg/src/LibPNG/pngget.c +++ b/plugins/AdvaImg/src/LibPNG/pngget.c @@ -1,8 +1,8 @@ /* pngget.c - retrieval of values from info struct
*
- * Last changed in libpng 1.6.26 [October 20, 2016]
- * Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson
+ * Last changed in libpng 1.6.32 [August 24, 2017]
+ * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
@@ -778,11 +778,22 @@ png_uint_32 PNGAPI png_get_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
png_bytep *exif)
{
+ png_warning(png_ptr, "png_get_eXIf does not work; use png_get_eXIf_1");
+ PNG_UNUSED(info_ptr)
+ PNG_UNUSED(exif)
+ return 0;
+}
+
+png_uint_32 PNGAPI
+png_get_eXIf_1(png_const_structrp png_ptr, png_const_inforp info_ptr,
+ png_uint_32 *num_exif, png_bytep *exif)
+{
png_debug1(1, "in %s retrieval function", "eXIf");
if (png_ptr != NULL && info_ptr != NULL &&
(info_ptr->valid & PNG_INFO_eXIf) != 0 && exif != NULL)
{
+ *num_exif = info_ptr->num_exif;
*exif = info_ptr->exif;
return (PNG_INFO_eXIf);
}
|