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

rev 55557 : 8217676: Upgrade libpng to 1.6.37
Reviewed-by: prr, jdv

*** 27,40 ****
   * This file is available under and governed by the GNU General Public
   * 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.6.31 [July 27, 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.)
   *
   * This code is released under the libpng license.
   * For conditions of distribution and use, see the disclaimer
   * and license in png.h
   *
--- 27,40 ----
   * This file is available under and governed by the GNU General Public
   * 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:
   *
!  * Copyright (c) 2018 Cosmin Truta
   * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson
!  * Copyright (c) 1996-1997 Andreas Dilger
!  * 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
   * and license in png.h
   *
*** 451,461 ****
   * which is used to prefix the message.  The message is limited in length
   * to 63 bytes. The name characters are output as hex digits wrapped in []
   * if the character is invalid.
   */
  #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
! static PNG_CONST char png_digit[16] = {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
     'A', 'B', 'C', 'D', 'E', 'F'
  };
  
  static void /* PRIVATE */
--- 451,461 ----
   * which is used to prefix the message.  The message is limited in length
   * to 63 bytes. The name characters are output as hex digits wrapped in []
   * if the character is invalid.
   */
  #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97))
! static const char png_digit[16] = {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
     'A', 'B', 'C', 'D', 'E', 'F'
  };
  
  static void /* PRIVATE */
*** 911,921 ****
      */
  PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
  png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
      PNG_NORETURN)
  {
!    const png_const_structrp png_ptr = png_nonconst_ptr;
     png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
  
     /* An error is always logged here, overwriting anything (typically a warning)
      * that is already there:
      */
--- 911,921 ----
      */
  PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI
  png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message),
      PNG_NORETURN)
  {
!    png_const_structrp png_ptr = png_nonconst_ptr;
     png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
  
     /* An error is always logged here, overwriting anything (typically a warning)
      * that is already there:
      */
*** 946,956 ****
  
  #ifdef PNG_WARNINGS_SUPPORTED
  void /* PRIVATE */ PNGCBAPI
  png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
  {
!    const png_const_structrp png_ptr = png_nonconst_ptr;
     png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
  
     /* A warning is only logged if there is no prior warning or error. */
     if (image->warning_or_error == 0)
     {
--- 946,956 ----
  
  #ifdef PNG_WARNINGS_SUPPORTED
  void /* PRIVATE */ PNGCBAPI
  png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message)
  {
!    png_const_structrp png_ptr = png_nonconst_ptr;
     png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr);
  
     /* A warning is only logged if there is no prior warning or error. */
     if (image->warning_or_error == 0)
     {