Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit9a9ae12

Browse files
authored
Merge pull request#28147 from asmorkalov:as/libpng_1.6.53
libpng update to version 1.6.53.
2 parents498853d +1288aac commit9a9ae12

File tree

7 files changed

+23
-56
lines changed

7 files changed

+23
-56
lines changed

‎3rdparty/libpng/CHANGES‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6315,6 +6315,12 @@ Version 1.6.52 [December 3, 2025]
63156315
Added allocation failure fuzzing to oss-fuzz.
63166316
(Contributed by Philippe Antoine.)
63176317

6318+
Version 1.6.53 [December 5, 2025]
6319+
Fixed a build failure on RISC-V RVV caused by a misspelled intrinsic.
6320+
(Contributed by Alexander Smorkalov.)
6321+
Fixed a build failure with CMake 4.1 or newer, on Windows, when using
6322+
Visual C++ without MASM installed.
6323+
63186324
Send comments/corrections/commendations to png-mng-implement at lists.sf.net.
63196325
Subscription is required; visit
63206326
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

‎3rdparty/libpng/README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README for libpng version 1.6.52
1+
README for libpng version 1.6.53
22
================================
33

44
See the note about version numbers near the top of `png.h`.

‎3rdparty/libpng/png.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include"pngpriv.h"
1414

1515
/* Generate a compiler error if there is an old png.h in the search path. */
16-
typedefpng_libpng_version_1_6_52Your_png_h_is_not_version_1_6_52;
16+
typedefpng_libpng_version_1_6_53Your_png_h_is_not_version_1_6_53;
1717

1818
/* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the
1919
* corresponding macro definitions. This causes a compile time failure if
@@ -817,7 +817,7 @@ png_get_copyright(png_const_structrp png_ptr)
817817
returnPNG_STRING_COPYRIGHT
818818
#else
819819
returnPNG_STRING_NEWLINE \
820-
"libpng version 1.6.52"PNG_STRING_NEWLINE \
820+
"libpng version 1.6.53"PNG_STRING_NEWLINE \
821821
"Copyright (c) 2018-2025 Cosmin Truta"PNG_STRING_NEWLINE \
822822
"Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \
823823
PNG_STRING_NEWLINE \

‎3rdparty/libpng/png.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* png.h - header file for PNG reference library
22
*
3-
* libpng version 1.6.52
3+
* libpng version 1.6.53
44
*
55
* Copyright (c) 2018-2025 Cosmin Truta
66
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
@@ -14,7 +14,7 @@
1414
* libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger
1515
* libpng versions 0.97, January 1998, through 1.6.35, July 2018:
1616
* Glenn Randers-Pehrson
17-
* libpng versions 1.6.36, December 2018, through 1.6.52, December 2025:
17+
* libpng versions 1.6.36, December 2018, through 1.6.53, December 2025:
1818
* Cosmin Truta
1919
* See also "Contributing Authors", below.
2020
*/
@@ -238,7 +238,7 @@
238238
* ...
239239
* 1.5.30 15 10530 15.so.15.30[.0]
240240
* ...
241-
* 1.6.52 16 10651 16.so.16.52[.0]
241+
* 1.6.53 16 10651 16.so.16.53[.0]
242242
*
243243
* Henceforth the source version will match the shared-library major and
244244
* minor numbers; the shared-library major version number will be used for
@@ -274,7 +274,7 @@
274274
*/
275275

276276
/* Version information for png.h - this should match the version in png.c */
277-
#definePNG_LIBPNG_VER_STRING "1.6.52"
277+
#definePNG_LIBPNG_VER_STRING "1.6.53"
278278
#definePNG_HEADER_VERSION_STRING " libpng version " PNG_LIBPNG_VER_STRING "\n"
279279

280280
/* The versions of shared library builds should stay in sync, going forward */
@@ -285,7 +285,7 @@
285285
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
286286
#definePNG_LIBPNG_VER_MAJOR 1
287287
#definePNG_LIBPNG_VER_MINOR 6
288-
#definePNG_LIBPNG_VER_RELEASE52
288+
#definePNG_LIBPNG_VER_RELEASE53
289289

290290
/* This should be zero for a public release, or non-zero for a
291291
* development version.
@@ -316,7 +316,7 @@
316316
* From version 1.0.1 it is:
317317
* XXYYZZ, where XX=major, YY=minor, ZZ=release
318318
*/
319-
#definePNG_LIBPNG_VER10652/* 1.6.52 */
319+
#definePNG_LIBPNG_VER10653/* 1.6.53 */
320320

