Skip to content

Commit 7d9f28c

Browse files
committed
Merge pull request godotengine#101346 from akien-mga/libpng-1.6.45
libpng: Update to 1.6.45
2 parents 765c6ab + f68d55b commit 7d9f28c

34 files changed

+927
-226
lines changed

COPYRIGHT.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ License: BSD-3-clause
329329

330330
Files: ./thirdparty/libpng/
331331
Comment: libpng
332-
Copyright: 1995-2024, The PNG Reference Library Authors.
333-
2018-2024, Cosmin Truta.
332+
Copyright: 1995-2025, The PNG Reference Library Authors.
333+
2018-2025, Cosmin Truta.
334334
2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
335335
1996-1997, Andreas Dilger.
336336
1995-1996, Guy Eric Schalnat, Group 42, Inc.

drivers/png/SCsub

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ if env["builtin_libpng"]:
5454
env_thirdparty.Append(CPPDEFINES=["PNG_INTEL_SSE"])
5555
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_dir + "intel/intel_init.c")
5656
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_dir + "intel/filter_sse2_intrinsics.c")
57+
elif env["arch"] == "loongarch64":
58+
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_dir + "loongarch/loongarch_lsx_init.c")
59+
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_dir + "loongarch/filter_lsx_intrinsics.c")
5760
elif env["arch"] == "ppc64":
5861
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_dir + "powerpc/powerpc_init.c")
5962
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_dir + "powerpc/filter_vsx_intrinsics.c")

thirdparty/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,14 +511,14 @@ Files extracted from upstream source:
511511
## libpng
512512

513513
- Upstream: http://libpng.org/pub/png/libpng.html
514-
- Version: 1.6.44 (f5e92d76973a7a53f517579bc95d61483bf108c0, 2024)
514+
- Version: 1.6.45 (51f5bd68b9b806d2c92b4318164d28b49357da31, 2024)
515515
- License: libpng/zlib
516516

517517
Files extracted from upstream source:
518518

519519
- All `.c` and `.h` files of the main directory, apart from `example.c` and
520520
`pngtest.c`
521-
- `arm/` (minus `filter_neon.S`), `intel/` and `powerpc/` (minus `.editorconfig`) folders
521+
- `arm/` (minus `filter_neon.S`), `intel/`, `loongarch/`, and `powerpc/` (minus `.editorconfig`) folders
522522
- `scripts/pnglibconf.h.prebuilt` as `pnglibconf.h`
523523
- `LICENSE`
524524

thirdparty/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.

thirdparty/libpng/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

thirdparty/libpng/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

thirdparty/libpng/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

thirdparty/libpng/intel/filter_sse2_intrinsics.c

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

thirdparty/libpng/intel/intel_init.c

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

0 commit comments

Comments
 (0)