|
29 | 29 | * However, the following notice accompanied the original version of this |
30 | 30 | * file and, per its terms, should not be removed: |
31 | 31 | * |
32 | | - * Copyright (c) 2018-2025 Cosmin Truta |
| 32 | + * Copyright (c) 2018-2026 Cosmin Truta |
33 | 33 | * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson |
34 | 34 | * Copyright (c) 1996-1997 Andreas Dilger |
35 | 35 | * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. |
|
42 | 42 | #include "pngpriv.h" |
43 | 43 |
|
44 | 44 | /* Generate a compiler error if there is an old png.h in the search path. */ |
45 | | -typedef png_libpng_version_1_6_51 Your_png_h_is_not_version_1_6_51; |
| 45 | +typedef png_libpng_version_1_6_54 Your_png_h_is_not_version_1_6_54; |
46 | 46 |
|
47 | 47 | /* Sanity check the chunks definitions - PNG_KNOWN_CHUNKS from pngpriv.h and the |
48 | 48 | * corresponding macro definitions. This causes a compile time failure if |
@@ -130,7 +130,8 @@ png_sig_cmp(png_const_bytep sig, size_t start, size_t num_to_check) |
130 | 130 | #if defined(PNG_READ_SUPPORTED) || defined(PNG_WRITE_SUPPORTED) |
131 | 131 | /* Function to allocate memory for zlib */ |
132 | 132 | PNG_FUNCTION(voidpf /* PRIVATE */, |
133 | | -png_zalloc,(voidpf png_ptr, uInt items, uInt size),PNG_ALLOCATED) |
| 133 | +png_zalloc,(voidpf png_ptr, uInt items, uInt size), |
| 134 | + PNG_ALLOCATED) |
134 | 135 | { |
135 | 136 | png_alloc_size_t num_bytes = size; |
136 | 137 |
|
@@ -286,7 +287,8 @@ png_user_version_check(png_structrp png_ptr, png_const_charp user_png_ver) |
286 | 287 | PNG_FUNCTION(png_structp /* PRIVATE */, |
287 | 288 | png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr, |
288 | 289 | png_error_ptr error_fn, png_error_ptr warn_fn, png_voidp mem_ptr, |
289 | | - png_malloc_ptr malloc_fn, png_free_ptr free_fn),PNG_ALLOCATED) |
| 290 | + png_malloc_ptr malloc_fn, png_free_ptr free_fn), |
| 291 | + PNG_ALLOCATED) |
290 | 292 | { |
291 | 293 | png_struct create_struct; |
292 | 294 | # ifdef PNG_SETJMP_SUPPORTED |
@@ -390,7 +392,8 @@ png_create_png_struct,(png_const_charp user_png_ver, png_voidp error_ptr, |
390 | 392 |
|
391 | 393 | /* Allocate the memory for an info_struct for the application. */ |
392 | 394 | PNG_FUNCTION(png_infop,PNGAPI |
393 | | -png_create_info_struct,(png_const_structrp png_ptr),PNG_ALLOCATED) |
| 395 | +png_create_info_struct,(png_const_structrp png_ptr), |
| 396 | + PNG_ALLOCATED) |
394 | 397 | { |
395 | 398 | png_inforp info_ptr; |
396 | 399 |
|
@@ -846,8 +849,8 @@ png_get_copyright(png_const_structrp png_ptr) |
846 | 849 | return PNG_STRING_COPYRIGHT |
847 | 850 | #else |
848 | 851 | return PNG_STRING_NEWLINE \ |
849 | | - "libpng version 1.6.51" PNG_STRING_NEWLINE \ |
850 | | - "Copyright (c) 2018-2025 Cosmin Truta" PNG_STRING_NEWLINE \ |
| 852 | + "libpng version 1.6.54" PNG_STRING_NEWLINE \ |
| 853 | + "Copyright (c) 2018-2026 Cosmin Truta" PNG_STRING_NEWLINE \ |
851 | 854 | "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ |
852 | 855 | PNG_STRING_NEWLINE \ |
853 | 856 | "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ |
@@ -2286,8 +2289,8 @@ png_check_fp_number(png_const_charp string, size_t size, int *statep, |
2286 | 2289 | int |
2287 | 2290 | png_check_fp_string(png_const_charp string, size_t size) |
2288 | 2291 | { |
2289 | | - int state=0; |
2290 | | - size_t char_index=0; |
| 2292 | + int state = 0; |
| 2293 | + size_t char_index = 0; |
2291 | 2294 |
|
2292 | 2295 | if (png_check_fp_number(string, size, &state, &char_index) != 0 && |
2293 | 2296 | (char_index == size || string[char_index] == 0)) |
|
0 commit comments