From 372b2a256f5156d9144e1e5f3d129ca66827fe22 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Wed, 27 Aug 2014 14:21:23 +0900 Subject: [PATCH] evas - dither | convert - fix dead code dead code as paln one checked twice in a row - the grey 16 check was wrong so move to end and check against greay16 pal type fix CID 1039449 --- src/lib/evas/common/evas_convert_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/evas/common/evas_convert_main.c b/src/lib/evas/common/evas_convert_main.c index ac028b8cbe..58bd430abe 100644 --- a/src/lib/evas/common/evas_convert_main.c +++ b/src/lib/evas/common/evas_convert_main.c @@ -163,10 +163,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h EINA_UNUSED, int depth, D { if (depth == 8) { - if (pal_mode == PAL_MODE_NONE) - return evas_common_convert_rgba_to_8bpp_gry_256_dith; - if (pal_mode == PAL_MODE_NONE) - return evas_common_convert_rgba_to_8bpp_gry_16_dith; if (pal_mode == PAL_MODE_RGB332) return evas_common_convert_rgba_to_8bpp_rgb_332_dith; if (pal_mode == PAL_MODE_RGB666) @@ -183,6 +179,10 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h EINA_UNUSED, int depth, D return evas_common_convert_rgba_to_8bpp_rgb_111_dith; if (pal_mode == PAL_MODE_GRAY64) return evas_common_convert_rgba_to_8bpp_pal_gray64; + if (pal_mode == PAL_MODE_GRAY16) + return evas_common_convert_rgba_to_8bpp_gry_16_dith; + if (pal_mode == PAL_MODE_NONE) + return evas_common_convert_rgba_to_8bpp_gry_256_dith; } } else