automatic version update by autodist [release 1.6.35-1mamba;Sat Sep 15 2018]

automatic version update by autodist [release 1.6.34-1mamba;Tue Oct 03 2017]
automatic version update by autodist [release 1.6.32-1mamba;Thu Aug 31 2017]
2024-01-06 05:24:43 +01:00 · 2024-01-06 05:24:43 +01:00 · 2024-01-06 05:24:43 +01:00 · 2024-01-06 05:24:43 +01:00 · 2024-01-06 05:24:43 +01:00 · 2024-01-06 05:24:43 +01:00
2 changed files with 203 additions and 162 deletions
--- a/libpng-1.6.35-apng.patch
+++ b/libpng-1.6.35-apng.patch
@@ -1,7 +1,7 @@
-diff -Naru libpng-1.6.23.org/png.h libpng-1.6.23/png.h
--- libpng-1.6.23.org/png.h	2016-06-09 22:23:09.753041866 +0900
-+++ libpng-1.6.23/png.h	2016-06-09 22:23:39.282106366 +0900
-@@ -366,6 +366,10 @@
+diff -Naru libpng-1.6.35.org/png.h libpng-1.6.35/png.h
+--- libpng-1.6.35.org/png.h	2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/png.h	2018-07-21 19:16:16.327364638 +0900
+@@ -361,6 +361,10 @@
 #   include "pnglibconf.h"
 #endif
 
@@ -10,38 +10,38 @@ diff -Naru libpng-1.6.23.org/png.h libpng-1.6.23/png.h
 +#define PNG_WRITE_APNG_SUPPORTED
 +
 #ifndef PNG_VERSION_INFO_ONLY
-    /* Machine specific configuration. */
+ /* Machine specific configuration. */
 #  include "pngconf.h"
-@@ -461,6 +465,17 @@
+@@ -456,6 +460,17 @@
  * See pngconf.h for base types that vary by machine/system
  */
 
 +#ifdef PNG_APNG_SUPPORTED
 +/* dispose_op flags from inside fcTL */
-+#define PNG_DISPOSE_OP_NONE        0x00
-+#define PNG_DISPOSE_OP_BACKGROUND  0x01
-+#define PNG_DISPOSE_OP_PREVIOUS    0x02
+#define PNG_DISPOSE_OP_NONE        0x00U
+#define PNG_DISPOSE_OP_BACKGROUND  0x01U
+#define PNG_DISPOSE_OP_PREVIOUS    0x02U
 +
 +/* blend_op flags from inside fcTL */
-+#define PNG_BLEND_OP_SOURCE        0x00
-+#define PNG_BLEND_OP_OVER          0x01
+#define PNG_BLEND_OP_SOURCE        0x00U
+#define PNG_BLEND_OP_OVER          0x01U
 +#endif /* PNG_APNG_SUPPORTED */
 +
 /* This triggers a compiler error in png.c, if png.c and png.h
  * do not agree upon the version number.
  */
-@@ -781,6 +796,10 @@
- #define PNG_INFO_sPLT 0x2000U  /* ESR, 1.0.6 */
+@@ -777,6 +792,10 @@
 #define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
 #define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
+ #define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
 +#ifdef PNG_APNG_SUPPORTED
-+#define PNG_INFO_acTL 0x10000
-+#define PNG_INFO_fcTL 0x20000
+#define PNG_INFO_acTL 0x20000U
+#define PNG_INFO_fcTL 0x40000U
 +#endif
 
 /* This is used for the transformation routines, as some of them
  * change these values for the row.  It also should enable using
-@@ -818,6 +837,10 @@
+@@ -814,6 +833,10 @@
 #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
 typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
 typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
@@ -52,97 +52,97 @@ diff -Naru libpng-1.6.23.org/png.h libpng-1.6.23/png.h
 
 /* The following callback receives png_uint_32 row_number, int pass for the
  * png_bytep data of the row.  When transforming an interlaced image the
-@@ -3236,6 +3259,74 @@
+@@ -3257,6 +3280,74 @@
 /*******************************************************************************
  *  END OF HARDWARE AND SOFTWARE OPTIONS
  ******************************************************************************/
 +#ifdef PNG_APNG_SUPPORTED
