Skip to content

ENH: Update PNG to v1.6.54 #5864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blowekamp merged 4 commits into from
Mar 7, 2026
Merged

ENH: Update PNG to v1.6.54 #5864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6be5f97
ENH: Update png to v1.6.54
blowekamp Mar 6, 2026
4653b71
png 2026-01-12 (02f2b4f4)
Jan 12, 2026
8cdf86d
Merge branch 'upstream-png' into update_png_v1.6.54
blowekamp Mar 6, 2026
eb1aa59
ENH: Add new PNG symbols to mangle header for v1.6.54
blowekamp Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Modules/ThirdParty/PNG/UpdateFromUpstream.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readonly name="png"
readonly ownership="LIBPNG Upstream <png-mng-implement@lists.sourceforge.net>"
readonly subtree="Modules/ThirdParty/PNG/src/itk$name"
readonly repo="git://git.code.sf.net/p/libpng/code"
readonly tag='v1.6.44' # Sept 12, 2024
readonly tag='v1.6.54' # March 6, 2026
readonly exact_tree_match=false
readonly paths="
png*.c
Expand Down
4 changes: 2 additions & 2 deletions Modules/ThirdParty/PNG/src/itkpng/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
PNG Reference Library License version 2
---------------------------------------

* Copyright (c) 1995-2024 The PNG Reference Library Authors.
* Copyright (c) 2018-2024 Cosmin Truta.
* Copyright (c) 1995-2026 The PNG Reference Library Authors.
* Copyright (c) 2018-2026 Cosmin Truta.
* Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
* Copyright (c) 1996-1997 Andreas Dilger.
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
Expand Down
9 changes: 4 additions & 5 deletions Modules/ThirdParty/PNG/src/itkpng/arm/arm_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* arm_init.c - NEON optimised filter functions
*
* Copyright (c) 2018-2022 Cosmin Truta
Expand Down Expand Up @@ -36,14 +35,14 @@
#ifndef PNG_ARM_NEON_FILE
# if defined(__aarch64__) || defined(_M_ARM64)
/* ARM Neon is expected to be unconditionally available on ARM64. */
# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on ARM64"
# error PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on ARM64
# elif defined(__ARM_NEON__) || defined(__ARM_NEON)
/* ARM Neon is expected to be available on the target CPU architecture. */
# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch"
# error PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch
# elif defined(__linux__)
# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
# else
# error "No support for run-time ARM Neon checking; use compile-time options"
# error No support for run-time ARM Neon checking; use compile-time options
# endif
#endif

Expand All @@ -54,7 +53,7 @@ static int png_have_neon(png_structp png_ptr);
#endif /* PNG_ARM_NEON_CHECK_SUPPORTED */

#ifndef PNG_ALIGNED_MEMORY_SUPPORTED
# error "ALIGNED_MEMORY is required; set: -DPNG_ALIGNED_MEMORY_SUPPORTED"
# error ALIGNED_MEMORY is required; please define PNG_ALIGNED_MEMORY_SUPPORTED
#endif

void
Expand Down
1 change: 0 additions & 1 deletion Modules/ThirdParty/PNG/src/itkpng/arm/filter_neon.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* filter_neon.S - placeholder file
*
* Copyright (c) 2024 Cosmin Truta
Expand Down
15 changes: 7 additions & 8 deletions Modules/ThirdParty/PNG/src/itkpng/arm/filter_neon_intrinsics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* filter_neon_intrinsics.c - NEON optimised filter functions
*
* Copyright (c) 2018 Cosmin Truta
Expand Down Expand Up @@ -49,7 +48,7 @@

