src/share/native/sun/awt/libpng/pngpriv.h

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

*** 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-2019 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
   */
*** 200,210 ****
--- 200,213 ----
  #           endif /* no GNUC support */
  #        endif /* __GNUC__ */
  #     else /* !defined __ARM_NEON__ */
           /* The 'intrinsics' code simply won't compile without this -mfpu=neon:
            */
+ #        if !defined(__aarch64__)
+             /* The assembler code currently does not work on ARM64 */
  #          define PNG_ARM_NEON_IMPLEMENTATION 2
+ #        endif /* __aarch64__ */
  #     endif /* __ARM_NEON__ */
  #  endif /* !PNG_ARM_NEON_IMPLEMENTATION */
  
  #  ifndef PNG_ARM_NEON_IMPLEMENTATION
        /* Use the intrinsics code by default. */
*** 296,305 ****
--- 299,309 ----
  #  define PNG_POWERPC_VSX_IMPLEMENTATION 1
  #endif
  #endif
  
  
+ 
  /* Is this a build of a DLL where compilation of the object modules requires
   * different preprocessor settings to those required for a simple library?  If
   * so PNG_BUILD_DLL must be set.
   *
   * If libpng is used inside a DLL but that DLL does not export the libpng APIs
*** 1562,1575 ****
  PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
      png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
  #endif
  
  PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,
!     const png_uint_32 chunk_name),PNG_EMPTY);
  
  PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
!     const png_uint_32 chunk_length),PNG_EMPTY);
  
  PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
      png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
     /* This is the function that gets called for unknown chunks.  The 'keep'
      * argument is either non-zero for a known chunk that has been set to be
--- 1566,1579 ----
  PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr,
      png_inforp info_ptr, png_uint_32 length),PNG_EMPTY);
  #endif
  
  PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr,
!     png_uint_32 chunk_name),PNG_EMPTY);
  
  PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr,
!     png_uint_32 chunk_length),PNG_EMPTY);
  
  PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr,
      png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY);
     /* This is the function that gets called for unknown chunks.  The 'keep'
      * argument is either non-zero for a known chunk that has been set to be
*** 2142,2151 ****
--- 2146,2178 ----
  #endif
  
  PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr,
     png_const_charp key, png_bytep new_key), PNG_EMPTY);
  
+ #if PNG_ARM_NEON_IMPLEMENTATION == 1
+ PNG_INTERNAL_FUNCTION(void,
+                       png_riffle_palette_neon,
+                       (png_structrp),
+                       PNG_EMPTY);
+ PNG_INTERNAL_FUNCTION(int,
+                       png_do_expand_palette_rgba8_neon,
+                       (png_structrp,
+                        png_row_infop,
+                        png_const_bytep,
+                        const png_bytepp,
+                        const png_bytepp),
+                       PNG_EMPTY);
+ PNG_INTERNAL_FUNCTION(int,
+                       png_do_expand_palette_rgb8_neon,
+                       (png_structrp,
+                        png_row_infop,
+                        png_const_bytep,
+                        const png_bytepp,
+                        const png_bytepp),
+                       PNG_EMPTY);
+ #endif
+ 
  /* Maintainer: Put new private prototypes here ^ */
  
  #include "pngdebug.h"
  
  #ifdef __cplusplus