Skip to content

Commit 32cad69

Browse files
committed
8348598: Update Libpng to 1.6.47
Reviewed-by: mbaesken Backport-of: 6b82b42a2116900b2125e03c1ffa0824d6062757
1 parent eb86458 commit 32cad69

File tree

20 files changed

+2695
-2984
lines changed

20 files changed

+2695
-2984
lines changed

make/modules/java.desktop/lib/Awt2dLibraries.gmk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,14 +792,15 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
792792
DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \
793793
DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \
794794
DISABLED_WARNINGS_gcc_jdphuff.c := shift-negative-value, \
795-
DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized, \
795+
DISABLED_WARNINGS_gcc_png.c := maybe-uninitialized unused-function, \
796796
DISABLED_WARNINGS_gcc_pngerror.c := maybe-uninitialized, \
797797
DISABLED_WARNINGS_gcc_splashscreen_gfx_impl.c := implicit-fallthrough maybe-uninitialized, \
798798
DISABLED_WARNINGS_gcc_splashscreen_impl.c := implicit-fallthrough sign-compare unused-function, \
799799
DISABLED_WARNINGS_gcc_splashscreen_sys.c := type-limits unused-result, \
800800
DISABLED_WARNINGS_clang := deprecated-non-prototype, \
801801
DISABLED_WARNINGS_clang_dgif_lib.c := sign-compare, \
802802
DISABLED_WARNINGS_clang_gzwrite.c := format-nonliteral, \
803+
DISABLED_WARNINGS_clang_png.c := unused-function, \
803804
DISABLED_WARNINGS_clang_splashscreen_impl.c := sign-compare, \
804805
DISABLED_WARNINGS_clang_splashscreen_png.c := incompatible-pointer-types, \
805806
DISABLED_WARNINGS_clang_splashscreen_sys.m := deprecated-declarations, \

src/java.desktop/share/legal/libpng.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## libpng v1.6.43
1+
## libpng v1.6.47
22

33
### libpng License
44
<pre>
@@ -9,8 +9,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
99
PNG Reference Library License version 2
1010
---------------------------------------
1111

12-
Copyright (C) 1995-2024 The PNG Reference Library Authors.
13-
Copyright (C) 2018-2024 Cosmin Truta
12+
Copyright (c) 1995-2025 The PNG Reference Library Authors.
13+
Copyright (C) 2018-2025 Cosmin Truta
1414
Copyright (C) 1998-2018 Glenn Randers-Pehrson
1515
Copyright (C) 1996-1997 Andreas Dilger
1616
Copyright (C) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -170,6 +170,7 @@ Authors, for copyright and licensing purposes.
170170
* James Yu
171171
* John Bowler
172172
* Kevin Bracey
173+
* Lucas Chollet
173174
* Magnus Holmgren
174175
* Mandar Sahastrabuddhe
175176
* Mans Rullgard

src/java.desktop/share/native/libsplashscreen/libpng/CHANGES

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6196,6 +6196,61 @@ Version 1.6.43 [February 23, 2024]
61966196
consistency verification and text linting.
61976197
Added version consistency verification to pngtest.c also.
61986198

6199+
Version 1.6.44 [September 12, 2024]
6200+
Hardened calculations in chroma handling to prevent overflows, and
6201+
relaxed a constraint in cHRM validation to accomodate the standard
6202+
ACES AP1 set of color primaries.
6203+
(Contributed by John Bowler)
6204+
Removed the ASM implementation of ARM Neon optimizations and updated
6205+
the build accordingly. Only the remaining C implementation shall be
6206+
used from now on, thus ensuring the support of the PAC/BTI security
6207+
features on ARM64.
6208+
(Contributed by Ross Burton and John Bowler)
6209+
Fixed the pickup of the PNG_HARDWARE_OPTIMIZATIONS option in the
6210+
CMake build on FreeBSD/amd64. This is an important performance fix
6211+
on this platform.
6212+
Applied various fixes and improvements to the CMake build.
6213+
(Contributed by Eric Riff, Benjamin Buch and Erik Scholz)
6214+
Added fuzzing targets for the simplified read API.
6215+
(Contributed by Mikhail Khachayants)
6216+
Fixed a build error involving pngtest.c under a custom config.
6217+
This was a regression introduced in a code cleanup in libpng-1.6.43.
6218+
(Contributed by Ben Wagner)
6219+
Fixed and improved the config files for AppVeyor CI and Travis CI.
6220+
6221+
Version 1.6.45 [January 7, 2025]
6222+
Added support for the cICP chunk.
6223+
(Contributed by Lucas Chollet and John Bowler)
6224+
Adjusted and improved various checks in colorspace calculations.
6225+
(Contributed by John Bowler)
6226+
Rearranged the write order of colorspace chunks for better conformance
6227+
with the PNG v3 draft specification.
6228+
(Contributed by John Bowler)
6229+
Raised the minimum required CMake version from 3.6 to 3.14.
6230+
Forked off a development branch for libpng version 1.8.
6231+
6232+
Version 1.6.46 [January 23, 2025]
6233+
Added support for the mDCV and cLLI chunks.
6234+
(Contributed by John Bowler)
6235+
Fixed a build issue affecting C89 compilers.
6236+
This was a regression introduced in libpng-1.6.45.
6237+
(Contributed by John Bowler)
6238+
Added makefile.c89, specifically for testing C89 compilers.
6239+
Cleaned up contrib/pngminus: corrected an old typo, removed an old
6240+
workaround, and updated the CMake file.
6241+
6242+
Version 1.6.47 [February 18, 2025]
6243+
Modified the behaviour of colorspace chunks in order to adhere
6244+
to the new precedence rules formulated in the latest draft of
6245+
the PNG Specification.
6246+
(Contributed by John Bowler)
6247+
Fixed a latent bug in `png_write_iCCP`.
6248+
This would have been a read-beyond-end-of-malloc vulnerability,
6249+
introduced early in the libpng-1.6.0 development, yet (fortunately!)
6250+
it was inaccessible before the above-mentioned modification of the
6251+
colorspace precedence rules, due to pre-existing colorspace checks.
6252+
(Reported by Bob Friesenhahn; fixed by John Bowler)
6253+
61996254
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
62006255
Subscription is required; visit
62016256
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

src/java.desktop/share/native/libsplashscreen/libpng/LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
44
PNG Reference Library License version 2
55
---------------------------------------
66

7-
* Copyright (c) 1995-2024 The PNG Reference Library Authors.
8-
* Copyright (c) 2018-2024 Cosmin Truta.
7+
* Copyright (c) 1995-2025 The PNG Reference Library Authors.
8+
* Copyright (c) 2018-2025 Cosmin Truta.
99
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
1010
* Copyright (c) 1996-1997 Andreas Dilger.
1111
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.

src/java.desktop/share/native/libsplashscreen/libpng/README

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README for libpng version 1.6.43
1+
README for libpng version 1.6.47
22
================================
33

44
See the note about version numbers near the top of `png.h`.
@@ -157,8 +157,6 @@ Files included in this distribution
157157
"PNG: The Definitive Guide" by Greg Roelofs,
158158
O'Reilly, 1999
159159
libtests/ => Test programs
160-
oss-fuzz/ => Files used by the OSS-Fuzz project for fuzz-testing
161-
libpng
162160
pngexif/ => Program to inspect the EXIF information in PNG files
163161
pngminim/ => Minimal decoder, encoder, and progressive decoder
164162
programs demonstrating the use of pngusr.dfa

0 commit comments

Comments
 (0)