Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2

Browse Source 
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
This commit is contained in:
John Reck
2016-05-19 22:16:42 +00:00
committed by android-build-merger
parent ca133845ef 1b1fcbaab5
commit 5527fd1323
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/aapt/Images.cpp
View File

@@ -70,6 +70,12 @@ struct image_info
png_bytepp allocRows; 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, static void read_png(const char* imageName,
png_structp read_ptr, png_infop read_info, png_structp read_ptr, png_infop read_info,
image_info* outImageInfo) image_info* outImageInfo)
@@ -78,6 +84,8 @@ static void read_png(const char* imageName,
int bit_depth, interlace_type, compression_type; int bit_depth, interlace_type, compression_type;
int i; int i;
png_set_error_fn(read_ptr, const_cast<char*>(imageName),
NULL /* use default errorfn */, log_warning);
png_read_info(read_ptr, read_info); png_read_info(read_ptr, read_info);
png_get_IHDR(read_ptr, read_info, &outImageInfo->width, png_get_IHDR(read_ptr, read_info, &outImageInfo->width,
@@ -108,6 +116,8 @@ static void read_png(const char* imageName,
if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) if (color_type == PNG_COLOR_TYPE_GRAY || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
png_set_gray_to_rgb(read_ptr); png_set_gray_to_rgb(read_ptr);
png_set_interlace_handling(read_ptr);
png_read_update_info(read_ptr, read_info); png_read_update_info(read_ptr, read_info);
outImageInfo->rows = (png_bytepp)malloc( outImageInfo->rows = (png_bytepp)malloc(