diff options
| author | John Reck <jreck@android.com> | 2013-08-27 09:54:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 09:54:05 -0700 |
| commit | 19877de513a9493dad77488144089b4f30103b74 (patch) | |
| tree | 6299c388fa18f3236f3bbf678158d7ef93ba4ae8 /minui | |
| parent | 239ac6abac4524be93fce710360c0512c6cc2ab3 (diff) | |
| parent | 5c4e1dac0bd8f31559bd50eec4343b7a17b7a976 (diff) | |
| download | bootable_recovery-19877de513a9493dad77488144089b4f30103b74.zip bootable_recovery-19877de513a9493dad77488144089b4f30103b74.tar.gz bootable_recovery-19877de513a9493dad77488144089b4f30103b74.tar.bz2 | |
am 5c4e1dac: Merge "Update libpng API usage"
* commit '5c4e1dac0bd8f31559bd50eec4343b7a17b7a976':
Update libpng API usage
Diffstat (limited to 'minui')
| -rw-r--r-- | minui/resources.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/minui/resources.c b/minui/resources.c index 72f39fb..c0a9cca 100644 --- a/minui/resources.c +++ b/minui/resources.c @@ -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))) { |