From 1c42276a398470b229ece319d4eb84c9c4fbe276 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Mon, 17 Oct 2011 16:52:19 -0500 Subject: [PATCH] [libpng15] New png_struct member png_ptr->old_prev_row --- pngread.c | 2 +- pngrutil.c | 1 - pngstruct.h | 14 ++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pngread.c b/pngread.c index 89cf14567..0f598fa15 100644 --- a/pngread.c +++ b/pngread.c @@ -1038,7 +1038,7 @@ png_read_destroy(png_structp png_ptr, png_infop info_ptr, png_free(png_ptr, png_ptr->zbuf); png_free(png_ptr, png_ptr->big_row_buf); - png_free(png_ptr, png_ptr->prev_row); + png_free(png_ptr, png_ptr->big_prev_row); png_free(png_ptr, png_ptr->chunkdata); #ifdef PNG_READ_QUANTIZE_SUPPORTED diff --git a/pngrutil.c b/pngrutil.c index f4115b15a..afd441574 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -3956,7 +3956,6 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED) png_ptr->big_row_buf = (png_bytep)png_malloc(png_ptr, row_bytes + 48); png_ptr->big_prev_row = (png_bytep)png_malloc(png_ptr, row_bytes + 48); - png_ptr->old_big_row_buf_size = row_bytes + 48; #ifdef PNG_ALIGNED_MEMORY_SUPPORTED /* Use 16-byte aligned memory for row_buf with at least 16 bytes diff --git a/pngstruct.h b/pngstruct.h index 658a25b66..33f23844a 100644 --- a/pngstruct.h +++ b/pngstruct.h @@ -105,8 +105,12 @@ struct png_struct_def png_uint_32 iwidth; /* width of current interlaced row in pixels */ png_uint_32 row_number; /* current row in interlace pass */ png_uint_32 chunk_name; /* PNG_CHUNK() id of current chunk */ - png_bytep prev_row; /* buffer to save previous (unfiltered) row */ - png_bytep row_buf; /* buffer to save current (unfiltered) row */ + png_bytep prev_row; /* buffer to save previous (unfiltered) row. + * This is a pointer into big_prev_row + */ + png_bytep row_buf; /* buffer to save current (unfiltered) row. + * This is a pointer into big_row_buf + */ png_bytep sub_row; /* buffer to save "sub" row when filtering */ png_bytep up_row; /* buffer to save "up" row when filtering */ png_bytep avg_row; /* buffer to save "avg" row when filtering */ @@ -336,9 +340,8 @@ struct png_struct_def png_unknown_chunk unknown_chunk; #endif -/* New members added in libpng-1.2.26 */ +/* New member added in libpng-1.2.26 */ png_size_t old_big_row_buf_size; - png_size_t old_prev_row_size; /* New member added in libpng-1.2.30 */ png_charp chunkdata; /* buffer for reading chunk data */ @@ -347,5 +350,8 @@ struct png_struct_def /* New member added in libpng-1.4.0 */ png_uint_32 io_state; #endif + +/* New member added in libpng-1.5.6 */ + png_bytep big_prev_row; }; #endif /* PNGSTRUCT_H */