From 8e64fae6b82244c19a6b0402a72e76f8c892dbbb Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Tue, 16 Oct 2012 06:36:20 +0000 Subject: [PATCH] remove yet more #defined config options and ifdefs from evas. SVN revision: 78037 --- .../evas/src/lib/engines/common/Makefile.am | 2 - .../lib/engines/common/evas_convert_gry_1.c | 2 - .../lib/engines/common/evas_convert_gry_4.c | 10 -- .../lib/engines/common/evas_convert_gry_4.h | 9 - .../lib/engines/common/evas_convert_gry_8.c | 10 -- .../engines/common/evas_convert_grypal_6.c | 2 - .../lib/engines/common/evas_convert_main.c | 158 +---------------- .../lib/engines/common/evas_convert_rgb_16.c | 162 ------------------ .../lib/engines/common/evas_convert_rgb_24.c | 8 +- .../lib/engines/common/evas_convert_rgb_32.c | 70 -------- .../lib/engines/common/evas_convert_rgb_8.c | 20 +-- legacy/evas/src/lib/engines/common/evas_cpu.c | 7 - legacy/evas/src/lib/include/evas_options.h | 45 ----- 13 files changed, 10 insertions(+), 495 deletions(-) delete mode 100644 legacy/evas/src/lib/engines/common/evas_convert_gry_4.c delete mode 100644 legacy/evas/src/lib/engines/common/evas_convert_gry_4.h diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am index a5ac2a6dbb..00f182228a 100644 --- a/legacy/evas/src/lib/engines/common/Makefile.am +++ b/legacy/evas/src/lib/engines/common/Makefile.am @@ -31,7 +31,6 @@ evas_blit_main.c \ evas_convert_color.c \ evas_convert_colorspace.c \ evas_convert_gry_1.c \ -evas_convert_gry_4.c \ evas_convert_gry_8.c \ evas_convert_main.c \ evas_convert_rgb_16.c \ @@ -74,7 +73,6 @@ evas_blend_private.h \ evas_convert_color.h \ evas_convert_colorspace.h \ evas_convert_gry_1.h \ -evas_convert_gry_4.h \ evas_convert_gry_8.h \ evas_convert_grypal_6.h \ evas_convert_main.h \ diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c b/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c index 45e16ee1e5..be7128071b 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_gry_1.c @@ -1,6 +1,4 @@ #include "evas_common.h" #include "evas_convert_gry_1.h" -#ifdef BUILD_CONVERT_1_GRY_1 void evas_common_convert_rgba_to_1bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} -#endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c b/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c deleted file mode 100644 index 2fa7ee3a2c..0000000000 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_4.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "evas_common.h" -#include "evas_convert_gry_4.h" - -#ifdef BUILD_CONVERT_4_GRY_4 -void evas_common_convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} -#endif - -#ifdef BUILD_CONVERT_4_GRY_1 -void evas_common_convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal){} -#endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_4.h b/legacy/evas/src/lib/engines/common/evas_convert_gry_4.h deleted file mode 100644 index 1614359b59..0000000000 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_4.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _EVAS_CONVERT_GRY_4_H -#define _EVAS_CONVERT_GRY_4_H - - -void evas_common_convert_rgba_to_4bpp_gry_4_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); -void evas_common_convert_rgba_to_4bpp_gry_1_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal); - - -#endif /* _EVAS_CONVERT_GRY_4_H */ diff --git a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c b/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c index 9bc5ca7dc7..bf45fd7a41 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_gry_8.c @@ -8,7 +8,6 @@ extern const DATA8 _evas_dither_44[4][4]; extern const DATA8 _evas_dither_128128[128][128]; #endif -#ifdef BUILD_CONVERT_8_GRY_1 void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { DATA32 *src_ptr; @@ -32,13 +31,9 @@ void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_GRY_4 void evas_common_convert_rgba_to_8bpp_gry_64_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){} -#endif -#ifdef BUILD_CONVERT_8_GRY_16 void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal __UNUSED__) { DATA32 *src_ptr; @@ -67,12 +62,7 @@ void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_GRY_64 void evas_common_convert_rgba_to_8bpp_gry_4_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){} -#endif -#ifdef BUILD_CONVERT_8_GRY_256 void evas_common_convert_rgba_to_8bpp_gry_1_dith (DATA32 *src __UNUSED__, DATA8 *dst __UNUSED__, int src_jump __UNUSED__, int dst_jump __UNUSED__, int w __UNUSED__, int h __UNUSED__, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__){} -#endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c b/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c index 2351fda432..c2acef7d04 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c @@ -1,7 +1,6 @@ #include "evas_common.h" #include "evas_convert_grypal_6.h" -#ifdef BUILD_CONVERT_8_GRAYSCALE_64 void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal) { DATA32 *src_ptr; @@ -20,4 +19,3 @@ void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int sr CONVERT_LOOP_END_ROT_0(); } -#endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.c b/legacy/evas/src/lib/engines/common/evas_convert_main.c index da19f9cc31..39e6d6c06a 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_main.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_main.c @@ -8,7 +8,6 @@ #include "evas_convert_yuv.h" #ifdef USE_DITHER_44 - const DATA8 _evas_dither_44[4][4] = { { 0, 8, 2, 10}, @@ -16,11 +15,9 @@ const DATA8 _evas_dither_44[4][4] = { 3, 11, 1, 9}, {15, 7, 13, 5} }; - #endif #ifdef USE_DITHER_128128 - const DATA8 _evas_dither_128128[128][128] = { { 0, 41, 23, 5, 17, 39, 7, 15, 62, 23, 40, 51, 31, 47, 9, 32, 52, 27, 57, 25, 6, 61, 27, 52, 37, 7, 40, 63, 18, 36, 10, 42, 25, 62, 45, 34, 20, 42, 37, 14, 35, 29, 50, 10, 61, 2, 40, 8, 37, 12, 58, 22, 5, 41, 10, 39, 0, 60, 11, 46, 2, 55, 38, 17, 36, 59, 13, 54, 37, 56, 8, 29, 16, 13, 63, 22, 41, 55, 7, 20, 49, 14, 23, 55, 37, 23, 19, 36, 15, 49, 23, 63, 30, 14, 38, 27, 53, 13, 22, 41, 19, 31, 7, 19, 50, 30, 49, 16, 3, 32, 56, 40, 29, 34, 8, 48, 19, 45, 4, 51, 12, 46, 35, 49, 16, 42, 12, 62 }, @@ -152,7 +149,6 @@ const DATA8 _evas_dither_128128[128][128] = { 19, 42, 9, 48, 2, 44, 11, 37, 48, 20, 33, 16, 55, 35, 49, 15, 37, 20, 59, 16, 53, 22, 56, 31, 50, 11, 34, 54, 16, 51, 4, 49, 33, 53, 21, 28, 56, 24, 31, 9, 52, 16, 48, 24, 44, 13, 51, 20, 31, 49, 18, 6, 34, 2, 44, 14, 47, 8, 15, 43, 13, 41, 33, 52, 20, 61, 7, 51, 34, 62, 4, 20, 36, 33, 43, 8, 46, 13, 53, 17, 45, 42, 9, 31, 52, 11, 30, 56, 13, 59, 17, 44, 27, 6, 62, 11, 43, 17, 49, 38, 26, 2, 16, 27, 58, 21, 54, 18, 26, 5, 35, 61, 43, 27, 7, 39, 14, 58, 37, 55, 20, 33, 13, 40, 62, 10, 55, 5 }, { 51, 14, 61, 29, 59, 20, 55, 31, 0, 49, 11, 60, 3, 26, 22, 56, 0, 40, 12, 43, 41, 8, 36, 0, 17, 57, 24, 2, 46, 26, 61, 18, 0, 38, 12, 59, 6, 49, 3, 57, 19, 63, 5, 33, 18, 54, 28, 56, 0, 43, 26, 46, 63, 27, 56, 22, 27, 54, 38, 28, 63, 24, 10, 45, 0, 31, 42, 21, 12, 25, 44, 49, 59, 6, 26, 50, 3, 34, 27, 59, 0, 35, 62, 16, 4, 58, 47, 0, 43, 24, 37, 2, 54, 20, 46, 31, 0, 56, 34, 5, 55, 45, 60, 37, 0, 40, 10, 38, 63, 46, 15, 20, 0, 53, 21, 62, 30, 11, 24, 27, 40, 0, 57, 26, 3, 45, 27, 35 } }; - #endif /* USE_DITHER_128128 */ EAPI void @@ -167,56 +163,34 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA { if (depth == 8) { -#ifdef BUILD_CONVERT_8_GRY_1 if (pal_mode == PAL_MODE_NONE) return evas_common_convert_rgba_to_8bpp_gry_256_dith; -#endif -#ifdef BUILD_CONVERT_8_GRY_16 if (pal_mode == PAL_MODE_NONE) return evas_common_convert_rgba_to_8bpp_gry_16_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_332 if (pal_mode == PAL_MODE_RGB332) return evas_common_convert_rgba_to_8bpp_rgb_332_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_666 if (pal_mode == PAL_MODE_RGB666) return evas_common_convert_rgba_to_8bpp_rgb_666_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_232 if (pal_mode == PAL_MODE_RGB232) return evas_common_convert_rgba_to_8bpp_rgb_232_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_222 if (pal_mode == PAL_MODE_RGB222) return evas_common_convert_rgba_to_8bpp_rgb_222_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_221 if (pal_mode == PAL_MODE_RGB221) return evas_common_convert_rgba_to_8bpp_rgb_221_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_121 if (pal_mode == PAL_MODE_RGB121) return evas_common_convert_rgba_to_8bpp_rgb_121_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_111 if (pal_mode == PAL_MODE_RGB111) return evas_common_convert_rgba_to_8bpp_rgb_111_dith; -#endif -#ifdef BUILD_CONVERT_8_GRAYSCALE_64 - if (pal_mode == PAL_MODE_GRAY64) - return evas_common_convert_rgba_to_8bpp_pal_gray64; -#endif + if (pal_mode == PAL_MODE_GRAY64) + return evas_common_convert_rgba_to_8bpp_pal_gray64; } } else { if (depth == 16) { -#ifdef BUILD_CONVERT_16_RGB_565 if ((rmask == 0x0000f800) && (gmask == 0x000007e0) && (bmask == 0x0000001f)) { -#ifdef BUILD_CONVERT_16_RGB_ROT0 if (rotation == 0) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -224,8 +198,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_565_dith; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT180 if (rotation == 180) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -233,8 +205,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_180; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -242,8 +212,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -251,13 +219,9 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90; } -#endif } -#endif -#ifdef BUILD_CONVERT_16_BGR_565 if ((rmask == 0x0000001f) && (gmask == 0x000007e0) && (bmask == 0x0000f800)) { -#ifdef BUILD_CONVERT_16_RGB_ROT0 if (rotation == 0) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -265,8 +229,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_bgr_565_dith; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT180 if (rotation == 180) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -274,8 +236,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -283,8 +243,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_270; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -292,13 +250,9 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_90; } -#endif } -#endif -#ifdef BUILD_CONVERT_16_RGB_555 if ((rmask == 0x00007c00) && (gmask == 0x000003e0) && (bmask == 0x0000001f)) { -#ifdef BUILD_CONVERT_16_RGB_ROT0 if (rotation == 0) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -306,8 +260,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_555_dith; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT180 if (rotation == 180) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -315,8 +267,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_180; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -324,8 +274,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -333,13 +281,9 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90; } -#endif } -#endif -#ifdef BUILD_CONVERT_16_RGB_444 if ((rmask == 0x00000f00) && (gmask == 0x000000f0) && (bmask == 0x0000000f)) { -#ifdef BUILD_CONVERT_16_RGB_ROT0 if (rotation == 0) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -347,8 +291,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_444_dith; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT180 if (rotation == 180) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -356,8 +298,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_180; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -365,8 +305,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -374,13 +312,9 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90; } -#endif } -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 if ((rmask == 0x0000f000) && (gmask == 0x00000780) && (bmask == 0x0000001e)) { -#ifdef BUILD_CONVERT_16_RGB_ROT0 if (rotation == 0) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -389,8 +323,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA return evas_common_convert_rgba_to_16bpp_rgb_454645_dith; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT180 if (rotation == 180) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -398,8 +330,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -407,8 +337,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -416,13 +344,9 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90; } -#endif } -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 if ((rmask == 0x0000f800) && (gmask == 0x000007e0) && (bmask == 0x0000001f)) { -#ifdef BUILD_CONVERT_16_RGB_ROT0 if (rotation == 0) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -431,8 +355,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA return evas_common_convert_rgba_to_16bpp_rgb_454645_dith; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT180 if (rotation == 180) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -440,8 +362,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT270 if (rotation == 270) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -449,8 +369,6 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270; } -#endif -#ifdef BUILD_CONVERT_16_RGB_ROT90 if (rotation == 90) { if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) @@ -458,173 +376,101 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA else return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90; } -#endif } -#endif } if (depth == 32) { -#ifdef BUILD_CONVERT_32_RGB_8888 if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask == 0x000000ff)) { -#ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) return evas_common_convert_rgba_to_32bpp_rgb_8888; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT180 if (rotation == 180) return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90; -#endif } -#endif -#ifdef BUILD_CONVERT_32_RGBX_8888 if ((rmask == 0xff000000) && (gmask == 0x00ff0000) && (bmask == 0x0000ff00)) { -#ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) return evas_common_convert_rgba_to_32bpp_rgbx_8888; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT180 if (rotation == 180) return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90; -#endif } -#endif -#ifdef BUILD_CONVERT_32_BGR_8888 if ((rmask == 0x000000ff) && (gmask == 0x0000ff00) && (bmask == 0x00ff0000)) { -#ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) return evas_common_convert_rgba_to_32bpp_bgr_8888; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT180 if (rotation == 180) return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90; -#endif } -#endif -#ifdef BUILD_CONVERT_32_BGRX_8888 if ((rmask == 0x0000ff00) && (gmask == 0x00ff0000) && (bmask == 0xff000000)) { -#ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) return evas_common_convert_rgba_to_32bpp_bgrx_8888; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT180 if (rotation == 180) return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT270 if (rotation == 270) return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT90 if (rotation == 90) return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90; -#endif } -#endif -#ifdef BUILD_CONVERT_32_RGB_666 if ((rmask == 0x0003f000) && (gmask == 0x00000fc0) && (bmask == 0x0000003f)) { -#ifdef BUILD_CONVERT_32_RGB_ROT0 if (rotation == 0) return evas_common_convert_rgba_to_32bpp_rgb_666; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT180 // if (rotation == 180) // return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT270 // if (rotation == 270) // return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270; -#endif -#ifdef BUILD_CONVERT_32_RGB_ROT90 // if (rotation == 90) // return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90; -#endif } -#endif } if (depth == 24) { -#ifdef BUILD_CONVERT_24_RGB_888 if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask == 0x000000ff)) { if (rotation == 0) return evas_common_convert_rgba_to_24bpp_rgb_888; } -#endif -#ifdef BUILD_CONVERT_24_RGB_666 if ((rmask == 0x0003f000) && (gmask == 0x00000fc0) && (bmask == 0x0000003f)) { if (rotation == 0) return evas_common_convert_rgba_to_24bpp_rgb_666; } -#endif -#ifdef BUILD_CONVERT_24_BGR_888 if ((rmask == 0x000000ff) && (gmask == 0x0000ff00) && (bmask == 0x00ff0000)) { if (rotation == 0) return evas_common_convert_rgba_to_24bpp_bgr_888; } -#endif } INF("depth = %i mode = %i", depth, pal_mode); if (depth == 8) { -#ifdef BUILD_CONVERT_8_RGB_332 if (pal_mode == PAL_MODE_RGB332) return evas_common_convert_rgba_to_8bpp_rgb_332_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_666 if (pal_mode == PAL_MODE_RGB666) return evas_common_convert_rgba_to_8bpp_rgb_666_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_232 if (pal_mode == PAL_MODE_RGB232) return evas_common_convert_rgba_to_8bpp_rgb_232_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_222 if (pal_mode == PAL_MODE_RGB222) return evas_common_convert_rgba_to_8bpp_rgb_222_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_221 if (pal_mode == PAL_MODE_RGB221) return evas_common_convert_rgba_to_8bpp_rgb_221_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_121 if (pal_mode == PAL_MODE_RGB121) return evas_common_convert_rgba_to_8bpp_rgb_121_dith; -#endif -#ifdef BUILD_CONVERT_8_RGB_111 if (pal_mode == PAL_MODE_RGB111) return evas_common_convert_rgba_to_8bpp_rgb_111_dith; -#endif } } /* no optimised converter for this... no generic one either. NULL */ diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c index 796ff17830..d7a4f492f0 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c @@ -10,8 +10,6 @@ extern const DATA8 _evas_dither_128128[128][128]; #endif #endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -147,11 +145,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int sr (void)pal; #endif } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -236,11 +230,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src (void)pal; #endif } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -297,11 +287,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_180 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -335,11 +321,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_180 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -396,11 +378,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -434,11 +412,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -495,11 +469,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_565 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -533,11 +503,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba2_to_16bpp_bgr_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -594,11 +560,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith (DATA32 *src, DATA8 *dst, int sr return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba_to_16bpp_bgr_565_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -632,11 +594,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith (DATA32 *src, DATA8 *dst, int src return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -693,11 +651,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -733,11 +687,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -794,11 +744,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_270 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -832,11 +778,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_270 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -893,11 +835,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_BGR_565 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -931,11 +869,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -990,11 +924,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int sr return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1027,11 +957,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1086,11 +1012,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_180 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1123,11 +1045,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_180 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1182,11 +1100,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1219,11 +1133,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1278,11 +1188,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_444 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1315,11 +1221,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1374,11 +1276,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1411,11 +1309,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1470,11 +1364,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_180 (DATA32 *src, DATA8 * return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1507,12 +1397,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180 (DATA32 *src, DATA8 *d return; (void)pal; } -#endif -#endif - -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1567,11 +1452,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 * return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1604,11 +1485,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *d return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1663,11 +1540,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *d return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_454645 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1700,11 +1573,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *ds return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1759,11 +1628,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int sr return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT0 void evas_common_convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1796,11 +1661,7 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1855,11 +1716,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_180 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT180 void evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1892,11 +1749,7 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_180 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1951,11 +1804,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT270 void evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -1988,11 +1837,7 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -2047,11 +1892,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif -#ifdef BUILD_CONVERT_16_RGB_555 -#ifdef BUILD_CONVERT_16_RGB_ROT90 void evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { @@ -2084,6 +1925,3 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst, return; (void)pal; } -#endif -#endif - diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c index 9efa006491..1d4f091c22 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c @@ -1,7 +1,6 @@ #include "evas_common.h" #include "evas_convert_rgb_24.h" -#ifdef BUILD_CONVERT_24_RGB_888 void evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -27,8 +26,7 @@ evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump, } return; } -#endif -#ifdef BUILD_CONVERT_24_RGB_666 + void evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -59,8 +57,7 @@ evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, } return; } -#endif -#ifdef BUILD_CONVERT_24_BGR_888 + void evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -86,4 +83,3 @@ evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump, } return; } -#endif diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c index b00735088e..17d686b587 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c @@ -1,8 +1,6 @@ #include "evas_common.h" #include "evas_convert_rgb_32.h" -#ifdef BUILD_CONVERT_32_RGB_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT0 void evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -24,11 +22,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jum } return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGB_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT180 void evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -45,8 +39,6 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int CONVERT_LOOP_END_ROT_180(); return; } -#endif -#endif #ifdef TILE_ROTATE #define FAST_SIMPLE_ROTATE(suffix, pix_type) \ @@ -196,9 +188,6 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int FAST_SIMPLE_ROTATE(8888, DATA32) #endif - -#ifdef BUILD_CONVERT_32_RGB_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT270 void evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -219,11 +208,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int #endif return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGB_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT90 void evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -341,11 +326,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int # endif return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGBX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT0 void evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -363,11 +344,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_ju CONVERT_LOOP_END_ROT_0(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGBX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT180 void evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -385,11 +362,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, in CONVERT_LOOP_END_ROT_180(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGBX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT270 void evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -407,11 +380,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, in CONVERT_LOOP_END_ROT_270(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGBX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT90 void evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -429,11 +398,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int CONVERT_LOOP_END_ROT_90(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGR_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT0 void evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -450,11 +415,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jum CONVERT_LOOP_END_ROT_0(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGR_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT180 void evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -471,11 +432,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int CONVERT_LOOP_END_ROT_180(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGR_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT270 void evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -492,11 +449,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int CONVERT_LOOP_END_ROT_270(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGR_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT90 void evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -513,11 +466,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int CONVERT_LOOP_END_ROT_90(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGRX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT0 void evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -534,11 +483,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_ju CONVERT_LOOP_END_ROT_0(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGRX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT180 void evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -555,11 +500,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, in CONVERT_LOOP_END_ROT_180(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGRX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT270 void evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -576,11 +517,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, in CONVERT_LOOP_END_ROT_270(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_BGRX_8888 -#ifdef BUILD_CONVERT_32_RGB_ROT90 void evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -597,11 +534,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int CONVERT_LOOP_END_ROT_90(); return; } -#endif -#endif -#ifdef BUILD_CONVERT_32_RGB_666 -#ifdef BUILD_CONVERT_32_RGB_ROT0 void evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x __UNUSED__, int dith_y __UNUSED__, DATA8 *pal __UNUSED__) { @@ -620,6 +553,3 @@ evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump, CONVERT_LOOP_END_ROT_0(); return; } -#endif -#endif - diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c index f69f398fb0..7ae0e86fd7 100644 --- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c +++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c @@ -8,7 +8,6 @@ extern const DATA8 _evas_dither_44[4][4]; extern const DATA8 _evas_dither_128128[128][128]; #endif -#ifdef BUILD_CONVERT_8_RGB_332 void evas_common_convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; @@ -40,8 +39,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_RGB_666 + static DATA8 p_to_6[256]; static DATA8 p_to_6_err[256]; @@ -80,8 +78,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_RGB_232 + void evas_common_convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; @@ -113,8 +110,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_RGB_222 + void evas_common_convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; @@ -145,8 +141,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_RGB_221 + void evas_common_convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; @@ -178,8 +173,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_RGB_121 + void evas_common_convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; @@ -212,8 +206,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif -#ifdef BUILD_CONVERT_8_RGB_111 + void evas_common_convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst, int src_jump, int dst_jump, int w, int h, int dith_x, int dith_y, DATA8 *pal) { DATA32 *src_ptr; @@ -245,4 +238,3 @@ void evas_common_convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst, CONVERT_LOOP_END_ROT_0(); } -#endif diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/legacy/evas/src/lib/engines/common/evas_cpu.c index 6b880fe3bb..33229ff1a1 100644 --- a/legacy/evas/src/lib/engines/common/evas_cpu.c +++ b/legacy/evas/src/lib/engines/common/evas_cpu.c @@ -245,13 +245,6 @@ evas_common_cpu_can_do(int *mmx, int *sse, int *sse2) if (!done) { -# ifdef HARD_CODED_P3 - cpu_feature_mask |= CPU_FEATURE_MMX; - cpu_feature_mask |= CPU_FEATURE_SSE; -#endif -#ifdef HARD_CODED_P2 - cpu_feature_mask |= CPU_FEATURE_MMX; -#endif if (cpu_feature_mask & CPU_FEATURE_MMX) do_mmx = 1; if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1; if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1; diff --git a/legacy/evas/src/lib/include/evas_options.h b/legacy/evas/src/lib/include/evas_options.h index b15221c15e..d7af99f794 100644 --- a/legacy/evas/src/lib/include/evas_options.h +++ b/legacy/evas/src/lib/include/evas_options.h @@ -1,51 +1,6 @@ #ifndef EVAS_OPTIONS_H #define EVAS_OPTIONS_H 1 -/* these may vary per OS */ - -/* what to build *//* small dither table is MUCH faster on ipaq */ -/*#define BUILD_SMALL_DITHER_MASK*/ - -/*#define HARD_CODED_P3*/ -/*#define HARD_CODED_P2*/ - -/*#define BUILD_CONVERT_1_GRY_1*/ -/*#define BUILD_CONVERT_4_GRY_1*/ -/*#define BUILD_CONVERT_4_GRY_4*/ -/*#define BUILD_CONVERT_8_GRY_1*/ -/*#define BUILD_CONVERT_8_GRY_4*/ -/*#define BUILD_CONVERT_8_GRY_16*/ -/*#define BUILD_CONVERT_8_GRY_64*/ -/*#define BUILD_CONVERT_8_GRY_256*/ -/*#define BUILD_CONVERT_8_RGB_332*/ -/*#define BUILD_CONVERT_8_RGB_666*/ -/*#define BUILD_CONVERT_8_RGB_232*/ -/*#define BUILD_CONVERT_8_RGB_222*/ -/*#define BUILD_CONVERT_8_RGB_221*/ -/*#define BUILD_CONVERT_8_RGB_121*/ -/*#define BUILD_CONVERT_8_RGB_111*/ -/*#define BUILD_CONVERT_16_RGB_565*/ -/*#define BUILD_CONVERT_16_RGB_555*/ -/*#define BUILD_CONVERT_16_RGB_444*/ -/*#define BUILD_CONVERT_16_RGB_454645*/ -/*#define BUILD_CONVERT_16_RGB_ROT0*/ -/*#define BUILD_CONVERT_16_RGB_ROT270*/ -/*#define BUILD_CONVERT_24_RGB_888*/ -/*#define BUILD_CONVERT_24_BGR_888*/ -/*#define BUILD_CONVERT_32_RGB_8888*/ -/*#define BUILD_CONVERT_32_BGR_8888*/ -/*#define BUILD_CONVERT_32_RGB_ROT0*/ -/*#define BUILD_CONVERT_32_RGB_ROT270*/ - -/*#define BUILD_MMX*/ -/*#define BUILD_SSE3*/ - -/*#define BUILD_LOADER_PNG*/ -/*#define BUILD_LOADER_JPEG*/ -/*#define BUILD_LOADER_EET*/ - -/*#define BUILD_FMEMOPEN*/ - #define DIRECT_SCALE #endif