diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-03-30 08:34:02 -0500 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2010-03-30 08:34:02 -0500 |
| commit | dd78d526d0606a06b14d97b15a447fd65664b969 (patch) | |
| tree | 995aefd6e9ebdc6f4f358af8532983ff41eadaea /pngpread.c | |
| parent | 9ba962665dd98a1b11c87575d3669833bc813738 (diff) | |
| download | libpng-dd78d526d0606a06b14d97b15a447fd65664b969.tar.gz | |
[devel] Make png_text_struct independent of PNG_iTXt_SUPPORTED
Diffstat (limited to 'pngpread.c')
| -rw-r--r-- | pngpread.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pngpread.c b/pngpread.c index 6b9cf41ae..3f2bcd51c 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.5.0 [March 17, 2010] + * Last changed in libpng 1.5.0 [March 30, 2010] * Copyright (c) 1998-2010 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.) @@ -1235,10 +1235,9 @@ png_push_read_tEXt(png_structp png_ptr, png_infop info_ptr) png_sizeof(png_text)); text_ptr->compression = PNG_TEXT_COMPRESSION_NONE; text_ptr->key = key; -#ifdef PNG_iTXt_SUPPORTED + text_ptr->itxt_length = 0; text_ptr->lang = NULL; text_ptr->lang_key = NULL; -#endif text_ptr->text = text; ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1); @@ -1437,10 +1436,9 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr) png_sizeof(png_text)); text_ptr->compression = PNG_TEXT_COMPRESSION_zTXt; text_ptr->key = key; -#ifdef PNG_iTXt_SUPPORTED + text_ptr->itxt_length = 0; text_ptr->lang = NULL; text_ptr->lang_key = NULL; -#endif text_ptr->text = text; ret = png_set_text_2(png_ptr, info_ptr, text_ptr, 1); |