[libpng17] Sync contrib/libtests/pngimage.c with libpng16; update CHANGES and ANNOUNCE

contrib/libtests/pngimage.c

@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2015,2016 John Cunningham Bowler
  *
- * Last changed in libpng 1.6.22 [May 26, 2016]
+ * Last changed in libpng 1.6.24 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer
@@ -45,19 +45,8 @@
 #  define SKIP 0
 #endif
 
-#if PNG_LIBPNG_VER < 10700
-   /* READ_PNG and WRITE_PNG were not defined, so: */
-#  ifdef PNG_INFO_IMAGE_SUPPORTED
-#     ifdef PNG_SEQUENTIAL_READ_SUPPORTED
-#        define PNG_READ_PNG_SUPPORTED
-#     endif /* SEQUENTIAL_READ */
-#     ifdef PNG_WRITE_SUPPORTED
-#        define PNG_WRITE_PNG_SUPPORTED
-#     endif /* WRITE */
-#  endif /* INFO_IMAGE */
-#endif /* pre 1.7.0 */
-
-#ifdef PNG_READ_PNG_SUPPORTED
+#if defined(PNG_INFO_IMAGE_SUPPORTED) && defined(PNG_SEQUENTIAL_READ_SUPPORTED)\
+    && (defined(PNG_READ_PNG_SUPPORTED) || PNG_LIBPNG_VER < 10700)
 /* If a transform is valid on both read and write this implies that if the
  * transform is applied to read it must also be applied on write to produce
  * meaningful data.  This is because these transforms when performed on read
@@ -406,7 +395,7 @@ buffer_destroy(struct buffer *buffer)
    buffer_destroy_list(list);
 }
 
-#ifdef PNG_WRITE_PNG_SUPPORTED
+#ifdef PNG_WRITE_SUPPORTED
 static void
 buffer_start_write(struct buffer *buffer)
 {
@@ -576,7 +565,7 @@ struct display
    png_structp    read_pp;
    png_infop      read_ip;
 
-#  ifdef PNG_WRITE_PNG_SUPPORTED
+#  ifdef PNG_WRITE_SUPPORTED
       /* Used to write a new image (the original info_ptr is used) */
       png_structp   write_pp;
       struct buffer written_file;   /* where the file gets written */
@@ -603,7 +592,7 @@ display_init(struct display *dp)
    dp->read_ip = NULL;
    buffer_init(&dp->original_file);
 
-#  ifdef PNG_WRITE_PNG_SUPPORTED
+#  ifdef PNG_WRITE_SUPPORTED
       dp->write_pp = NULL;
       buffer_init(&dp->written_file);
 #  endif
@@ -616,7 +605,7 @@ display_clean_read(struct display *dp)
       png_destroy_read_struct(&dp->read_pp, &dp->read_ip, NULL);
 }
 
-#ifdef PNG_WRITE_PNG_SUPPORTED
+#ifdef PNG_WRITE_SUPPORTED
 static void
 display_clean_write(struct display *dp)
 {
@@ -628,7 +617,7 @@ display_clean_write(struct display *dp)
 static void
 display_clean(struct display *dp)
 {
-#  ifdef PNG_WRITE_PNG_SUPPORTED
+#  ifdef PNG_WRITE_SUPPORTED
       display_clean_write(dp);
 #  endif
    display_clean_read(dp);
@@ -646,7 +635,7 @@ static void
 display_destroy(struct display *dp)
 {
     /* Release any memory held in the display. */
-#  ifdef PNG_WRITE_PNG_SUPPORTED
+#  ifdef PNG_WRITE_SUPPORTED
       buffer_destroy(&dp->written_file);
 #  endif
 
@@ -1264,7 +1253,7 @@ compare_read(struct display *dp, int applied_transforms)
    return 1; /* compare succeeded */
 }
 
-#ifdef PNG_WRITE_PNG_SUPPORTED
+#ifdef PNG_WRITE_SUPPORTED
 static void
 buffer_write(struct display *dp, struct buffer *buffer, png_bytep data,
    png_size_t size)
@@ -1363,7 +1352,7 @@ write_png(struct display *dp, png_infop ip, int transforms)
     */
    display_clean_write(dp);
 }
-#endif /* WRITE_PNG */
+#endif /* WRITE_SUPPORTED */
 
 static int
 skip_transform(struct display *dp, int tr)
@@ -1425,7 +1414,7 @@ test_one_file(struct display *dp, const char *filename)
          return; /* no point testing more */
    }
 
-#ifdef PNG_WRITE_PNG_SUPPORTED
+#ifdef PNG_WRITE_SUPPORTED
    /* Second test: write the original PNG data out to a new file (to test the
     * write side) then read the result back in and make sure that it hasn't
     * changed.
@@ -1466,7 +1455,7 @@ test_one_file(struct display *dp, const char *filename)
           * out and read it back in again (without the reversible transforms)
           * we should get back to the place where we started.
           */
-#ifdef PNG_WRITE_PNG_SUPPORTED
+#ifdef PNG_WRITE_SUPPORTED
          if ((current & write_transforms) == current)
          {
             /* All transforms reversible: write the PNG with the transformations
@@ -1702,7 +1691,7 @@ main(const int argc, const char * const * const argv)
       return errors != 0;
    }
 }
-#else /* !READ_PNG */
+#else /* !INFO_IMAGE || !SEQUENTIAL_READ || !READ_PNG*/
 int
 main(void)
 {

contrib/tools/pngcp.c

@@ -2,7 +2,7 @@
  *
  * Copyright (c) 2016 John Cunningham Bowler
  *
- * Last changed in libpng 1.6.24beta03 [June 27, 2016]
+ * Last changed in libpng 1.6.24 [(PENDING RELEASE)]
  *
  * This code is released under the libpng license.
  * For conditions of distribution and use, see the disclaimer