src/java.desktop/share/native/libsplashscreen/libpng/pngpread.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.35 [July 15, 2018]
   * Copyright (c) 1998-2002,2004,2006-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
   */
--- 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-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
   */
*** 998,1021 ****
  {
  #ifdef PNG_READ_INTERLACING_SUPPORTED
     /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
  
     /* Start of interlace block */
!    static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
  
     /* Offset to next interlace block */
!    static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
  
     /* Start of interlace block in the y direction */
!    static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
  
     /* Offset to next interlace block in the y direction */
!    static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
  
     /* Height of interlace block.  This is not currently used - if you need
      * it, uncomment it here and in png.h
!    static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
     */
  #endif
  
     png_ptr->row_number++;
     if (png_ptr->row_number < png_ptr->num_rows)
--- 998,1021 ----
  {
  #ifdef PNG_READ_INTERLACING_SUPPORTED
     /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
  
     /* Start of interlace block */
!    static const png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
  
     /* Offset to next interlace block */
!    static const png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
  
     /* Start of interlace block in the y direction */
!    static const png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
  
     /* Offset to next interlace block in the y direction */
!    static const png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
  
     /* Height of interlace block.  This is not currently used - if you need
      * it, uncomment it here and in png.h
!    static const png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1};
     */
  #endif
  
     png_ptr->row_number++;
     if (png_ptr->row_number < png_ptr->num_rows)