321321
/* Library configuration: these options cannot be changed after
322322
* the library has been built.
@@ -426,7 +426,7 @@ extern "C" {
426426
/* This triggers a compiler error in png.c, if png.c and png.h
427427
* do not agree upon the version number.
428428
*/
429-
typedefchar*png_libpng_version_1_6_52;
429+
typedefchar*png_libpng_version_1_6_53;
430430

431431
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
432432
*

‎3rdparty/libpng/pngconf.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* pngconf.h - machine-configurable file for libpng
22
*
3-
* libpng version 1.6.52
3+
* libpng version 1.6.53
44
*
55
* Copyright (c) 2018-2025 Cosmin Truta
66
* Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson

‎3rdparty/libpng/pngread.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3278,7 +3278,7 @@ png_image_read_composite(png_voidp argument)
32783278
/* Clamp to the valid range to defend against
32793279
* unforeseen cases where the data might be sRGB
32803280
* instead of linear premultiplied.
3281-
* (Belt-and-suspenders forGitHub Issue #764.)
3281+
* (Belt-and-suspenders forCVE-2025-66293.)
32823282
*/
32833283
if (component>255*65535)
32843284
component=255*65535;

‎3rdparty/libpng/riscv/filter_rvv_intrinsics.c‎

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
*
33
* Copyright (c) 2023 Google LLC
44
* Written by Manfred SCHLAEGL, 2022
5-
* Dragoș Tiselice <dtiselice@google.com>, May 2023.
6-
* Filip Wasil <f.wasil@samsung.com>, March 2025.
7-
* Liang Junzhao <junzhao.liang@spacemit.com>, November 2025.
5+
* Revised by:
6+
* - Dragoș Tiselice <dtiselice@google.com>, May 2023
7+
* - Filip Wasil <f.wasil@samsung.com>, March 2025
8+
* - Liang Junzhao <junzhao.liang@spacemit.com>, November 2025
9+
* - Alexander Smorkalov <alexander.smorkalov@opencv.ai>, December 2025
810
*
911
* This code is released under the libpng license.
1012
* For conditions of distribution and use, see the disclaimer
@@ -175,47 +177,6 @@ png_read_filter_row_avg4_rvv(png_row_infop row_info, png_bytep row,
175177
PNG_UNUSED(prev_row)
176178
}
177179

178-
#defineMIN_CHUNK_LEN 256
179-
#defineMAX_CHUNK_LEN 2048
180-
181-
staticinlinevuint8m1_t
182-
prefix_sum(vuint8m1_tchunk,unsignedchar*carry,size_tvl,
183-
size_tmax_chunk_len)
184-
{
185-
size_tr;
186-
187-
for (r=1;r<MIN_CHUNK_LEN;r <<=1)
188-
{
189-
vbool8_tshift_mask=__riscv_vmsgeu_vx_u8m1_b8(__riscv_vid_v_u8m1(vl),r,vl);
190-
chunk=__riscv_vadd_vv_u8m1_mu(shift_mask,chunk,chunk,__riscv_vslideup_vx_u8m1(__riscv_vundefined_u8m1(),chunk,r,vl),vl);
191-
}
192-
193-
for (r=MIN_CHUNK_LEN;r<MAX_CHUNK_LEN&&r<max_chunk_len;r <<=1)
194-
{
195-
vbool8_tshift_mask=__riscv_vmsgeu_vx_u8m1_b8(__riscv_vid_v_u8m1(vl),r,vl);
196-
chunk=__riscv_vadd_vv_u8m1_mu(shift_mask,chunk,chunk,__riscv_vslideup_vx_u8m1(__riscv_vundefined_u8m1(),chunk,r,vl),vl);
197-
}
198-
199-
chunk=__riscv_vadd_vx_u8m1(chunk,*carry,vl);
200-
*carry=__riscv_vmv_x_s_u8m1_u8(__riscv_vslidedown_vx_u8m1(chunk,vl-1,vl));
201-
202-
returnchunk;
203-
}
204-
205-
staticinlinevint16m1_t
206-
abs_diff(vuint16m1_ta,vuint16m1_tb,size_tvl)
207-
{
208-
vint16m1_tdiff=__riscv_vreinterpret_v_u16m1_i16m1(__riscv_vsub_vv_u16m1(a,b,vl));
209-
vbool16_tmask=__riscv_vmslt_vx_i16m1_b16(diff,0,vl);
210-
return__riscv_vrsub_vx_i16m1_m(mask,diff,0,vl);
211-
}
212-
213-
staticinlinevint16m1_t
214-
abs_sum(vint16m1_ta,vint16m1_tb,size_tvl)
215-
{
216-
return__riscv_vadd_vv_i16m1(a,b,vl);
217-
}
218-
219180
staticinlinevoid
220181
png_read_filter_row_paeth_rvv(size_tlen,size_tbpp,unsignedchar*row,
221182
constunsignedchar*prev)

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp