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

Commit 41329c5f authored by John Reck's avatar John Reck
Browse files

Fix libpng API usage 

 Remove usage of deprecated methods that were removed in 1.6

Change-Id: I2a669bf5201197f60adfdbe512fd729bebb74f9c
parent c0441d17

minui/resources.c

+12 −12
Original line number Diff line number Diff line
@@ -93,9 +93,13 @@ int res_create_surface(const char* name, gr_surface* pSurface) { 
    png_set_sig_bytes(png_ptr, sizeof(header));

    png_read_info(png_ptr, info_ptr);



    int color_type = info_ptr->color_type;

    int bit_depth = info_ptr->bit_depth;

    int channels = info_ptr->channels;

    int color_type, bit_depth;

    size_t width, height;

    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,

            &color_type, NULL, NULL, NULL);



    int channels = png_get_channels(png_ptr, info_ptr);



    if (!(bit_depth == 8 &&

          ((channels == 3 && color_type == PNG_COLOR_TYPE_RGB) ||

           (channels == 4 && color_type == PNG_COLOR_TYPE_RGBA) ||
@@ -105,8 +109,6 @@ int res_create_surface(const char* name, gr_surface* pSurface) { 
        goto exit;

    }



    size_t width = info_ptr->width;

    size_t height = info_ptr->height;

    size_t stride = (color_type == PNG_COLOR_TYPE_GRAY ? 1 : 4) * width;

    size_t pixelSize = stride * height;
@@ -246,13 +248,11 @@ int res_create_localized_surface(const char* name, gr_surface* pSurface) { 
    png_set_sig_bytes(png_ptr, sizeof(header));

    png_read_info(png_ptr, info_ptr);



    size_t width = info_ptr->width;

    size_t height = info_ptr->height;

    size_t stride = 4 * width;



    int color_type = info_ptr->color_type;

    int bit_depth = info_ptr->bit_depth;

    int channels = info_ptr->channels;

    int color_type, bit_depth;

    size_t width, height;

    png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth,

            &color_type, NULL, NULL, NULL);

    int channels = png_get_channels(png_ptr, info_ptr);



    if (!(bit_depth == 8 &&

          (channels == 1 && color_type == PNG_COLOR_TYPE_GRAY))) {