android_mnit: support more PNG color formats
authorAlexis Laferrière <alexis.laf@xymus.net>
Sun, 16 Nov 2014 20:56:01 +0000 (15:56 -0500)
committerAlexis Laferrière <alexis.laf@xymus.net>
Mon, 17 Nov 2014 15:46:33 +0000 (10:46 -0500)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

lib/mnit_android/android_assets.nit

index 20704b6..41e889b 100644 (file)
@@ -166,14 +166,7 @@ redef class Opengles1Image
 
                png_get_IHDR(   png_ptr, info_ptr, &width, &height,
                                                &depth, &color_type, NULL, NULL, NULL);
-               if (color_type == PNG_COLOR_TYPE_RGBA)
-                       has_alpha = 1;
-               else if (color_type == PNG_COLOR_TYPE_RGB)
-                       has_alpha = 0;
-               else {
-                       LOGW("unknown color_type");
-                       goto close_png_ptr;
-               }
+               has_alpha = color_type & PNG_COLOR_MASK_ALPHA;
 
                LOGW("w: %i, h: %i", width, height);