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

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

*** 22,40 ****
   * questions.
   */
  
  /* pngset.c - storage of image information into info struct
   *
!  * 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.35 [July 15, 2018]
   * Copyright (c) 1998-2018 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
   *
--- 22,35 ----
   * questions.
   */
  
  /* pngset.c - storage of image information into info struct
   *
!  * Copyright (c) 2018 Cosmin Truta
   * Copyright (c) 1998-2018 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
   *
*** 163,182 ****
  #endif /* cHRM */
  
  #ifdef PNG_eXIf_SUPPORTED
  void PNGAPI
  png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
!     const png_bytep eXIf_buf)
  {
    png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1");
    PNG_UNUSED(info_ptr)
    PNG_UNUSED(eXIf_buf)
  }
  
  void PNGAPI
  png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr,
!     const png_uint_32 num_exif, const png_bytep eXIf_buf)
  {
     int i;
  
     png_debug1(1, "in %s storage function", "eXIf");
  
--- 158,177 ----
  #endif /* cHRM */
  
  #ifdef PNG_eXIf_SUPPORTED
  void PNGAPI
  png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr,
!     png_bytep eXIf_buf)
  {
    png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1");
    PNG_UNUSED(info_ptr)
    PNG_UNUSED(eXIf_buf)
  }
  
  void PNGAPI
  png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr,
!     png_uint_32 num_exif, png_bytep eXIf_buf)
  {
     int i;
  
     png_debug1(1, "in %s storage function", "eXIf");
  
*** 1425,1435 ****
     if (num_chunks_in < 0)
     {
        /* Ignore all unknown chunks and all chunks recognized by
         * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND
         */
!       static PNG_CONST png_byte chunks_to_ignore[] = {
           98,  75,  71,  68, '\0',  /* bKGD */
           99,  72,  82,  77, '\0',  /* cHRM */
          101,  88,  73, 102, '\0',  /* eXIf */
          103,  65,  77,  65, '\0',  /* gAMA */
          104,  73,  83,  84, '\0',  /* hIST */
--- 1420,1430 ----
     if (num_chunks_in < 0)
     {
        /* Ignore all unknown chunks and all chunks recognized by
         * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND
         */
!       static const png_byte chunks_to_ignore[] = {
           98,  75,  71,  68, '\0',  /* bKGD */
           99,  72,  82,  77, '\0',  /* cHRM */
          101,  88,  73, 102, '\0',  /* eXIf */
          103,  65,  77,  65, '\0',  /* gAMA */
          104,  73,  83,  84, '\0',  /* hIST */