-+PNG_EXPORT(246, png_uint_32, png_get_acTL, (png_structp png_ptr,
+PNG_EXPORT(250, png_uint_32, png_get_acTL, (png_structp png_ptr,
 +   png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
 +
-+PNG_EXPORT(247, png_uint_32, png_set_acTL, (png_structp png_ptr,
+PNG_EXPORT(251, png_uint_32, png_set_acTL, (png_structp png_ptr,
 +   png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
 +
-+PNG_EXPORT(248, png_uint_32, png_get_num_frames, (png_structp png_ptr,
+PNG_EXPORT(252, png_uint_32, png_get_num_frames, (png_structp png_ptr,
 +   png_infop info_ptr));
 +
-+PNG_EXPORT(249, png_uint_32, png_get_num_plays, (png_structp png_ptr,
+PNG_EXPORT(253, png_uint_32, png_get_num_plays, (png_structp png_ptr,
 +   png_infop info_ptr));
 +
-+PNG_EXPORT(250, png_uint_32, png_get_next_frame_fcTL,
+PNG_EXPORT(254, png_uint_32, png_get_next_frame_fcTL,
 +   (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
 +   png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
 +   png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
 +   png_byte *blend_op));
 +
-+PNG_EXPORT(251, png_uint_32, png_set_next_frame_fcTL,
+PNG_EXPORT(255, png_uint_32, png_set_next_frame_fcTL,
 +   (png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
 +   png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
 +   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
 +   png_byte blend_op));
 +
-+PNG_EXPORT(252, png_uint_32, png_get_next_frame_width,
+PNG_EXPORT(256, png_uint_32, png_get_next_frame_width,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(253, png_uint_32, png_get_next_frame_height,
+PNG_EXPORT(257, png_uint_32, png_get_next_frame_height,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(254, png_uint_32, png_get_next_frame_x_offset,
+PNG_EXPORT(258, png_uint_32, png_get_next_frame_x_offset,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(255, png_uint_32, png_get_next_frame_y_offset,
+PNG_EXPORT(259, png_uint_32, png_get_next_frame_y_offset,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_num,
+PNG_EXPORT(260, png_uint_16, png_get_next_frame_delay_num,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(257, png_uint_16, png_get_next_frame_delay_den,
+PNG_EXPORT(261, png_uint_16, png_get_next_frame_delay_den,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(258, png_byte, png_get_next_frame_dispose_op,
+PNG_EXPORT(262, png_byte, png_get_next_frame_dispose_op,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(259, png_byte, png_get_next_frame_blend_op,
+PNG_EXPORT(263, png_byte, png_get_next_frame_blend_op,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(260, png_byte, png_get_first_frame_is_hidden,
+PNG_EXPORT(264, png_byte, png_get_first_frame_is_hidden,
 +   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(261, png_uint_32, png_set_first_frame_is_hidden,
+PNG_EXPORT(265, png_uint_32, png_set_first_frame_is_hidden,
 +   (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
 +
 +#ifdef PNG_READ_APNG_SUPPORTED
-+PNG_EXPORT(262, void, png_read_frame_head, (png_structp png_ptr,
+PNG_EXPORT(266, void, png_read_frame_head, (png_structp png_ptr,
 +   png_infop info_ptr));
 +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-+PNG_EXPORT(263, void, png_set_progressive_frame_fn, (png_structp png_ptr,
+PNG_EXPORT(267, void, png_set_progressive_frame_fn, (png_structp png_ptr,
 +   png_progressive_frame_ptr frame_info_fn,
 +   png_progressive_frame_ptr frame_end_fn));
 +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
 +#endif /* PNG_READ_APNG_SUPPORTED */
 +
 +#ifdef PNG_WRITE_APNG_SUPPORTED
-+PNG_EXPORT(264, void, png_write_frame_head, (png_structp png_ptr,
+PNG_EXPORT(268, void, png_write_frame_head, (png_structp png_ptr,
 +   png_infop info_ptr, png_bytepp row_pointers,
 +   png_uint_32 width, png_uint_32 height,
 +   png_uint_32 x_offset, png_uint_32 y_offset,
 +   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
 +   png_byte blend_op));
 +
-+PNG_EXPORT(265, void, png_write_frame_tail, (png_structp png_ptr,
+PNG_EXPORT(269, void, png_write_frame_tail, (png_structp png_ptr,
 +   png_infop info_ptr));
 +#endif /* PNG_WRITE_APNG_SUPPORTED */
 +#endif /* PNG_APNG_SUPPORTED */
 
 /* Maintainer: Put new public prototypes here ^, in libpng.3, in project
  * defs, and in scripts/symbols.def.
-@@ -3245,7 +3336,11 @@
+@@ -3266,7 +3357,11 @@
  * one to use is one more than this.)
  */
 #ifdef PNG_EXPORT_LAST_ORDINAL
 +#ifdef PNG_APNG_SUPPORTED
-+  PNG_EXPORT_LAST_ORDINAL(265);
+  PNG_EXPORT_LAST_ORDINAL(269);
 +#else
-   PNG_EXPORT_LAST_ORDINAL(245);
+   PNG_EXPORT_LAST_ORDINAL(249);
 +#endif /* PNG_APNG_SUPPORTED */
 #endif
 
 #ifdef __cplusplus
-diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c
--- libpng-1.6.23.org/pngget.c	2016-06-09 22:21:54.199319849 +0900
-+++ libpng-1.6.23/pngget.c	2016-06-09 22:23:39.230104491 +0900
-@@ -1216,4 +1216,166 @@
+diff -Naru libpng-1.6.35.org/pngget.c libpng-1.6.35/pngget.c
+--- libpng-1.6.35.org/pngget.c	2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pngget.c	2018-07-21 19:16:16.229356281 +0900
+@@ -1246,4 +1246,166 @@
 #  endif
 #endif
 
@@ -309,10 +309,10 @@ diff -Naru libpng-1.6.23.org/pngget.c libpng-1.6.23/pngget.c
 +}
 +#endif /* PNG_APNG_SUPPORTED */
 #endif /* READ || WRITE */
-diff -Naru libpng-1.6.23.org/pnginfo.h libpng-1.6.23/pnginfo.h
--- libpng-1.6.23.org/pnginfo.h	2016-06-09 22:21:54.200319885 +0900
-+++ libpng-1.6.23/pnginfo.h	2016-06-09 22:23:39.230104491 +0900
-@@ -255,5 +255,18 @@
+diff -Naru libpng-1.6.35.org/pnginfo.h libpng-1.6.35/pnginfo.h
+--- libpng-1.6.35.org/pnginfo.h	2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pnginfo.h	2018-07-21 19:16:16.228356197 +0900
+@@ -263,5 +263,18 @@
    png_bytepp row_pointers;        /* the image bits */
 #endif
 
@@ -331,10 +331,10 @@ diff -Naru libpng-1.6.23.org/pnginfo.h libpng-1.6.23/pnginfo.h
 +
 };
 #endif /* PNGINFO_H */
-diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
--- libpng-1.6.23.org/pngpread.c	2016-06-09 22:23:09.754041902 +0900
-+++ libpng-1.6.23/pngpread.c	2016-06-09 22:23:39.230104491 +0900
-@@ -194,6 +194,106 @@
+diff -Naru libpng-1.6.35.org/pngpread.c libpng-1.6.35/pngpread.c
+--- libpng-1.6.35.org/pngpread.c	2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pngpread.c	2018-07-21 19:16:16.228356197 +0900
+@@ -195,6 +195,106 @@
 
    chunk_name = png_ptr->chunk_name;
 
@@ -441,7 +441,7 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
    if (chunk_name == png_IDAT)
    {
       if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-@@ -260,6 +360,9 @@
+@@ -261,6 +361,9 @@
 
    else if (chunk_name == png_IDAT)
    {
@@ -451,7 +451,7 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
       png_ptr->idat_size = png_ptr->push_length;
       png_ptr->process_mode = PNG_READ_IDAT_MODE;
       png_push_have_info(png_ptr, info_ptr);
-@@ -405,6 +508,30 @@
+@@ -406,6 +509,30 @@
       png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
    }
 #endif
@@ -482,7 +482,7 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
 
    else
    {
-@@ -538,7 +665,11 @@
+@@ -539,7 +666,11 @@
       png_byte chunk_tag[4];
 
       /* TODO: this code can be commoned up with the same code in push_read */
@@ -494,7 +494,7 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
       png_push_fill_buffer(png_ptr, chunk_length, 4);
       png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
       png_reset_crc(png_ptr);
-@@ -546,17 +677,64 @@
+@@ -547,17 +678,64 @@
       png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
 
@@ -559,7 +559,7 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
    }
 
    if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
-@@ -630,6 +808,15 @@
+@@ -631,6 +809,15 @@
    if (!(buffer_length > 0) || buffer == NULL)
       png_error(png_ptr, "No IDAT data (internal error)");
 
@@ -575,7 +575,7 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
    /* This routine must process all the data it has been given
     * before returning, calling the row callback as required to
     * handle the uncompressed results.
-@@ -1079,6 +1266,18 @@
+@@ -1085,6 +1272,18 @@
    png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
 }
 
@@ -594,21 +594,21 @@ diff -Naru libpng-1.6.23.org/pngpread.c libpng-1.6.23/pngpread.c
 png_voidp PNGAPI
 png_get_progressive_ptr(png_const_structrp png_ptr)
 {
-diff -Naru libpng-1.6.23.org/pngpriv.h libpng-1.6.23/pngpriv.h
--- libpng-1.6.23.org/pngpriv.h	2016-06-09 22:23:09.754041902 +0900
-+++ libpng-1.6.23/pngpriv.h	2016-06-09 22:23:39.245105032 +0900
-@@ -537,6 +537,10 @@
- #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-                    /*             0x4000 (unused) */
- #define PNG_IS_READ_STRUCT        0x8000 /* Else is a write struct */
+diff -Naru libpng-1.6.35.org/pngpriv.h libpng-1.6.35/pngpriv.h
+--- libpng-1.6.35.org/pngpriv.h	2018-07-21 19:16:37.185142931 +0900
+++ libpng-1.6.35/pngpriv.h	2018-07-21 19:16:16.226356026 +0900
+@@ -634,6 +634,10 @@
+ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
+                    /*             0x4000U (unused) */
+ #define PNG_IS_READ_STRUCT        0x8000U /* Else is a write struct */
 +#ifdef PNG_APNG_SUPPORTED
-+#define PNG_HAVE_acTL            0x10000
-+#define PNG_HAVE_fcTL            0x20000
+#define PNG_HAVE_acTL            0x10000U
+#define PNG_HAVE_fcTL            0x20000U
 +#endif
 
 /* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR                 0x0001
-@@ -754,6 +758,16 @@
+ #define PNG_BGR                 0x0001U
+@@ -870,6 +874,16 @@
 #define png_tRNS PNG_U32(116,  82,  78,  83)
 #define png_zTXt PNG_U32(122,  84,  88, 116)
 
@@ -618,15 +618,15 @@ diff -Naru libpng-1.6.23.org/pngpriv.h libpng-1.6.23/pngpriv.h
 +#define png_fdAT PNG_U32(102, 100,  65,  84)
 +
 +/* For png_struct.apng_flags: */
-+#define PNG_FIRST_FRAME_HIDDEN       0x0001
-+#define PNG_APNG_APP                 0x0002
+#define PNG_FIRST_FRAME_HIDDEN       0x0001U
+#define PNG_APNG_APP                 0x0002U
 +#endif
 +
 /* The following will work on (signed char*) strings, whereas the get_uint_32
  * macro will fail on top-bit-set values because of the sign extension.
  */
-@@ -1461,6 +1475,47 @@
-      */
+@@ -1641,6 +1655,47 @@
+     */
 #endif
 
 +#ifdef PNG_APNG_SUPPORTED
@@ -673,9 +673,9 @@ diff -Naru libpng-1.6.23.org/pngpriv.h libpng-1.6.23/pngpriv.h
 /* Added at libpng version 1.4.0 */
 #ifdef PNG_COLORSPACE_SUPPORTED
 /* These internal functions are for maintaining the colorspace structure within
-diff -Naru libpng-1.6.23.org/pngread.c libpng-1.6.23/pngread.c
--- libpng-1.6.23.org/pngread.c	2016-06-09 22:23:09.755041938 +0900
-+++ libpng-1.6.23/pngread.c	2016-06-09 22:23:39.247105104 +0900
+diff -Naru libpng-1.6.35.org/pngread.c libpng-1.6.35/pngread.c
+--- libpng-1.6.35.org/pngread.c	2018-07-21 19:16:37.186143016 +0900
+++ libpng-1.6.35/pngread.c	2018-07-21 19:16:16.224355855 +0900
@@ -161,6 +161,9 @@
 
       else if (chunk_name == png_IDAT)
@@ -686,7 +686,7 @@ diff -Naru libpng-1.6.23.org/pngread.c libpng-1.6.23/pngread.c
          png_ptr->idat_size = length;
          break;
       }
-@@ -250,6 +253,17 @@
+@@ -255,6 +258,17 @@
          png_handle_iTXt(png_ptr, info_ptr, length);
 #endif
 
@@ -703,8 +703,8 @@ diff -Naru libpng-1.6.23.org/pngread.c libpng-1.6.23/pngread.c
 +
       else
          png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
-@@ -257,6 +271,72 @@
+              PNG_HANDLE_CHUNK_AS_DEFAULT);
+@@ -262,6 +276,72 @@
 }
 #endif /* SEQUENTIAL_READ */
 
@@ -777,10 +777,10 @@ diff -Naru libpng-1.6.23.org/pngread.c libpng-1.6.23/pngread.c
 /* Optional call to update the users info_ptr structure */
 void PNGAPI
 png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
-diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
--- libpng-1.6.23.org/pngrutil.c	2016-06-09 22:21:54.210320245 +0900
-+++ libpng-1.6.23/pngrutil.c	2016-06-09 22:23:39.249105176 +0900
-@@ -855,6 +855,11 @@
+diff -Naru libpng-1.6.35.org/pngrutil.c libpng-1.6.35/pngrutil.c
+--- libpng-1.6.35.org/pngrutil.c	2018-07-21 19:16:37.187143101 +0900
+++ libpng-1.6.35/pngrutil.c	2018-07-21 19:16:16.220355514 +0900
+@@ -865,6 +865,11 @@
    filter_type = buf[11];
    interlace_type = buf[12];
 
@@ -792,7 +792,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
    /* Set internal variables */
    png_ptr->width = width;
    png_ptr->height = height;
-@@ -2755,6 +2760,179 @@
+@@ -2858,6 +2863,179 @@
 }
 #endif
 
@@ -972,7 +972,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
 #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
 /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
 static int
-@@ -4013,7 +4191,38 @@
+@@ -4166,7 +4344,38 @@
       {
          uInt avail_in;
          png_bytep buffer;
@@ -983,7 +983,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
 +         {
 +            png_crc_finish(png_ptr, bytes_to_skip);
 +            bytes_to_skip = 0;
-+
+ 
 +            png_ptr->idat_size = png_read_chunk_header(png_ptr);
 +            if (png_ptr->num_frames_read == 0)
 +            {
@@ -1001,7 +1001,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
 +                  bytes_to_skip = png_ptr->idat_size;
 +                  continue;
 +               }
- 
+
 +               png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
 +
 +               png_ptr->idat_size -= 4;
@@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
          while (png_ptr->idat_size == 0)
          {
             png_crc_finish(png_ptr, 0);
-@@ -4025,7 +4234,7 @@
+@@ -4178,7 +4387,7 @@
             if (png_ptr->chunk_name != png_IDAT)
                png_error(png_ptr, "Not enough image data");
          }
@@ -1020,7 +1020,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
          avail_in = png_ptr->IDAT_read_size;
 
          if (avail_in > png_ptr->idat_size)
-@@ -4088,6 +4297,9 @@
+@@ -4241,6 +4450,9 @@
 
          png_ptr->mode |= PNG_AFTER_IDAT;
          png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
 
          if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
             png_chunk_benign_error(png_ptr, "Extra compressed data");
-@@ -4526,4 +4738,80 @@
+@@ -4679,4 +4891,80 @@
 
    png_ptr->flags |= PNG_FLAG_ROW_INIT;
 }
@@ -1111,10 +1111,10 @@ diff -Naru libpng-1.6.23.org/pngrutil.c libpng-1.6.23/pngrutil.c
 +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
 +#endif /* PNG_READ_APNG_SUPPORTED */
 #endif /* READ */
-diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c
--- libpng-1.6.23.org/pngset.c	2016-06-09 22:23:09.756041974 +0900
-+++ libpng-1.6.23/pngset.c	2016-06-09 22:23:39.249105176 +0900
-@@ -241,6 +241,11 @@
+diff -Naru libpng-1.6.35.org/pngset.c libpng-1.6.35/pngset.c
+--- libpng-1.6.35.org/pngset.c	2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngset.c	2018-07-21 19:16:16.256358584 +0900
+@@ -288,6 +288,11 @@
    info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
 
    info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
@@ -1126,7 +1126,7 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c
 }
 
 #ifdef PNG_oFFs_SUPPORTED
-@@ -1096,6 +1101,147 @@
+@@ -1158,6 +1163,147 @@
 }
 #endif /* sPLT */
 
@@ -1225,9 +1225,9 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c
 +    png_uint_16 delay_num, png_uint_16 delay_den,
 +    png_byte dispose_op, png_byte blend_op)
 +{
-+    if (width > PNG_UINT_31_MAX)
+    if (width == 0 || width > PNG_UINT_31_MAX)
 +        png_error(png_ptr, "invalid width in fcTL (> 2^31-1)");
-+    if (height > PNG_UINT_31_MAX)
+    if (height == 0 || height > PNG_UINT_31_MAX)
 +        png_error(png_ptr, "invalid height in fcTL (> 2^31-1)");
 +    if (x_offset > PNG_UINT_31_MAX)
 +        png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)");
@@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.23.org/pngset.c libpng-1.6.23/pngset.c
 #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
 static png_byte
 check_location(png_const_structrp png_ptr, int location)
-diff -Naru libpng-1.6.23.org/pngstruct.h libpng-1.6.23/pngstruct.h
--- libpng-1.6.23.org/pngstruct.h	2016-06-09 22:21:54.210320245 +0900
-+++ libpng-1.6.23/pngstruct.h	2016-06-09 22:23:39.250105212 +0900
+diff -Naru libpng-1.6.35.org/pngstruct.h libpng-1.6.35/pngstruct.h
+--- libpng-1.6.35.org/pngstruct.h	2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngstruct.h	2018-07-21 19:16:16.214355003 +0900
@@ -403,6 +403,27 @@
    png_byte filter_type;
 #endif
@@ -1305,10 +1305,10 @@ diff -Naru libpng-1.6.23.org/pngstruct.h libpng-1.6.23/pngstruct.h
 /* New members added in libpng-1.2.0 */
 
 /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
-diff -Naru libpng-1.6.23.org/pngtest.c libpng-1.6.23/pngtest.c
--- libpng-1.6.23.org/pngtest.c	2016-06-09 22:23:09.756041974 +0900
-+++ libpng-1.6.23/pngtest.c	2016-06-09 22:23:39.250105212 +0900
-@@ -883,6 +883,10 @@
+diff -Naru libpng-1.6.35.org/pngtest.c libpng-1.6.35/pngtest.c
+--- libpng-1.6.35.org/pngtest.c	2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngtest.c	2018-07-21 19:16:16.213354917 +0900
+@@ -875,6 +875,10 @@
    volatile int num_passes;
    int pass;
    int bit_depth, color_type;
@@ -1319,7 +1319,7 @@ diff -Naru libpng-1.6.23.org/pngtest.c libpng-1.6.23/pngtest.c
 
    row_buf = NULL;
    error_parameters.file_name = inname;
-@@ -1356,6 +1360,22 @@
+@@ -1381,6 +1385,22 @@
       }
    }
 #endif
@@ -1342,7 +1342,7 @@ diff -Naru libpng-1.6.23.org/pngtest.c libpng-1.6.23/pngtest.c
 #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
    {
       png_unknown_chunkp unknowns;
-@@ -1427,6 +1447,110 @@
+@@ -1461,6 +1481,110 @@
    t_misc += (t_stop - t_start);
    t_start = t_stop;
 #endif
@@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.23.org/pngtest.c libpng-1.6.23/pngtest.c
    for (pass = 0; pass < num_passes; pass++)
    {
 #     ifdef calc_pass_height
-diff -Naru libpng-1.6.23.org/pngwrite.c libpng-1.6.23/pngwrite.c
--- libpng-1.6.23.org/pngwrite.c	2016-06-09 22:21:54.212320317 +0900
-+++ libpng-1.6.23/pngwrite.c	2016-06-09 22:23:39.251105248 +0900
+diff -Naru libpng-1.6.35.org/pngwrite.c libpng-1.6.35/pngwrite.c
+--- libpng-1.6.35.org/pngwrite.c	2018-07-21 19:16:37.188143186 +0900
+++ libpng-1.6.35/pngwrite.c	2018-07-21 19:16:16.211354747 +0900
@@ -128,6 +128,10 @@
        * the application continues writing the PNG.  So check the 'invalid'
        * flag here too.
@@ -1467,7 +1467,7 @@ diff -Naru libpng-1.6.23.org/pngwrite.c libpng-1.6.23/pngwrite.c
 #ifdef PNG_GAMMA_SUPPORTED
 #  ifdef PNG_WRITE_gAMA_SUPPORTED
       if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-@@ -365,6 +369,11 @@
+@@ -370,6 +374,11 @@
       png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
 #endif
 
@@ -1479,7 +1479,7 @@ diff -Naru libpng-1.6.23.org/pngwrite.c libpng-1.6.23/pngwrite.c
    /* See if user wants us to write information chunks */
    if (info_ptr != NULL)
    {
-@@ -1450,6 +1459,43 @@
+@@ -1461,6 +1470,43 @@
 }
 #endif
 
@@ -1523,12 +1523,12 @@ diff -Naru libpng-1.6.23.org/pngwrite.c libpng-1.6.23/pngwrite.c
 
 #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
 /* Initialize the write structure - general purpose utility. */
-diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c
--- libpng-1.6.23.org/pngwutil.c	2016-06-09 22:21:54.213320353 +0900
-+++ libpng-1.6.23/pngwutil.c	2016-06-09 22:23:39.251105248 +0900
-@@ -817,6 +817,11 @@
+diff -Naru libpng-1.6.35.org/pngwutil.c libpng-1.6.35/pngwutil.c
+--- libpng-1.6.35.org/pngwutil.c	2018-07-21 19:16:37.189143271 +0900
+++ libpng-1.6.35/pngwutil.c	2018-07-21 19:16:16.303362592 +0900
+@@ -821,6 +821,11 @@
    /* Write the chunk */
-    png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
+    png_write_complete_chunk(png_ptr, png_IHDR, buf, 13);
 
 +#ifdef PNG_WRITE_APNG_SUPPORTED
 +   png_ptr->first_frame_width = width;
@@ -1538,38 +1538,45 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c
    if ((png_ptr->do_filter) == PNG_NO_FILTERS)
    {
       if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-@@ -998,7 +1003,14 @@
+@@ -1002,8 +1007,17 @@
                optimize_cmf(data, png_image_size(png_ptr));
 #endif
 
-+#        ifdef PNG_WRITE_APNG_SUPPORTED
-+            if (png_ptr->num_frames_written == 0)
-+#        endif
-          png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-+#        ifdef PNG_WRITE_APNG_SUPPORTED
-+            else
-+               png_write_fdAT(png_ptr, data, size);
-+#        endif /* PNG_WRITE_APNG_SUPPORTED */
+-         if (size > 0)
+-            png_write_complete_chunk(png_ptr, png_IDAT, data, size);
+            if (size > 0)
+#ifdef PNG_WRITE_APNG_SUPPORTED
+            {
+               if (png_ptr->num_frames_written == 0)
+#endif
+               png_write_complete_chunk(png_ptr, png_IDAT, data, size);
+#ifdef PNG_WRITE_APNG_SUPPORTED
+               else
+                  png_write_fdAT(png_ptr, data, size);
+            }
+#endif /* PNG_WRITE_APNG_SUPPORTED */
          png_ptr->mode |= PNG_HAVE_IDAT;
 
          png_ptr->zstream.next_out = data;
-@@ -1044,7 +1056,15 @@
-             optimize_cmf(data, png_image_size(png_ptr));
+@@ -1050,7 +1064,17 @@
 #endif
 
-+#        ifdef PNG_WRITE_APNG_SUPPORTED
+          if (size > 0)
+#ifdef PNG_WRITE_APNG_SUPPORTED
+         {
 +            if (png_ptr->num_frames_written == 0)
-+#        endif
-          png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-+#        ifdef PNG_WRITE_APNG_SUPPORTED
+#endif
+             png_write_complete_chunk(png_ptr, png_IDAT, data, size);
+#ifdef PNG_WRITE_APNG_SUPPORTED
 +            else
 +               png_write_fdAT(png_ptr, data, size);
-+#        endif /* PNG_WRITE_APNG_SUPPORTED */
+         }
+#endif /* PNG_WRITE_APNG_SUPPORTED */
 +
          png_ptr->zstream.avail_out = 0;
          png_ptr->zstream.next_out = NULL;
          png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
-@@ -1857,6 +1877,82 @@
+@@ -1885,6 +1909,82 @@
 }
 #endif
 
@@ -1652,7 +1659,7 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c
 /* Initializes the row writing capability of libpng */
 void /* PRIVATE */
 png_write_start_row(png_structrp png_ptr)
-@@ -2622,4 +2718,39 @@
+@@ -2778,4 +2878,39 @@
    }
 #endif /* WRITE_FLUSH */
 }
@@ -1692,30 +1699,30 @@ diff -Naru libpng-1.6.23.org/pngwutil.c libpng-1.6.23/pngwutil.c
 +}
 +#endif /* PNG_WRITE_APNG_SUPPORTED */
 #endif /* WRITE */
-diff -Naru libpng-1.6.23.org/scripts/symbols.def libpng-1.6.23/scripts/symbols.def
--- libpng-1.6.23.org/scripts/symbols.def	2016-06-09 22:23:09.757042011 +0900
-+++ libpng-1.6.23/scripts/symbols.def	2016-06-09 22:23:39.251105248 +0900
-@@ -250,3 +250,23 @@
-  png_get_palette_max @243
-  png_set_option @244
-  png_image_write_to_memory @245
-+ png_get_acTL @246
-+ png_set_acTL @247
-+ png_get_num_frames @248
-+ png_get_num_plays @249
-+ png_get_next_frame_fcTL @250
-+ png_set_next_frame_fcTL @251
-+ png_get_next_frame_width @252
-+ png_get_next_frame_height @253
-+ png_get_next_frame_x_offset @254
-+ png_get_next_frame_y_offset @255
-+ png_get_next_frame_delay_num @256
-+ png_get_next_frame_delay_den @257
-+ png_get_next_frame_dispose_op @258
-+ png_get_next_frame_blend_op @259
-+ png_get_first_frame_is_hidden @260
-+ png_set_first_frame_is_hidden @261
-+ png_read_frame_head @262
-+ png_set_progressive_frame_fn @263
-+ png_write_frame_head @264
-+ png_write_frame_tail @265
+diff -Naru libpng-1.6.35.org/scripts/symbols.def libpng-1.6.35/scripts/symbols.def
+--- libpng-1.6.35.org/scripts/symbols.def	2018-07-21 19:16:37.192143527 +0900
+++ libpng-1.6.35/scripts/symbols.def	2018-07-21 19:16:16.206354321 +0900
+@@ -254,3 +254,23 @@
+  png_set_eXIf @247
+  png_get_eXIf_1 @248
+  png_set_eXIf_1 @249
+ png_get_acTL @250
+ png_set_acTL @251
+ png_get_num_frames @252
+ png_get_num_plays @253
+ png_get_next_frame_fcTL @254
+ png_set_next_frame_fcTL @255
+ png_get_next_frame_width @256
+ png_get_next_frame_height @257
+ png_get_next_frame_x_offset @258
+ png_get_next_frame_y_offset @259
+ png_get_next_frame_delay_num @260
+ png_get_next_frame_delay_den @261
+ png_get_next_frame_dispose_op @262
+ png_get_next_frame_blend_op @263
+ png_get_first_frame_is_hidden @264
+ png_set_first_frame_is_hidden @265
+ png_read_frame_head @266
+ png_set_progressive_frame_fn @267
+ png_write_frame_head @268
+ png_write_frame_tail @269
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,6 +1,6 @@
 %define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
 Name:          libpng
-Version:       1.6.23
+Version:       1.6.35
 Release:       1mamba
 Summary:       A library of functions for manipulating PNG image format files
 Group:         System/Libraries
@@ -91,6 +91,7 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
 %files devel
 %defattr(-,root,root)
 %{_bindir}/png-fix-itxt
+#%{_bindir}/pngcp
 %{_bindir}/pngfix
 %{_bindir}/libpng-config
 %{_bindir}/libpng%{apiver}-config
@@ -125,6 +126,39 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
 %endif

 %changelog
+* Sat Sep 15 2018 Automatic Build System <autodist@mambasoft.it> 1.6.35-1mamba
+- automatic version update by autodist
+
+* Tue Oct 03 2017 Automatic Build System <autodist@mambasoft.it> 1.6.34-1mamba
+- automatic version update by autodist
+
+* Thu Aug 31 2017 Automatic Build System <autodist@mambasoft.it> 1.6.32-1mamba
+- automatic version update by autodist
+
+* Mon Aug 07 2017 Automatic Build System <autodist@mambasoft.it> 1.6.31-1mamba
+- automatic version update by autodist
+
+* Fri Aug 04 2017 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6.29-2mamba
+- relink with /lib64/libpthread.so.0 for IFUNC symbol longjmp
+
+* Thu Mar 30 2017 Automatic Build System <autodist@mambasoft.it> 1.6.29-1mamba
+- automatic version update by autodist
+
+* Sun Jan 08 2017 Automatic Build System <autodist@mambasoft.it> 1.6.28-1mamba
+- automatic version update by autodist
+
+* Thu Jan 05 2017 Automatic Build System <autodist@mambasoft.it> 1.6.27-1mamba
+- automatic version update by autodist
+
+* Sat Oct 22 2016 Automatic Build System <autodist@mambasoft.it> 1.6.26-1mamba
+- automatic version update by autodist
+
+* Tue Oct 04 2016 Automatic Build System <autodist@mambasoft.it> 1.6.25-1mamba
+- automatic version update by autodist
+
+* Sat Aug 20 2016 Automatic Build System <autodist@mambasoft.it> 1.6.24-1mamba
+- automatic version update by autodist
+
 * Wed Jun 15 2016 Automatic Build System <autodist@mambasoft.it> 1.6.23-1mamba
 - automatic version update by autodist
Author	SHA1	Message	Date
Automatic Build System	efa2bbd188	automatic version update by autodist [release 1.6.35-1mamba;Sat Sep 15 2018]	2024-01-06 05:24:43 +01:00
Automatic Build System	25d40a79fd	automatic version update by autodist [release 1.6.34-1mamba;Tue Oct 03 2017]	2024-01-06 05:24:43 +01:00
Automatic Build System	ad9d495065	automatic version update by autodist [release 1.6.32-1mamba;Thu Aug 31 2017]	2024-01-06 05:24:43 +01:00
Automatic Build System	64af2aa5f6	automatic version update by autodist [release 1.6.31-1mamba;Mon Aug 07 2017]	2024-01-06 05:24:43 +01:00
Silvan Calarco	a2e55792e6	relink with /lib64/libpthread.so.0 for IFUNC symbol longjmp [release 1.6.29-2mamba;Fri Aug 04 2017]	2024-01-06 05:24:43 +01:00
Automatic Build System	b79ea79596	automatic version update by autodist [release 1.6.29-1mamba;Thu Mar 30 2017]	2024-01-06 05:24:43 +01:00
Automatic Build System	4903f5dd87	automatic version update by autodist [release 1.6.28-1mamba;Sun Jan 08 2017]	2024-01-06 05:24:43 +01:00
Automatic Build System	4bbbcf6c1a	automatic version update by autodist [release 1.6.27-1mamba;Thu Jan 05 2017]	2024-01-06 05:24:42 +01:00
Automatic Build System	3043fb81f7	automatic version update by autodist [release 1.6.26-1mamba;Sat Oct 22 2016]	2024-01-06 05:24:42 +01:00
Automatic Build System	94aa4b4017	automatic version update by autodist [release 1.6.25-1mamba;Tue Oct 04 2016]	2024-01-06 05:24:42 +01:00
Automatic Build System	dcfc443627	automatic version update by autodist [release 1.6.24-1mamba;Sat Aug 20 2016]	2024-01-06 05:24:42 +01:00