Skip to content

Commit 9951370

Browse files
committed
Merge branch 'upstream-png' into update_libpng
* upstream-png: png 2025-02-18 (872555f4)
2 parents a2206b5 + 39eddd1 commit 9951370

28 files changed

+2843
-3029
lines changed

Modules/ThirdParty/PNG/src/itkpng/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.

Modules/ThirdParty/PNG/src/itkpng/arm/arm_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/* arm_init.c - NEON optimised filter functions
32
*
43
* Copyright (c) 2018-2022 Cosmin Truta

Modules/ThirdParty/PNG/src/itkpng/arm/filter_neon.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/* filter_neon.S - placeholder file
32
*
43
* Copyright (c) 2024 Cosmin Truta

Modules/ThirdParty/PNG/src/itkpng/arm/filter_neon_intrinsics.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/* filter_neon_intrinsics.c - NEON optimised filter functions
32
*
43
* Copyright (c) 2018 Cosmin Truta

Modules/ThirdParty/PNG/src/itkpng/arm/palette_neon_intrinsics.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/* palette_neon_intrinsics.c - NEON optimised palette expansion functions
32
*
43
* Copyright (c) 2018-2019 Cosmin Truta
@@ -64,7 +63,7 @@ png_do_expand_palette_rgba8_neon(png_structrp png_ptr, png_row_infop row_info,
6463
{
6564
png_uint_32 row_width = row_info->width;
6665
const png_uint_32 *riffled_palette =
67-
(const png_uint_32 *)png_ptr->riffled_palette;
66+
png_aligncastconst(png_const_uint_32p, png_ptr->riffled_palette);
6867
const png_uint_32 pixels_per_chunk = 4;
6968
png_uint_32 i;
7069

0 commit comments

Comments
 (0)