aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/libpng/pngwrite.c
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2025-01-09 18:55:39 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2025-01-09 19:09:32 +0300
commit938eb92a49988b4a9a3453b6b69993a019441a73 (patch)
tree7cbb90945b58215f0e601ad565f0fcaac1a0b1b3 /contrib/libs/libpng/pngwrite.c
parent4a628878c02d16a2628e30473b245a2323acb3bc (diff)
downloadydb-938eb92a49988b4a9a3453b6b69993a019441a73.tar.gz
Intermediate changes
commit_hash:42e7d17058f299243aa02f578cb643c267c7d7e3
Diffstat (limited to 'contrib/libs/libpng/pngwrite.c')
-rw-r--r--contrib/libs/libpng/pngwrite.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/contrib/libs/libpng/pngwrite.c b/contrib/libs/libpng/pngwrite.c
index 8c6316e809..9f3743bf58 100644
--- a/contrib/libs/libpng/pngwrite.c
+++ b/contrib/libs/libpng/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Copyright (c) 2018-2023 Cosmin Truta
+ * Copyright (c) 2018-2024 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson
* Copyright (c) 1996-1997 Andreas Dilger
* Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
@@ -378,7 +378,8 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr)
#endif
#ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
- if (png_ptr->num_palette_max > png_ptr->num_palette)
+ if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE &&
+ png_ptr->num_palette_max >= png_ptr->num_palette)
png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
#endif
@@ -723,12 +724,12 @@ png_write_row(png_structrp png_ptr, png_const_bytep row)
/* 1.5.6: moved from png_struct to be a local structure: */
png_row_info row_info;
- if (png_ptr == NULL)
- return;
-
png_debug2(1, "in png_write_row (row %u, pass %d)",
png_ptr->row_number, png_ptr->pass);
+ if (png_ptr == NULL)
+ return;
+
/* Initialize transformations and other stuff if first time */
if (png_ptr->row_number == 0 && png_ptr->pass == 0)
{
@@ -1219,6 +1220,8 @@ png_set_compression_strategy(png_structrp png_ptr, int strategy)
void PNGAPI
png_set_compression_window_bits(png_structrp png_ptr, int window_bits)
{
+ png_debug(1, "in png_set_compression_window_bits");
+
if (png_ptr == NULL)
return;
@@ -1302,6 +1305,8 @@ png_set_text_compression_strategy(png_structrp png_ptr, int strategy)
void PNGAPI
png_set_text_compression_window_bits(png_structrp png_ptr, int window_bits)
{
+ png_debug(1, "in png_set_text_compression_window_bits");
+
if (png_ptr == NULL)
return;
@@ -1339,6 +1344,8 @@ png_set_text_compression_method(png_structrp png_ptr, int method)
void PNGAPI
png_set_write_status_fn(png_structrp png_ptr, png_write_status_ptr write_row_fn)
{
+ png_debug(1, "in png_set_write_status_fn");
+
if (png_ptr == NULL)
return;
@@ -1366,6 +1373,8 @@ void PNGAPI
png_write_png(png_structrp png_ptr, png_inforp info_ptr,
int transforms, voidp params)
{
+ png_debug(1, "in png_write_png");
+
if (png_ptr == NULL || info_ptr == NULL)
return;