From e0f0d05938c67c28b5eb48da691a468a73e3f5a0 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Wed, 29 Apr 2015 11:29:31 -0500 Subject: [PATCH] [libpng16] Replaced "unexpected" with an integer (0xabadca11) in pngset.c --- ANNOUNCE | 6 ++++-- CHANGES | 4 +++- pngset.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 70cdd5119..4d8fe9241 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,4 +1,4 @@ -Libpng 1.6.18beta03 - April 26, 2015 +Libpng 1.6.18beta03 - April 29, 2015 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -38,7 +38,9 @@ Version 1.6.18beta02 [April 26, 2015] Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler (Bug report by Viktor Szaka'ts). -Version 1.6.18beta03 [April 26, 2015] +Version 1.6.18beta03 [April 29, 2015] + Replaced "unexpected" with an integer (0xabadca11) in pngset.c + where a long was expected, to avoid a compiler warning when PNG_DEBUG > 1. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 89e34f1c7..35c9d43f2 100644 --- a/CHANGES +++ b/CHANGES @@ -5218,7 +5218,9 @@ Version 1.6.18beta02 [April 26, 2015] Suppressed some warnings from the Borland C++ 5.5.1/5.82 compiler (Bug report by Viktor Szaka'ts). -Version 1.6.18beta03 [April 26, 2015] +Version 1.6.18beta03 [April 29, 2015] + Replaced "unexpected" with an integer (0xabadca11) in pngset.c + where a long was expected, to avoid a compiler warning when PNG_DEBUG > 1. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/pngset.c b/pngset.c index a9a17979f..d0f7f0ac9 100644 --- a/pngset.c +++ b/pngset.c @@ -709,7 +709,7 @@ png_set_text_2(png_const_structrp png_ptr, png_inforp info_ptr, { int i; - png_debug1(1, "in %lx storage function", png_ptr == NULL ? "unexpected" : + png_debug1(1, "in %lx storage function", png_ptr == NULL ? 0xabadca11 : (unsigned long)png_ptr->chunk_name); if (png_ptr == NULL || info_ptr == NULL || num_text <= 0 || text_ptr == NULL)