Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5527fd13 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

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

am: 1b1fcbaa

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

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
parents ca133845 1b1fcbaa

tools/aapt/Images.cpp

+10 −0
Original line number Diff line number Diff line
@@ -70,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)
@@ -78,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<char*>(imageName),

            NULL /* use default errorfn */, log_warning);

    png_read_info(read_ptr, read_info);



    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)

        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(