< prev index next >
src/share/native/sun/awt/libpng/pngconf.h
Print this page
rev 13657 : 8217676: Upgrade libpng to 1.6.37
Reviewed-by: prr, jdv, kcr
*** 20,41 ****
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
! /* pngconf.h - machine configurable file for libpng
*
* 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:
*
! * libpng version 1.6.35, July 15, 2018
*
* Copyright (c) 1998-2002,2004,2006-2016,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
*
--- 20,42 ----
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
! /* pngconf.h - machine-configurable file for libpng
*
* 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:
*
! * libpng version 1.6.37
*
+ * Copyright (c) 2018-2019 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2016,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
*
*** 83,100 ****
# include <time.h>
#endif
#endif /* PNG_BUILDING_SYMBOL_TABLE */
! /* Prior to 1.6.0 it was possible to turn off 'const' in declarations using
! * PNG_NO_CONST; this is no longer supported except for data declarations which
! * apparently still cause problems in 2011 on some compilers.
*/
#define PNG_CONST const /* backward compatibility only */
! /* This controls optimization of the reading of 16-bit and 32-bit values
! * from PNG files. It can be set on a per-app-file basis - it
* just changes whether a macro is used when the function is called.
* The library builder sets the default; if read functions are not
* built into the library the macro implementation is forced on.
*/
#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
--- 84,100 ----
# include <time.h>
#endif
#endif /* PNG_BUILDING_SYMBOL_TABLE */
! /* Prior to 1.6.0, it was possible to turn off 'const' in declarations,
! * using PNG_NO_CONST. This is no longer supported.
*/
#define PNG_CONST const /* backward compatibility only */
! /* This controls optimization of the reading of 16-bit and 32-bit
! * values from PNG files. It can be set on a per-app-file basis: it
* just changes whether a macro is used when the function is called.
* The library builder sets the default; if read functions are not
* built into the library the macro implementation is forced on.
*/
#ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
< prev index next >