|
 |
b7cf7d |
From 56103b05af8a9d67ce158eceab9f7c984b38eabb Mon Sep 17 00:00:00 2001
|
|
|
b7cf7d |
From: Jon Ciesla <limburgher@gmail.com>
|
|
|
b7cf7d |
Date: Fri, 2 Mar 2012 09:39:36 -0600
|
|
|
b7cf7d |
Subject: [PATCH 3/3] libpng fix.
|
|
|
b7cf7d |
|
|
|
b7cf7d |
---
|
|
|
b7cf7d |
input-png.c | 22 ++++++----------------
|
|
|
b7cf7d |
1 file changed, 6 insertions(+), 16 deletions(-)
|
|
|
b7cf7d |
|
|
|
b7cf7d |
diff --git a/input-png.c b/input-png.c
|
|
|
b7cf7d |
index 77b96f1..b631f07 100644
|
|
|
b7cf7d |
--- a/input-png.c
|
|
|
b7cf7d |
+++ b/input-png.c
|
|
|
b7cf7d |
@@ -42,7 +42,7 @@ static png_bytep * read_png(png_structp png_ptr, png_infop info_ptr, at_input_op
|
|
|
b7cf7d |
|
|
|
b7cf7d |
static void handle_warning(png_structp png, const at_string message) {
|
|
|
b7cf7d |
LOG1("PNG warning: %s", message);
|
|
|
b7cf7d |
- at_exception_warning((at_exception_type *)png->error_ptr,
|
|
|
b7cf7d |
+ at_exception_warning((at_exception_type *)png_get_error_ptr(png),
|
|
|
b7cf7d |
message);
|
|
|
b7cf7d |
/* at_exception_fatal((at_exception_type *)at_png->error_ptr,
|
|
|
b7cf7d |
"PNG warning"); */
|
|
|
b7cf7d |
@@ -50,7 +50,7 @@ static void handle_warning(png_structp png, const at_string message) {
|
|
|
b7cf7d |
|
|
|
b7cf7d |
static void handle_error(png_structp png, const at_string message) {
|
|
|
b7cf7d |
LOG1("PNG error: %s", message);
|
|
|
b7cf7d |
- at_exception_fatal((at_exception_type *)png->error_ptr,
|
|
|
b7cf7d |
+ at_exception_fatal((at_exception_type *)png_get_error_ptr(png),
|
|
|
b7cf7d |
message);
|
|
|
b7cf7d |
/* at_exception_fatal((at_exception_type *)at_png->error_ptr,
|
|
|
b7cf7d |
"PNG error"); */
|
|
|
b7cf7d |
@@ -157,8 +157,8 @@ read_png(png_structp png_ptr, png_infop info_ptr, at_input_opts_type * opts)
|
|
|
b7cf7d |
|
|
|
b7cf7d |
png_set_strip_16(png_ptr);
|
|
|
b7cf7d |
png_set_packing(png_ptr);
|
|
|
b7cf7d |
- if ((png_ptr->bit_depth < 8) ||
|
|
|
b7cf7d |
- (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE) ||
|
|
|
b7cf7d |
+ if ((png_get_bit_depth(png_ptr, info_ptr) < 8) ||
|
|
|
b7cf7d |
+ (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE) ||
|
|
|
b7cf7d |
(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
|
|
|
b7cf7d |
png_set_expand(png_ptr);
|
|
|
b7cf7d |
|
|
|
b7cf7d |
@@ -181,20 +181,10 @@ read_png(png_structp png_ptr, png_infop info_ptr, at_input_opts_type * opts)
|
|
|
b7cf7d |
PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
|
|
|
b7cf7d |
} else
|
|
|
b7cf7d |
png_set_strip_alpha(png_ptr);
|
|
|
b7cf7d |
+ png_set_interlace_handling(png_ptr);
|
|
|
b7cf7d |
png_read_update_info(png_ptr, info_ptr);
|
|
|
b7cf7d |
|
|
|
b7cf7d |
-
|
|
|
b7cf7d |
- info_ptr->row_pointers = (png_bytepp)png_malloc(png_ptr,
|
|
|
b7cf7d |
- info_ptr->height * sizeof(png_bytep));
|
|
|
b7cf7d |
-#ifdef PNG_FREE_ME_SUPPORTED
|
|
|
b7cf7d |
- info_ptr->free_me |= PNG_FREE_ROWS;
|
|
|
b7cf7d |
-#endif
|
|
|
b7cf7d |
- for (row = 0; row < (int)info_ptr->height; row++)
|
|
|
b7cf7d |
- info_ptr->row_pointers[row] = (png_bytep)png_malloc(png_ptr,
|
|
|
b7cf7d |
- png_get_rowbytes(png_ptr, info_ptr));
|
|
|
b7cf7d |
-
|
|
|
b7cf7d |
- png_read_image(png_ptr, info_ptr->row_pointers);
|
|
|
b7cf7d |
- info_ptr->valid |= PNG_INFO_IDAT;
|
|
|
b7cf7d |
+ png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL);
|
|
|
b7cf7d |
png_read_end(png_ptr, info_ptr);
|
|
|
b7cf7d |
return png_get_rows(png_ptr, info_ptr);
|
|
|
b7cf7d |
}
|
|
|
b7cf7d |
--
|
|
|
b7cf7d |
1.7.11.2
|
|
|
b7cf7d |
|