void
png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_bytep rp_stop = row + row_info->rowbytes;
Expand All @@ -70,7 +69,7 @@ png_read_filter_row_up_neon(png_row_infop row_info, png_bytep row,

void
png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_bytep rp_stop = row + row_info->rowbytes;
Expand Down Expand Up @@ -117,7 +116,7 @@ png_read_filter_row_sub3_neon(png_row_infop row_info, png_bytep row,

void
png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_bytep rp_stop = row + row_info->rowbytes;
Expand Down Expand Up @@ -149,7 +148,7 @@ png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row,

void
png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_const_bytep pp = prev_row;
Expand Down Expand Up @@ -217,7 +216,7 @@ png_read_filter_row_avg3_neon(png_row_infop row_info, png_bytep row,

void
png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_bytep rp_stop = row + row_info->rowbytes;
Expand Down Expand Up @@ -286,7 +285,7 @@ paeth(uint8x8_t a, uint8x8_t b, uint8x8_t c)

void
png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_const_bytep pp = prev_row;
Expand Down Expand Up @@ -354,7 +353,7 @@ png_read_filter_row_paeth3_neon(png_row_infop row_info, png_bytep row,

void
png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row,
png_const_bytep prev_row)
png_const_bytep prev_row)
{
png_bytep rp = row;
png_bytep rp_stop = row + row_info->rowbytes;
Expand Down
3 changes: 1 addition & 2 deletions Modules/ThirdParty/PNG/src/itkpng/arm/palette_neon_intrinsics.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/* palette_neon_intrinsics.c - NEON optimised palette expansion functions
*
* Copyright (c) 2018-2019 Cosmin Truta
Expand Down Expand Up @@ -64,7 +63,7 @@ png_do_expand_palette_rgba8_neon(png_structrp png_ptr, png_row_infop row_info,
{
png_uint_32 row_width = row_info->width;
const png_uint_32 *riffled_palette =
(const png_uint_32 *)png_ptr->riffled_palette;
png_aligncastconst(png_const_uint_32p, png_ptr->riffled_palette);
const png_uint_32 pixels_per_chunk = 4;
png_uint_32 i;

Expand Down
10 changes: 10 additions & 0 deletions Modules/ThirdParty/PNG/src/itkpng/itk_png_mangle.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ nm lib/libitkpng-5.4.a 2> /dev/null | grep " T \| D \| R " |
#define png_get_cHRM_XYZ @MANGLE_PREFIX@_get_cHRM_XYZ
#define png_get_cHRM_XYZ_fixed @MANGLE_PREFIX@_get_cHRM_XYZ_fixed
#define png_get_cHRM_fixed @MANGLE_PREFIX@_get_cHRM_fixed
#define png_get_cICP @MANGLE_PREFIX@_get_cICP
#define png_get_cLLI @MANGLE_PREFIX@_get_cLLI
#define png_get_cLLI_fixed @MANGLE_PREFIX@_get_cLLI_fixed
#define png_get_channels @MANGLE_PREFIX@_get_channels
#define png_get_chunk_cache_max @MANGLE_PREFIX@_get_chunk_cache_max
#define png_get_chunk_malloc_max @MANGLE_PREFIX@_get_chunk_malloc_max
Expand All @@ -130,6 +133,8 @@ nm lib/libitkpng-5.4.a 2> /dev/null | grep " T \| D \| R " |
#define png_get_io_ptr @MANGLE_PREFIX@_get_io_ptr
#define png_get_io_state @MANGLE_PREFIX@_get_io_state
#define png_get_libpng_ver @MANGLE_PREFIX@_get_libpng_ver
#define png_get_mDCV @MANGLE_PREFIX@_get_mDCV
#define png_get_mDCV_fixed @MANGLE_PREFIX@_get_mDCV_fixed
#define png_get_mem_ptr @MANGLE_PREFIX@_get_mem_ptr
#define png_get_oFFs @MANGLE_PREFIX@_get_oFFs
#define png_get_pCAL @MANGLE_PREFIX@_get_pCAL
Expand Down Expand Up @@ -285,6 +290,9 @@ nm lib/libitkpng-5.4.a 2> /dev/null | grep " T \| D \| R " |
#define png_set_cHRM_XYZ @MANGLE_PREFIX@_set_cHRM_XYZ
#define png_set_cHRM_XYZ_fixed @MANGLE_PREFIX@_set_cHRM_XYZ_fixed
#define png_set_cHRM_fixed @MANGLE_PREFIX@_set_cHRM_fixed
#define png_set_cICP @MANGLE_PREFIX@_set_cICP
#define png_set_cLLI @MANGLE_PREFIX@_set_cLLI
#define png_set_cLLI_fixed @MANGLE_PREFIX@_set_cLLI_fixed
#define png_set_check_for_invalid_index @MANGLE_PREFIX@_set_check_for_invalid_index
#define png_set_chunk_cache_max @MANGLE_PREFIX@_set_chunk_cache_max
#define png_set_chunk_malloc_max @MANGLE_PREFIX@_set_chunk_malloc_max
Expand Down Expand Up @@ -319,6 +327,8 @@ nm lib/libitkpng-5.4.a 2> /dev/null | grep " T \| D \| R " |
#define png_set_invert_mono @MANGLE_PREFIX@_set_invert_mono
#define png_set_keep_unknown_chunks @MANGLE_PREFIX@_set_keep_unknown_chunks
#define png_set_longjmp_fn @MANGLE_PREFIX@_set_longjmp_fn
#define png_set_mDCV @MANGLE_PREFIX@_set_mDCV
#define png_set_mDCV_fixed @MANGLE_PREFIX@_set_mDCV_fixed
#define png_set_mem_fn @MANGLE_PREFIX@_set_mem_fn
#define png_set_oFFs @MANGLE_PREFIX@_set_oFFs
#define png_set_option @MANGLE_PREFIX@_set_option
Expand Down
Loading
Loading