From 7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 26 Aug 2013 16:53:40 -0700 Subject: [PATCH] DO NOT MERGE Cherry pick libpng usage fixes ------------------------------------------ This is a combination of 2 commits. The first commit's message is: Forward compatibility fixes Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8 ------------------------------------------- This is the 2nd commit message: libpng usage tweaks Bug: 10447005 Call png_set_interlace_handling explicitly instead of relying on implicit handling that logs warnings Include filename when printing warnings Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99 ------------------------------------------- BUG:23265085 --- tools/aapt/Images.cpp | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 9de685ae763e..89475970d196 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -12,13 +12,15 @@ #include #include +#include #define NOISY(x) //x static void png_write_aapt_file(png_structp png_ptr, png_bytep data, png_size_t length) { - status_t err = ((AaptFile*)png_ptr->io_ptr)->writeData(data, length); + AaptFile* aaptfile = (AaptFile*) png_get_io_ptr(png_ptr); + status_t err = aaptfile->writeData(data, length); if (err != NO_ERROR) { png_error(png_ptr, "Write Error"); } @@ -68,6 +70,12 @@ struct image_info png_bytepp allocRows; }; +static void log_warning(png_structp png_ptr, png_const_charp warning_message) +{ + const char* imageName = (const char*) png_get_error_ptr(png_ptr); + fprintf(stderr, "%s: libpng warning: %s\n", imageName, warning_message); +} + static void read_png(const char* imageName, png_structp read_ptr, png_infop read_info, image_info* outImageInfo) @@ -76,6 +84,8 @@ static void read_png(const char* imageName, int bit_depth, interlace_type, compression_type; int i; + png_set_error_fn(read_ptr, const_cast(imageName), + NULL /* use default errorfn */, log_warning); png_read_info(read_ptr, read_info); png_get_IHDR(read_ptr, read_info, &outImageInfo->width, @@ -90,7 +100,7 @@ static void read_png(const char* imageName, png_set_palette_to_rgb(read_ptr); if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_gray_1_2_4_to_8(read_ptr); + png_set_expand_gray_1_2_4_to_8(read_ptr); if (png_get_valid(read_ptr, read_info, PNG_INFO_tRNS)) { //printf("Has PNG_INFO_tRNS!\n"); @@ -106,10 +116,12 @@ static void read_png(const char* imageName, if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) png_set_gray_to_rgb(read_ptr); + png_set_interlace_handling(read_ptr); + png_read_update_info(read_ptr, read_info); outImageInfo->rows = (png_bytepp)malloc( - outImageInfo->height * png_sizeof(png_bytep)); + outImageInfo->height * sizeof(png_bytep)); outImageInfo->allocHeight = outImageInfo->height; outImageInfo->allocRows = outImageInfo->rows; @@ -573,7 +585,7 @@ static status_t do_9patch(const char* imageName, image_info* image) image->info9Patch.paddingTop, image->info9Patch.paddingBottom)); // Remove frame from image. - image->rows = (png_bytepp)malloc((H-2) * png_sizeof(png_bytep)); + image->rows = (png_bytepp)malloc((H-2) * sizeof(png_bytep)); for (i=0; i<(H-2); i++) { image->rows[i] = image->allocRows[i+1]; memmove(image->rows[i], image->rows[i]+4, (W-2)*4); @@ -984,7 +996,7 @@ static void write_png(const char* imageName, unknowns[0].data = NULL; unknowns[1].data = NULL; - png_bytepp outRows = (png_bytepp) malloc((int) imageInfo.height * png_sizeof(png_bytep)); + png_bytepp outRows = (png_bytepp) malloc((int) imageInfo.height * sizeof(png_bytep)); if (outRows == (png_bytepp) 0) { printf("Can't allocate output buffer!\n"); exit(1); @@ -1073,18 +1085,19 @@ static void write_png(const char* imageName, unknowns[b_index].size = chunk_size; } + for (int i = 0; i < chunk_count; i++) { + unknowns[i].location = PNG_HAVE_PLTE; + } png_set_keep_unknown_chunks(write_ptr, PNG_HANDLE_CHUNK_ALWAYS, chunk_names, chunk_count); png_set_unknown_chunks(write_ptr, write_info, unknowns, chunk_count); - // XXX I can't get this to work without forcibly changing - // the location to what I want... which apparently is supposed - // to be a private API, but everything else I have tried results - // in the location being set to what I -last- wrote so I never - // get written. :p +#if PNG_LIBPNG_VER < 10600 + /* Deal with unknown chunk location bug in 1.5.x and earlier */ png_set_unknown_chunk_location(write_ptr, write_info, 0, PNG_HAVE_PLTE); if (imageInfo.haveLayoutBounds) { png_set_unknown_chunk_location(write_ptr, write_info, 1, PNG_HAVE_PLTE); } +#endif } @@ -1092,7 +1105,9 @@ static void write_png(const char* imageName, png_bytepp rows; if (color_type == PNG_COLOR_TYPE_RGB || color_type == PNG_COLOR_TYPE_RGB_ALPHA) { - png_set_filler(write_ptr, 0, PNG_FILLER_AFTER); + if (color_type == PNG_COLOR_TYPE_RGB) { + png_set_filler(write_ptr, 0, PNG_FILLER_AFTER); + } rows = imageInfo.rows; } else { rows = outRows; -- 2.11.0