diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-22 12:41:58 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2011-09-22 12:48:19 -0500 |
commit | bb5cb1476b149b530b89b2fb043226241985b308 (patch) | |
tree | a1bc55c1c788a8c111f3c16e5495725ec5af1d95 /pngget.c | |
parent | 115020d985e61bf85edbbc96c549caecaf622c06 (diff) | |
download | libpng-bb5cb1476b149b530b89b2fb043226241985b308.tar.gz |
[libpng15] Bump version to libpng-1.5.6beta02
Diffstat (limited to 'pngget.c')
-rw-r--r-- | pngget.c | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.5.5 [(PENDING RELEASE)] + * Last changed in libpng 1.5.6 [(PENDING RELEASE)] * Copyright (c) 1998-2011 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -950,9 +950,8 @@ png_get_text(png_const_structp png_ptr, png_const_infop info_ptr, { if (png_ptr != NULL && info_ptr != NULL && info_ptr->num_text > 0) { - png_debug1(1, "in %s retrieval function", - (png_ptr->chunk_name[0] == '\0' ? "text" : - (png_const_charp)png_ptr->chunk_name)); + png_debug1(1, "in 0x%lx retrieval function", + (unsigned long)png_ptr->chunk_name); if (text_ptr != NULL) *text_ptr = info_ptr->text; @@ -1111,16 +1110,14 @@ png_get_io_state (png_structp png_ptr) png_uint_32 PNGAPI png_get_io_chunk_type (png_const_structp png_ptr) { - return ((png_ptr->chunk_name[0] << 24) + - (png_ptr->chunk_name[1] << 16) + - (png_ptr->chunk_name[2] << 8) + - (png_ptr->chunk_name[3])); + return png_ptr->chunk_name; } png_const_bytep PNGAPI png_get_io_chunk_name (png_structp png_ptr) { - return png_ptr->chunk_name; + PNG_CSTRING_FROM_CHUNK(png_ptr->io_chunk_string, png_ptr->chunk_name); + return png_ptr->io_chunk_string; } #endif /* ?PNG_IO_STATE_SUPPORTED */ |