src/java.desktop/share/native/libsplashscreen/libpng/pngtest.c

*** 28,38 ****
   * License version 2 only, as published by the Free Software Foundation.
   * However, the following notice accompanied the original version of this
   * file and, per its terms, should not be removed:
   *
   * Last changed in libpng 1.5.25 [December 3, 2015]
!  * Copyright (c) 1998-2015 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.)
   *
   * This code is released under the libpng license.
   * For conditions of distribution and use, see the disclaimer
--- 28,38 ----
   * License version 2 only, as published by the Free Software Foundation.
   * However, the following notice accompanied the original version of this
   * file and, per its terms, should not be removed:
   *
   * Last changed in libpng 1.5.25 [December 3, 2015]
!  * Copyright (c) 1998-2002,2004,2006-2015 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.)
   *
   * This code is released under the libpng license.
   * For conditions of distribution and use, see the disclaimer
*** 69,78 ****
--- 69,87 ----
  /*  #define STDERR stderr  */
  #define STDERR stdout   /* For DOS */
  
  #include "png.h"
  
+ /* 1.6.1 added support for the configure test harness, which uses 77 to indicate
+  * a skipped test, in earlier versions we need to succeed on a skipped test, so:
+  */
+ #if PNG_LIBPNG_VER >= 10601 && defined(HAVE_CONFIG_H)
+ #  define SKIP 77
+ #else
+ #  define SKIP 0
+ #endif
+ 
  /* Known chunks that exist in pngtest.png must be supported or pngtest will fail
   * simply as a result of re-ordering them.  This may be fixed in 1.7
   *
   * pngtest allocates a single row buffer for each row and overwrites it,
   * therefore if the write side doesn't support the writing of interlaced images
*** 2091,2101 ****
  main(void)
  {
     fprintf(STDERR,
        " test ignored because libpng was not built with read support\n");
     /* And skip this test */
!    return PNG_LIBPNG_VER < 10600 ? 0 : 77;
  }
  #endif
  
  /* Generate a compiler error if there is an old png.h in the search path. */
! typedef png_libpng_version_1_6_20 Your_png_h_is_not_version_1_6_20;
--- 2100,2110 ----
  main(void)
  {
     fprintf(STDERR,
        " test ignored because libpng was not built with read support\n");
     /* And skip this test */
!    return SKIP;
  }
  #endif
  
  /* Generate a compiler error if there is an old png.h in the search path. */
! typedef png_libpng_version_1_6_23 Your_png_h_is_not_version_1_6_23;