[libpng16] Restore info_ptr members that were deleted by the previous

patch; they are needed by png_set_IHDR() for both read and write.  Fix
some ifdefs that caused the contrib/pngminim/ applications to not compile.
This commit is contained in:
Glenn Randers-Pehrson
2012-08-09 22:24:04 -05:00
parent dff6f4c4f0
commit 4430b91363
7 changed files with 29 additions and 13 deletions

View File

@@ -1033,8 +1033,10 @@ png_compress_IDAT(png_structrp png_ptr, png_const_bytep input,
png_ptr->zbuffer_list->next = NULL;
}
#ifdef PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
else
png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list->next);
#endif
/* It is a terminal error if we can't claim the zstream. */
if (png_deflate_claim(png_ptr, png_IDAT, png_image_size(png_ptr)) != Z_OK)