summaryrefslogtreecommitdiff
path: root/legacy/evas
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2012-10-16 06:36:20 +0000
committerCarsten Haitzler <raster@rasterman.com>2012-10-16 06:36:20 +0000
commit8e64fae6b82244c19a6b0402a72e76f8c892dbbb (patch)
tree23f09c64ab3b38440f45a6a65a40cfb637287fe9 /legacy/evas
parentd1536027169bb10f2ecbadd2b31068698bb7978b (diff)
remove yet more #defined config options and ifdefs from evas.
SVN revision: 78037
Diffstat (limited to 'legacy/evas')
-rw-r--r--legacy/evas/src/lib/engines/common/Makefile.am2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_gry_1.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_gry_4.c10
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_gry_4.h9
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_gry_8.c10
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_grypal_6.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_main.c158
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c162
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_24.c8
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c70
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_8.c20
-rw-r--r--legacy/evas/src/lib/engines/common/evas_cpu.c7
-rw-r--r--legacy/evas/src/lib/include/evas_options.h45
13 files changed, 10 insertions, 495 deletions
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 \
31evas_convert_color.c \ 31evas_convert_color.c \
32evas_convert_colorspace.c \ 32evas_convert_colorspace.c \
33evas_convert_gry_1.c \ 33evas_convert_gry_1.c \
34evas_convert_gry_4.c \
35evas_convert_gry_8.c \ 34evas_convert_gry_8.c \
36evas_convert_main.c \ 35evas_convert_main.c \
37evas_convert_rgb_16.c \ 36evas_convert_rgb_16.c \
@@ -74,7 +73,6 @@ evas_blend_private.h \
74evas_convert_color.h \ 73evas_convert_color.h \
75evas_convert_colorspace.h \ 74evas_convert_colorspace.h \
76evas_convert_gry_1.h \ 75evas_convert_gry_1.h \
77evas_convert_gry_4.h \
78evas_convert_gry_8.h \ 76evas_convert_gry_8.h \
79evas_convert_grypal_6.h \ 77evas_convert_grypal_6.h \
80evas_convert_main.h \ 78evas_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 @@
1#include "evas_common.h" 1#include "evas_common.h"
2#include "evas_convert_gry_1.h" 2#include "evas_convert_gry_1.h"
3 3
4#ifdef BUILD_CONVERT_1_GRY_1
5void 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){} 4void 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){}
6#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 @@
1#include "evas_common.h"
2#include "evas_convert_gry_4.h"
3
4#ifdef BUILD_CONVERT_4_GRY_4
5void 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){}
6#endif
7
8#ifdef BUILD_CONVERT_4_GRY_1
9void 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){}
10#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 @@
1#ifndef _EVAS_CONVERT_GRY_4_H
2#define _EVAS_CONVERT_GRY_4_H
3
4
5void 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);
6void 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);
7
8
9#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];
8extern const DATA8 _evas_dither_128128[128][128]; 8extern const DATA8 _evas_dither_128128[128][128];
9#endif 9#endif
10 10
11#ifdef BUILD_CONVERT_8_GRY_1
12void 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__) 11void 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__)
13{ 12{
14 DATA32 *src_ptr; 13 DATA32 *src_ptr;
@@ -32,13 +31,9 @@ void evas_common_convert_rgba_to_8bpp_gry_256_dith (DATA32 *src, DATA8 *dst,
32 31
33 CONVERT_LOOP_END_ROT_0(); 32 CONVERT_LOOP_END_ROT_0();
34} 33}
35#endif
36 34
37#ifdef BUILD_CONVERT_8_GRY_4
38void 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__){} 35void 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__){}
39#endif
40 36
41#ifdef BUILD_CONVERT_8_GRY_16
42void 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__) 37void 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__)
43{ 38{
44 DATA32 *src_ptr; 39 DATA32 *src_ptr;
@@ -67,12 +62,7 @@ void evas_common_convert_rgba_to_8bpp_gry_16_dith (DATA32 *src, DATA8 *dst,
67 62
68 CONVERT_LOOP_END_ROT_0(); 63 CONVERT_LOOP_END_ROT_0();
69} 64}
70#endif
71 65
72#ifdef BUILD_CONVERT_8_GRY_64
73void 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__){} 66void 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__){}
74#endif
75 67
76#ifdef BUILD_CONVERT_8_GRY_256
77void 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__){} 68void 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__){}
78#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 @@
1#include "evas_common.h" 1#include "evas_common.h"
2#include "evas_convert_grypal_6.h" 2#include "evas_convert_grypal_6.h"
3 3
4#ifdef BUILD_CONVERT_8_GRAYSCALE_64
5void 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) 4void 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)
6{ 5{
7 DATA32 *src_ptr; 6 DATA32 *src_ptr;
@@ -20,4 +19,3 @@ void evas_common_convert_rgba_to_8bpp_pal_gray64(DATA32 *src, DATA8 *dst, int sr
20 19
21 CONVERT_LOOP_END_ROT_0(); 20 CONVERT_LOOP_END_ROT_0();
22} 21}
23#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 @@
8#include "evas_convert_yuv.h" 8#include "evas_convert_yuv.h"
9 9
10#ifdef USE_DITHER_44 10#ifdef USE_DITHER_44
11
12const DATA8 _evas_dither_44[4][4] = 11const DATA8 _evas_dither_44[4][4] =
13{ 12{
14 { 0, 8, 2, 10}, 13 { 0, 8, 2, 10},
@@ -16,11 +15,9 @@ const DATA8 _evas_dither_44[4][4] =
16 { 3, 11, 1, 9}, 15 { 3, 11, 1, 9},
17 {15, 7, 13, 5} 16 {15, 7, 13, 5}
18}; 17};
19
20#endif 18#endif
21 19
22#ifdef USE_DITHER_128128 20#ifdef USE_DITHER_128128
23
24const DATA8 _evas_dither_128128[128][128] = 21const DATA8 _evas_dither_128128[128][128] =
25{ 22{
26 { 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 }, 23 { 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] =
152 { 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 }, 149 { 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 },
153 { 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 } 150 { 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 }
154}; 151};
155
156#endif /* USE_DITHER_128128 */ 152#endif /* USE_DITHER_128128 */
157 153
158EAPI void 154EAPI void
@@ -167,56 +163,34 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h __UNUSED__, int depth, DA
167 { 163 {
168 if (depth == 8) 164 if (depth == 8)
169 { 165 {
170#ifdef BUILD_CONVERT_8_GRY_1
171 if (pal_mode == PAL_MODE_NONE) 166 if (pal_mode == PAL_MODE_NONE)
172 return evas_common_convert_rgba_to_8bpp_gry_256_dith; 167 return evas_common_convert_rgba_to_8bpp_gry_256_dith;
173#endif
174#ifdef BUILD_CONVERT_8_GRY_16
175 if (pal_mode == PAL_MODE_NONE) 168 if (pal_mode == PAL_MODE_NONE)
176 return evas_common_convert_rgba_to_8bpp_gry_16_dith; 169 return evas_common_convert_rgba_to_8bpp_gry_16_dith;
177#endif
178#ifdef BUILD_CONVERT_8_RGB_332
179 if (pal_mode == PAL_MODE_RGB332) 170 if (pal_mode == PAL_MODE_RGB332)
180 return evas_common_convert_rgba_to_8bpp_rgb_332_dith; 171 return evas_common_convert_rgba_to_8bpp_rgb_332_dith;
181#endif
182#ifdef BUILD_CONVERT_8_RGB_666
183 if (pal_mode == PAL_MODE_RGB666) 172 if (pal_mode == PAL_MODE_RGB666)
184 return evas_common_convert_rgba_to_8bpp_rgb_666_dith; 173 return evas_common_convert_rgba_to_8bpp_rgb_666_dith;
185#endif
186#ifdef BUILD_CONVERT_8_RGB_232
187 if (pal_mode == PAL_MODE_RGB232) 174 if (pal_mode == PAL_MODE_RGB232)
188 return evas_common_convert_rgba_to_8bpp_rgb_232_dith; 175 return evas_common_convert_rgba_to_8bpp_rgb_232_dith;
189#endif
190#ifdef BUILD_CONVERT_8_RGB_222
191 if (pal_mode == PAL_MODE_RGB222) 176 if (pal_mode == PAL_MODE_RGB222)
192 return evas_common_convert_rgba_to_8bpp_rgb_222_dith; 177 return evas_common_convert_rgba_to_8bpp_rgb_222_dith;
193#endif
194#ifdef BUILD_CONVERT_8_RGB_221
195 if (pal_mode == PAL_MODE_RGB221) 178 if (pal_mode == PAL_MODE_RGB221)
196 return evas_common_convert_rgba_to_8bpp_rgb_221_dith; 179 return evas_common_convert_rgba_to_8bpp_rgb_221_dith;
197#endif
198#ifdef BUILD_CONVERT_8_RGB_121
199 if (pal_mode == PAL_MODE_RGB121) 180 if (pal_mode == PAL_MODE_RGB121)
200 return evas_common_convert_rgba_to_8bpp_rgb_121_dith; 181 return evas_common_convert_rgba_to_8bpp_rgb_121_dith;
201#endif
202#ifdef BUILD_CONVERT_8_RGB_111
203 if (pal_mode == PAL_MODE_RGB111) 182 if (pal_mode == PAL_MODE_RGB111)
204 return evas_common_convert_rgba_to_8bpp_rgb_111_dith; 183 return evas_common_convert_rgba_to_8bpp_rgb_111_dith;
205#endif 184 if (pal_mode == PAL_MODE_GRAY64)
206#ifdef BUILD_CONVERT_8_GRAYSCALE_64 185 return evas_common_convert_rgba_to_8bpp_pal_gray64;
207 if (pal_mode == PAL_MODE_GRAY64)
208 return evas_common_convert_rgba_to_8bpp_pal_gray64;
209#endif
210 } 186 }
211 } 187 }
212 else 188 else
213 { 189 {
214 if (depth == 16) 190 if (depth == 16)
215 { 191 {
216#ifdef BUILD_CONVERT_16_RGB_565
217 if ((rmask == 0x0000f800) && (gmask == 0x000007e0) && (bmask == 0x0000001f)) 192 if ((rmask == 0x0000f800) && (gmask == 0x000007e0) && (bmask == 0x0000001f))
218 { 193 {
219#ifdef BUILD_CONVERT_16_RGB_ROT0
220 if (rotation == 0) 194 if (rotation == 0)
221 { 195 {
222 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 196 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
224 else 198 else
225 return evas_common_convert_rgba_to_16bpp_rgb_565_dith; 199 return evas_common_convert_rgba_to_16bpp_rgb_565_dith;
226 } 200 }
227#endif
228#ifdef BUILD_CONVERT_16_RGB_ROT180
229 if (rotation == 180) 201 if (rotation == 180)
230 { 202 {
231 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 203 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
233 else 205 else
234 return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_180; 206 return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_180;
235 } 207 }
236#endif
237#ifdef BUILD_CONVERT_16_RGB_ROT270
238 if (rotation == 270) 208 if (rotation == 270)
239 { 209 {
240 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 210 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
242 else 212 else
243 return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270; 213 return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270;
244 } 214 }
245#endif
246#ifdef BUILD_CONVERT_16_RGB_ROT90
247 if (rotation == 90) 215 if (rotation == 90)
248 { 216 {
249 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 217 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
251 else 219 else
252 return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90; 220 return evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90;
253 } 221 }
254#endif
255 } 222 }
256#endif
257#ifdef BUILD_CONVERT_16_BGR_565
258 if ((rmask == 0x0000001f) && (gmask == 0x000007e0) && (bmask == 0x0000f800)) 223 if ((rmask == 0x0000001f) && (gmask == 0x000007e0) && (bmask == 0x0000f800))
259 { 224 {
260#ifdef BUILD_CONVERT_16_RGB_ROT0
261 if (rotation == 0) 225 if (rotation == 0)
262 { 226 {
263 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 227 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
265 else 229 else
266 return evas_common_convert_rgba_to_16bpp_bgr_565_dith; 230 return evas_common_convert_rgba_to_16bpp_bgr_565_dith;
267 } 231 }
268#endif
269#ifdef BUILD_CONVERT_16_RGB_ROT180
270 if (rotation == 180) 232 if (rotation == 180)
271 { 233 {
272 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 234 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
274 else 236 else
275 return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180; 237 return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180;
276 } 238 }
277#endif
278#ifdef BUILD_CONVERT_16_RGB_ROT270
279 if (rotation == 270) 239 if (rotation == 270)
280 { 240 {
281 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 241 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
283 else 243 else
284 return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_270; 244 return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_270;
285 } 245 }
286#endif
287#ifdef BUILD_CONVERT_16_RGB_ROT90
288 if (rotation == 90) 246 if (rotation == 90)
289 { 247 {
290 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 248 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
292 else 250 else
293 return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_90; 251 return evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_90;
294 } 252 }
295#endif
296 } 253 }
297#endif
298#ifdef BUILD_CONVERT_16_RGB_555
299 if ((rmask == 0x00007c00) && (gmask == 0x000003e0) && (bmask == 0x0000001f)) 254 if ((rmask == 0x00007c00) && (gmask == 0x000003e0) && (bmask == 0x0000001f))
300 { 255 {
301#ifdef BUILD_CONVERT_16_RGB_ROT0
302 if (rotation == 0) 256 if (rotation == 0)
303 { 257 {
304 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 258 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
306 else 260 else
307 return evas_common_convert_rgba_to_16bpp_rgb_555_dith; 261 return evas_common_convert_rgba_to_16bpp_rgb_555_dith;
308 } 262 }
309#endif
310#ifdef BUILD_CONVERT_16_RGB_ROT180
311 if (rotation == 180) 263 if (rotation == 180)
312 { 264 {
313 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 265 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
315 else 267 else
316 return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_180; 268 return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_180;
317 } 269 }
318#endif
319#ifdef BUILD_CONVERT_16_RGB_ROT270
320 if (rotation == 270) 270 if (rotation == 270)
321 { 271 {
322 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 272 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
324 else 274 else
325 return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270; 275 return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270;
326 } 276 }
327#endif
328#ifdef BUILD_CONVERT_16_RGB_ROT90
329 if (rotation == 90) 277 if (rotation == 90)
330 { 278 {
331 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 279 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
333 else 281 else
334 return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90; 282 return evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90;
335 } 283 }
336#endif
337 } 284 }
338#endif
339#ifdef BUILD_CONVERT_16_RGB_444
340 if ((rmask == 0x00000f00) && (gmask == 0x000000f0) && (bmask == 0x0000000f)) 285 if ((rmask == 0x00000f00) && (gmask == 0x000000f0) && (bmask == 0x0000000f))
341 { 286 {
342#ifdef BUILD_CONVERT_16_RGB_ROT0
343 if (rotation == 0) 287 if (rotation == 0)
344 { 288 {
345 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 289 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
347 else 291 else
348 return evas_common_convert_rgba_to_16bpp_rgb_444_dith; 292 return evas_common_convert_rgba_to_16bpp_rgb_444_dith;
349 } 293 }
350#endif
351#ifdef BUILD_CONVERT_16_RGB_ROT180
352 if (rotation == 180) 294 if (rotation == 180)
353 { 295 {
354 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 296 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
356 else 298 else
357 return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_180; 299 return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_180;
358 } 300 }
359#endif
360#ifdef BUILD_CONVERT_16_RGB_ROT270
361 if (rotation == 270) 301 if (rotation == 270)
362 { 302 {
363 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 303 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
365 else 305 else
366 return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270; 306 return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270;
367 } 307 }
368#endif
369#ifdef BUILD_CONVERT_16_RGB_ROT90
370 if (rotation == 90) 308 if (rotation == 90)
371 { 309 {
372 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 310 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
374 else 312 else
375 return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90; 313 return evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90;
376 } 314 }
377#endif
378 } 315 }
379#endif
380#ifdef BUILD_CONVERT_16_RGB_454645
381 if ((rmask == 0x0000f000) && (gmask == 0x00000780) && (bmask == 0x0000001e)) 316 if ((rmask == 0x0000f000) && (gmask == 0x00000780) && (bmask == 0x0000001e))
382 { 317 {
383#ifdef BUILD_CONVERT_16_RGB_ROT0
384 if (rotation == 0) 318 if (rotation == 0)
385 { 319 {
386 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 320 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
389 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith; 323 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith;
390 324
391 } 325 }
392#endif
393#ifdef BUILD_CONVERT_16_RGB_ROT180
394 if (rotation == 180) 326 if (rotation == 180)
395 { 327 {
396 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 328 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
398 else 330 else
399 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180; 331 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180;
400 } 332 }
401#endif
402#ifdef BUILD_CONVERT_16_RGB_ROT270
403 if (rotation == 270) 333 if (rotation == 270)
404 { 334 {
405 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 335 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
407 else 337 else
408 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270; 338 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270;
409 } 339 }
410#endif
411#ifdef BUILD_CONVERT_16_RGB_ROT90
412 if (rotation == 270) 340 if (rotation == 270)
413 { 341 {
414 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 342 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
416 else 344 else
417 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90; 345 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90;
418 } 346 }
419#endif
420 } 347 }
421#endif
422#ifdef BUILD_CONVERT_16_RGB_454645
423 if ((rmask == 0x0000f800) && (gmask == 0x000007e0) && (bmask == 0x0000001f)) 348 if ((rmask == 0x0000f800) && (gmask == 0x000007e0) && (bmask == 0x0000001f))
424 { 349 {
425#ifdef BUILD_CONVERT_16_RGB_ROT0
426 if (rotation == 0) 350 if (rotation == 0)
427 { 351 {
428 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 352 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
431 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith; 355 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith;
432 356
433 } 357 }
434#endif
435#ifdef BUILD_CONVERT_16_RGB_ROT180
436 if (rotation == 180) 358 if (rotation == 180)
437 { 359 {
438 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 360 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
440 else 362 else
441 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180; 363 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180;
442 } 364 }
443#endif
444#ifdef BUILD_CONVERT_16_RGB_ROT270
445 if (rotation == 270) 365 if (rotation == 270)
446 { 366 {
447 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 367 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
449 else 369 else
450 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270; 370 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270;
451 } 371 }
452#endif
453#ifdef BUILD_CONVERT_16_RGB_ROT90
454 if (rotation == 90) 372 if (rotation == 90)
455 { 373 {
456 if ((!(w & 0x1)) && (!((intptr_t)dest & 0x3))) 374 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
458 else 376 else
459 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90; 377 return evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90;
460 } 378 }
461#endif
462 } 379 }
463#endif
464 } 380 }
465 if (depth == 32) 381 if (depth == 32)
466 { 382 {
467#ifdef BUILD_CONVERT_32_RGB_8888
468 if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask == 0x000000ff)) 383 if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask == 0x000000ff))
469 { 384 {
470#ifdef BUILD_CONVERT_32_RGB_ROT0
471 if (rotation == 0) 385 if (rotation == 0)
472 return evas_common_convert_rgba_to_32bpp_rgb_8888; 386 return evas_common_convert_rgba_to_32bpp_rgb_8888;
473#endif
474#ifdef BUILD_CONVERT_32_RGB_ROT180
475 if (rotation == 180) 387 if (rotation == 180)
476 return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180; 388 return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180;
477#endif
478#ifdef BUILD_CONVERT_32_RGB_ROT270
479 if (rotation == 270) 389 if (rotation == 270)
480 return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270; 390 return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270;
481#endif
482#ifdef BUILD_CONVERT_32_RGB_ROT90
483 if (rotation == 90) 391 if (rotation == 90)
484 return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90; 392 return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90;
485#endif
486 } 393 }
487#endif
488#ifdef BUILD_CONVERT_32_RGBX_8888
489 if ((rmask == 0xff000000) && (gmask == 0x00ff0000) && (bmask == 0x0000ff00)) 394 if ((rmask == 0xff000000) && (gmask == 0x00ff0000) && (bmask == 0x0000ff00))
490 { 395 {
491#ifdef BUILD_CONVERT_32_RGB_ROT0
492 if (rotation == 0) 396 if (rotation == 0)
493 return evas_common_convert_rgba_to_32bpp_rgbx_8888; 397 return evas_common_convert_rgba_to_32bpp_rgbx_8888;
494#endif
495#ifdef BUILD_CONVERT_32_RGB_ROT180
496 if (rotation == 180) 398 if (rotation == 180)
497 return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180; 399 return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180;
498#endif
499#ifdef BUILD_CONVERT_32_RGB_ROT270
500 if (rotation == 270) 400 if (rotation == 270)
501 return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270; 401 return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270;
502#endif
503#ifdef BUILD_CONVERT_32_RGB_ROT90
504 if (rotation == 90) 402 if (rotation == 90)
505 return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90; 403 return evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90;
506#endif
507 } 404 }
508#endif
509#ifdef BUILD_CONVERT_32_BGR_8888
510 if ((rmask == 0x000000ff) && (gmask == 0x0000ff00) && (bmask == 0x00ff0000)) 405 if ((rmask == 0x000000ff) && (gmask == 0x0000ff00) && (bmask == 0x00ff0000))
511 { 406 {
512#ifdef BUILD_CONVERT_32_RGB_ROT0
513 if (rotation == 0) 407 if (rotation == 0)
514 return evas_common_convert_rgba_to_32bpp_bgr_8888; 408 return evas_common_convert_rgba_to_32bpp_bgr_8888;
515#endif
516#ifdef BUILD_CONVERT_32_RGB_ROT180
517 if (rotation == 180) 409 if (rotation == 180)
518 return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180; 410 return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180;
519#endif
520#ifdef BUILD_CONVERT_32_RGB_ROT270
521 if (rotation == 270) 411 if (rotation == 270)
522 return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270; 412 return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270;
523#endif
524#ifdef BUILD_CONVERT_32_RGB_ROT90
525 if (rotation == 90) 413 if (rotation == 90)
526 return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90; 414 return evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90;
527#endif
528 } 415 }
529#endif
530#ifdef BUILD_CONVERT_32_BGRX_8888
531 if ((rmask == 0x0000ff00) && (gmask == 0x00ff0000) && (bmask == 0xff000000)) 416 if ((rmask == 0x0000ff00) && (gmask == 0x00ff0000) && (bmask == 0xff000000))
532 { 417 {
533#ifdef BUILD_CONVERT_32_RGB_ROT0
534 if (rotation == 0) 418 if (rotation == 0)
535 return evas_common_convert_rgba_to_32bpp_bgrx_8888; 419 return evas_common_convert_rgba_to_32bpp_bgrx_8888;
536#endif
537#ifdef BUILD_CONVERT_32_RGB_ROT180
538 if (rotation == 180) 420 if (rotation == 180)
539 return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180; 421 return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180;
540#endif
541#ifdef BUILD_CONVERT_32_RGB_ROT270
542 if (rotation == 270) 422 if (rotation == 270)
543 return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270; 423 return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270;
544#endif
545#ifdef BUILD_CONVERT_32_RGB_ROT90
546 if (rotation == 90) 424 if (rotation == 90)
547 return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90; 425 return evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90;
548#endif
549 } 426 }
550#endif
551#ifdef BUILD_CONVERT_32_RGB_666
552 if ((rmask == 0x0003f000) && (gmask == 0x00000fc0) && (bmask == 0x0000003f)) 427 if ((rmask == 0x0003f000) && (gmask == 0x00000fc0) && (bmask == 0x0000003f))
553 { 428 {
554#ifdef BUILD_CONVERT_32_RGB_ROT0
555 if (rotation == 0) 429 if (rotation == 0)
556 return evas_common_convert_rgba_to_32bpp_rgb_666; 430 return evas_common_convert_rgba_to_32bpp_rgb_666;
557#endif
558#ifdef BUILD_CONVERT_32_RGB_ROT180
559// if (rotation == 180) 431// if (rotation == 180)
560// return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180; 432// return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180;
561#endif
562#ifdef BUILD_CONVERT_32_RGB_ROT270
563// if (rotation == 270) 433// if (rotation == 270)
564// return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270; 434// return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270;
565#endif
566#ifdef BUILD_CONVERT_32_RGB_ROT90
567// if (rotation == 90) 435// if (rotation == 90)
568// return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90; 436// return evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90;
569#endif
570 } 437 }
571#endif
572 } 438 }
573 if (depth == 24) 439 if (depth == 24)
574 { 440 {
575#ifdef BUILD_CONVERT_24_RGB_888
576 if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask == 0x000000ff)) 441 if ((rmask == 0x00ff0000) && (gmask == 0x0000ff00) && (bmask == 0x000000ff))
577 { 442 {
578 if (rotation == 0) 443 if (rotation == 0)
579 return evas_common_convert_rgba_to_24bpp_rgb_888; 444 return evas_common_convert_rgba_to_24bpp_rgb_888;
580 } 445 }
581#endif
582#ifdef BUILD_CONVERT_24_RGB_666
583 if ((rmask == 0x0003f000) && (gmask == 0x00000fc0) && (bmask == 0x0000003f)) 446 if ((rmask == 0x0003f000) && (gmask == 0x00000fc0) && (bmask == 0x0000003f))
584 { 447 {
585 if (rotation == 0) 448 if (rotation == 0)
586 return evas_common_convert_rgba_to_24bpp_rgb_666; 449 return evas_common_convert_rgba_to_24bpp_rgb_666;
587 } 450 }
588#endif
589#ifdef BUILD_CONVERT_24_BGR_888
590 if ((rmask == 0x000000ff) && (gmask == 0x0000ff00) && (bmask == 0x00ff0000)) 451 if ((rmask == 0x000000ff) && (gmask == 0x0000ff00) && (bmask == 0x00ff0000))
591 { 452 {
592 if (rotation == 0) 453 if (rotation == 0)
593 return evas_common_convert_rgba_to_24bpp_bgr_888; 454 return evas_common_convert_rgba_to_24bpp_bgr_888;
594 } 455 }
595#endif
596 } 456 }
597 INF("depth = %i mode = %i", depth, pal_mode); 457 INF("depth = %i mode = %i", depth, pal_mode);
598 if (depth == 8) 458 if (depth == 8)
599 { 459 {
600#ifdef BUILD_CONVERT_8_RGB_332
601 if (pal_mode == PAL_MODE_RGB332) 460 if (pal_mode == PAL_MODE_RGB332)
602 return evas_common_convert_rgba_to_8bpp_rgb_332_dith; 461 return evas_common_convert_rgba_to_8bpp_rgb_332_dith;
603#endif
604#ifdef BUILD_CONVERT_8_RGB_666
605 if (pal_mode == PAL_MODE_RGB666) 462 if (pal_mode == PAL_MODE_RGB666)
606 return evas_common_convert_rgba_to_8bpp_rgb_666_dith; 463 return evas_common_convert_rgba_to_8bpp_rgb_666_dith;
607#endif
608#ifdef BUILD_CONVERT_8_RGB_232
609 if (pal_mode == PAL_MODE_RGB232) 464 if (pal_mode == PAL_MODE_RGB232)
610 return evas_common_convert_rgba_to_8bpp_rgb_232_dith; 465 return evas_common_convert_rgba_to_8bpp_rgb_232_dith;
611#endif
612#ifdef BUILD_CONVERT_8_RGB_222
613 if (pal_mode == PAL_MODE_RGB222) 466 if (pal_mode == PAL_MODE_RGB222)
614 return evas_common_convert_rgba_to_8bpp_rgb_222_dith; 467 return evas_common_convert_rgba_to_8bpp_rgb_222_dith;
615#endif
616#ifdef BUILD_CONVERT_8_RGB_221
617 if (pal_mode == PAL_MODE_RGB221) 468 if (pal_mode == PAL_MODE_RGB221)
618 return evas_common_convert_rgba_to_8bpp_rgb_221_dith; 469 return evas_common_convert_rgba_to_8bpp_rgb_221_dith;
619#endif
620#ifdef BUILD_CONVERT_8_RGB_121
621 if (pal_mode == PAL_MODE_RGB121) 470 if (pal_mode == PAL_MODE_RGB121)
622 return evas_common_convert_rgba_to_8bpp_rgb_121_dith; 471 return evas_common_convert_rgba_to_8bpp_rgb_121_dith;
623#endif
624#ifdef BUILD_CONVERT_8_RGB_111
625 if (pal_mode == PAL_MODE_RGB111) 472 if (pal_mode == PAL_MODE_RGB111)
626 return evas_common_convert_rgba_to_8bpp_rgb_111_dith; 473 return evas_common_convert_rgba_to_8bpp_rgb_111_dith;
627#endif
628 } 474 }
629 } 475 }
630 /* no optimised converter for this... no generic one either. NULL */ 476 /* 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];
10#endif 10#endif
11#endif 11#endif
12 12
13#ifdef BUILD_CONVERT_16_RGB_565
14#ifdef BUILD_CONVERT_16_RGB_ROT0
15void 13void
16evas_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) 14evas_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)
17{ 15{
@@ -147,11 +145,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int sr
147 (void)pal; 145 (void)pal;
148#endif 146#endif
149} 147}
150#endif
151#endif
152 148
153#ifdef BUILD_CONVERT_16_RGB_565
154#ifdef BUILD_CONVERT_16_RGB_ROT0
155void 149void
156evas_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) 150evas_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)
157{ 151{
@@ -236,11 +230,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith (DATA32 *src, DATA8 *dst, int src
236 (void)pal; 230 (void)pal;
237#endif 231#endif
238} 232}
239#endif
240#endif
241 233
242#ifdef BUILD_CONVERT_16_RGB_565
243#ifdef BUILD_CONVERT_16_RGB_ROT180
244void 234void
245evas_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) 235evas_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)
246{ 236{
@@ -297,11 +287,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_180 (DATA32 *src, DATA8 *dst
297 return; 287 return;
298 (void)pal; 288 (void)pal;
299} 289}
300#endif
301#endif
302 290
303#ifdef BUILD_CONVERT_16_RGB_565
304#ifdef BUILD_CONVERT_16_RGB_ROT180
305void 291void
306evas_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) 292evas_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)
307{ 293{
@@ -335,11 +321,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_180 (DATA32 *src, DATA8 *dst,
335 return; 321 return;
336 (void)pal; 322 (void)pal;
337} 323}
338#endif
339#endif
340 324
341#ifdef BUILD_CONVERT_16_RGB_565
342#ifdef BUILD_CONVERT_16_RGB_ROT270
343void 325void
344evas_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) 326evas_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)
345{ 327{
@@ -396,11 +378,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst
396 return; 378 return;
397 (void)pal; 379 (void)pal;
398} 380}
399#endif
400#endif
401 381
402#ifdef BUILD_CONVERT_16_RGB_565
403#ifdef BUILD_CONVERT_16_RGB_ROT270
404void 382void
405evas_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) 383evas_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)
406{ 384{
@@ -434,11 +412,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_270 (DATA32 *src, DATA8 *dst,
434 return; 412 return;
435 (void)pal; 413 (void)pal;
436} 414}
437#endif
438#endif
439 415
440#ifdef BUILD_CONVERT_16_RGB_565
441#ifdef BUILD_CONVERT_16_RGB_ROT90
442void 416void
443evas_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) 417evas_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)
444{ 418{
@@ -495,11 +469,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst,
495 return; 469 return;
496 (void)pal; 470 (void)pal;
497} 471}
498#endif
499#endif
500 472
501#ifdef BUILD_CONVERT_16_RGB_565
502#ifdef BUILD_CONVERT_16_RGB_ROT90
503void 473void
504evas_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) 474evas_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)
505{ 475{
@@ -533,11 +503,7 @@ evas_common_convert_rgba_to_16bpp_rgb_565_dith_rot_90 (DATA32 *src, DATA8 *dst,
533 return; 503 return;
534 (void)pal; 504 (void)pal;
535} 505}
536#endif
537#endif
538 506
539#ifdef BUILD_CONVERT_16_BGR_565
540#ifdef BUILD_CONVERT_16_RGB_ROT0
541void 507void
542evas_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) 508evas_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)
543{ 509{
@@ -594,11 +560,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith (DATA32 *src, DATA8 *dst, int sr
594 return; 560 return;
595 (void)pal; 561 (void)pal;
596} 562}
597#endif
598#endif
599 563
600#ifdef BUILD_CONVERT_16_BGR_565
601#ifdef BUILD_CONVERT_16_RGB_ROT0
602void 564void
603evas_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) 565evas_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)
604{ 566{
@@ -632,11 +594,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith (DATA32 *src, DATA8 *dst, int src
632 return; 594 return;
633 (void)pal; 595 (void)pal;
634} 596}
635#endif
636#endif
637 597
638#ifdef BUILD_CONVERT_16_BGR_565
639#ifdef BUILD_CONVERT_16_RGB_ROT180
640void 598void
641evas_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) 599evas_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)
642{ 600{
@@ -693,11 +651,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst
693 return; 651 return;
694 (void)pal; 652 (void)pal;
695} 653}
696#endif
697#endif
698 654
699#ifdef BUILD_CONVERT_16_BGR_565
700#ifdef BUILD_CONVERT_16_RGB_ROT180
701void 655void
702evas_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) 656evas_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)
703{ 657{
@@ -733,11 +687,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst,
733 return; 687 return;
734 (void)pal; 688 (void)pal;
735} 689}
736#endif
737#endif
738 690
739#ifdef BUILD_CONVERT_16_BGR_565
740#ifdef BUILD_CONVERT_16_RGB_ROT270
741void 691void
742evas_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) 692evas_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)
743{ 693{
@@ -794,11 +744,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_270 (DATA32 *src, DATA8 *dst
794 return; 744 return;
795 (void)pal; 745 (void)pal;
796} 746}
797#endif
798#endif
799 747
800#ifdef BUILD_CONVERT_16_BGR_565
801#ifdef BUILD_CONVERT_16_RGB_ROT270
802void 748void
803evas_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) 749evas_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)
804{ 750{
@@ -832,11 +778,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_270 (DATA32 *src, DATA8 *dst,
832 return; 778 return;
833 (void)pal; 779 (void)pal;
834} 780}
835#endif
836#endif
837 781
838#ifdef BUILD_CONVERT_16_BGR_565
839#ifdef BUILD_CONVERT_16_RGB_ROT90
840void 782void
841evas_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) 783evas_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)
842{ 784{
@@ -893,11 +835,7 @@ evas_common_convert_rgba2_to_16bpp_bgr_565_dith_rot_90 (DATA32 *src, DATA8 *dst,
893 return; 835 return;
894 (void)pal; 836 (void)pal;
895} 837}
896#endif
897#endif
898 838
899#ifdef BUILD_CONVERT_16_BGR_565
900#ifdef BUILD_CONVERT_16_RGB_ROT90
901void 839void
902evas_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) 840evas_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)
903{ 841{
@@ -931,11 +869,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_90 (DATA32 *src, DATA8 *dst,
931 return; 869 return;
932 (void)pal; 870 (void)pal;
933} 871}
934#endif
935#endif
936 872
937#ifdef BUILD_CONVERT_16_RGB_444
938#ifdef BUILD_CONVERT_16_RGB_ROT0
939void 873void
940evas_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) 874evas_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)
941{ 875{
@@ -990,11 +924,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int sr
990 return; 924 return;
991 (void)pal; 925 (void)pal;
992} 926}
993#endif
994#endif
995 927
996#ifdef BUILD_CONVERT_16_RGB_444
997#ifdef BUILD_CONVERT_16_RGB_ROT0
998void 928void
999evas_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) 929evas_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)
1000{ 930{
@@ -1027,11 +957,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith (DATA32 *src, DATA8 *dst, int src
1027 return; 957 return;
1028 (void)pal; 958 (void)pal;
1029} 959}
1030#endif
1031#endif
1032 960
1033#ifdef BUILD_CONVERT_16_RGB_444
1034#ifdef BUILD_CONVERT_16_RGB_ROT180
1035void 961void
1036evas_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) 962evas_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)
1037{ 963{
@@ -1086,11 +1012,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_180 (DATA32 *src, DATA8 *dst
1086 return; 1012 return;
1087 (void)pal; 1013 (void)pal;
1088} 1014}
1089#endif
1090#endif
1091 1015
1092#ifdef BUILD_CONVERT_16_RGB_444
1093#ifdef BUILD_CONVERT_16_RGB_ROT180
1094void 1016void
1095evas_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) 1017evas_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)
1096{ 1018{
@@ -1123,11 +1045,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_180 (DATA32 *src, DATA8 *dst,
1123 return; 1045 return;
1124 (void)pal; 1046 (void)pal;
1125} 1047}
1126#endif
1127#endif
1128 1048
1129#ifdef BUILD_CONVERT_16_RGB_444
1130#ifdef BUILD_CONVERT_16_RGB_ROT270
1131void 1049void
1132evas_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) 1050evas_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)
1133{ 1051{
@@ -1182,11 +1100,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst
1182 return; 1100 return;
1183 (void)pal; 1101 (void)pal;
1184} 1102}
1185#endif
1186#endif
1187 1103
1188#ifdef BUILD_CONVERT_16_RGB_444
1189#ifdef BUILD_CONVERT_16_RGB_ROT270
1190void 1104void
1191evas_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) 1105evas_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)
1192{ 1106{
@@ -1219,11 +1133,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_270 (DATA32 *src, DATA8 *dst,
1219 return; 1133 return;
1220 (void)pal; 1134 (void)pal;
1221} 1135}
1222#endif
1223#endif
1224 1136
1225#ifdef BUILD_CONVERT_16_RGB_444
1226#ifdef BUILD_CONVERT_16_RGB_ROT90
1227void 1137void
1228evas_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) 1138evas_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)
1229{ 1139{
@@ -1278,11 +1188,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst,
1278 return; 1188 return;
1279 (void)pal; 1189 (void)pal;
1280} 1190}
1281#endif
1282#endif
1283 1191
1284#ifdef BUILD_CONVERT_16_RGB_444
1285#ifdef BUILD_CONVERT_16_RGB_ROT90
1286void 1192void
1287evas_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) 1193evas_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)
1288{ 1194{
@@ -1315,11 +1221,7 @@ evas_common_convert_rgba_to_16bpp_rgb_444_dith_rot_90 (DATA32 *src, DATA8 *dst,
1315 return; 1221 return;
1316 (void)pal; 1222 (void)pal;
1317} 1223}
1318#endif
1319#endif
1320 1224
1321#ifdef BUILD_CONVERT_16_RGB_454645
1322#ifdef BUILD_CONVERT_16_RGB_ROT0
1323void 1225void
1324evas_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) 1226evas_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)
1325{ 1227{
@@ -1374,11 +1276,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int
1374 return; 1276 return;
1375 (void)pal; 1277 (void)pal;
1376} 1278}
1377#endif
1378#endif
1379 1279
1380#ifdef BUILD_CONVERT_16_RGB_454645
1381#ifdef BUILD_CONVERT_16_RGB_ROT0
1382void 1280void
1383evas_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) 1281evas_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)
1384{ 1282{
@@ -1411,11 +1309,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith (DATA32 *src, DATA8 *dst, int
1411 return; 1309 return;
1412 (void)pal; 1310 (void)pal;
1413} 1311}
1414#endif
1415#endif
1416 1312
1417#ifdef BUILD_CONVERT_16_RGB_454645
1418#ifdef BUILD_CONVERT_16_RGB_ROT180
1419void 1313void
1420evas_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) 1314evas_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)
1421{ 1315{
@@ -1470,11 +1364,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_180 (DATA32 *src, DATA8 *
1470 return; 1364 return;
1471 (void)pal; 1365 (void)pal;
1472} 1366}
1473#endif
1474#endif
1475 1367
1476#ifdef BUILD_CONVERT_16_RGB_454645
1477#ifdef BUILD_CONVERT_16_RGB_ROT180
1478void 1368void
1479evas_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) 1369evas_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)
1480{ 1370{
@@ -1507,12 +1397,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_180 (DATA32 *src, DATA8 *d
1507 return; 1397 return;
1508 (void)pal; 1398 (void)pal;
1509} 1399}
1510#endif
1511#endif
1512
1513 1400
1514#ifdef BUILD_CONVERT_16_RGB_454645
1515#ifdef BUILD_CONVERT_16_RGB_ROT270
1516void 1401void
1517evas_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) 1402evas_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)
1518{ 1403{
@@ -1567,11 +1452,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *
1567 return; 1452 return;
1568 (void)pal; 1453 (void)pal;
1569} 1454}
1570#endif
1571#endif
1572 1455
1573#ifdef BUILD_CONVERT_16_RGB_454645
1574#ifdef BUILD_CONVERT_16_RGB_ROT270
1575void 1456void
1576evas_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) 1457evas_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)
1577{ 1458{
@@ -1604,11 +1485,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_270 (DATA32 *src, DATA8 *d
1604 return; 1485 return;
1605 (void)pal; 1486 (void)pal;
1606} 1487}
1607#endif
1608#endif
1609 1488
1610#ifdef BUILD_CONVERT_16_RGB_454645
1611#ifdef BUILD_CONVERT_16_RGB_ROT90
1612void 1489void
1613evas_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) 1490evas_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)
1614{ 1491{
@@ -1663,11 +1540,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *d
1663 return; 1540 return;
1664 (void)pal; 1541 (void)pal;
1665} 1542}
1666#endif
1667#endif
1668 1543
1669#ifdef BUILD_CONVERT_16_RGB_454645
1670#ifdef BUILD_CONVERT_16_RGB_ROT90
1671void 1544void
1672evas_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) 1545evas_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)
1673{ 1546{
@@ -1700,11 +1573,7 @@ evas_common_convert_rgba_to_16bpp_rgb_454645_dith_rot_90 (DATA32 *src, DATA8 *ds
1700 return; 1573 return;
1701 (void)pal; 1574 (void)pal;
1702} 1575}
1703#endif
1704#endif
1705 1576
1706#ifdef BUILD_CONVERT_16_RGB_555
1707#ifdef BUILD_CONVERT_16_RGB_ROT0
1708void 1577void
1709evas_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) 1578evas_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)
1710{ 1579{
@@ -1759,11 +1628,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int sr
1759 return; 1628 return;
1760 (void)pal; 1629 (void)pal;
1761} 1630}
1762#endif
1763#endif
1764 1631
1765#ifdef BUILD_CONVERT_16_RGB_555
1766#ifdef BUILD_CONVERT_16_RGB_ROT0
1767void 1632void
1768evas_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) 1633evas_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)
1769{ 1634{
@@ -1796,11 +1661,7 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith (DATA32 *src, DATA8 *dst, int src
1796 return; 1661 return;
1797 (void)pal; 1662 (void)pal;
1798} 1663}
1799#endif
1800#endif
1801 1664
1802#ifdef BUILD_CONVERT_16_RGB_555
1803#ifdef BUILD_CONVERT_16_RGB_ROT180
1804void 1665void
1805evas_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) 1666evas_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)
1806{ 1667{
@@ -1855,11 +1716,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_180 (DATA32 *src, DATA8 *dst
1855 return; 1716 return;
1856 (void)pal; 1717 (void)pal;
1857} 1718}
1858#endif
1859#endif
1860 1719
1861#ifdef BUILD_CONVERT_16_RGB_555
1862#ifdef BUILD_CONVERT_16_RGB_ROT180
1863void 1720void
1864evas_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) 1721evas_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)
1865{ 1722{
@@ -1892,11 +1749,7 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_180 (DATA32 *src, DATA8 *dst,
1892 return; 1749 return;
1893 (void)pal; 1750 (void)pal;
1894} 1751}
1895#endif
1896#endif
1897 1752
1898#ifdef BUILD_CONVERT_16_RGB_555
1899#ifdef BUILD_CONVERT_16_RGB_ROT270
1900void 1753void
1901evas_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) 1754evas_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)
1902{ 1755{
@@ -1951,11 +1804,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst
1951 return; 1804 return;
1952 (void)pal; 1805 (void)pal;
1953} 1806}
1954#endif
1955#endif
1956 1807
1957#ifdef BUILD_CONVERT_16_RGB_555
1958#ifdef BUILD_CONVERT_16_RGB_ROT270
1959void 1808void
1960evas_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) 1809evas_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)
1961{ 1810{
@@ -1988,11 +1837,7 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_270 (DATA32 *src, DATA8 *dst,
1988 return; 1837 return;
1989 (void)pal; 1838 (void)pal;
1990} 1839}
1991#endif
1992#endif
1993 1840
1994#ifdef BUILD_CONVERT_16_RGB_555
1995#ifdef BUILD_CONVERT_16_RGB_ROT90
1996void 1841void
1997evas_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) 1842evas_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)
1998{ 1843{
@@ -2047,11 +1892,7 @@ evas_common_convert_rgba2_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst,
2047 return; 1892 return;
2048 (void)pal; 1893 (void)pal;
2049} 1894}
2050#endif
2051#endif
2052 1895
2053#ifdef BUILD_CONVERT_16_RGB_555
2054#ifdef BUILD_CONVERT_16_RGB_ROT90
2055void 1896void
2056evas_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) 1897evas_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)
2057{ 1898{
@@ -2084,6 +1925,3 @@ evas_common_convert_rgba_to_16bpp_rgb_555_dith_rot_90 (DATA32 *src, DATA8 *dst,
2084 return; 1925 return;
2085 (void)pal; 1926 (void)pal;
2086} 1927}
2087#endif
2088#endif
2089
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 @@
1#include "evas_common.h" 1#include "evas_common.h"
2#include "evas_convert_rgb_24.h" 2#include "evas_convert_rgb_24.h"
3 3
4#ifdef BUILD_CONVERT_24_RGB_888
5void 4void
6evas_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__) 5evas_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__)
7{ 6{
@@ -27,8 +26,7 @@ evas_common_convert_rgba_to_24bpp_rgb_888(DATA32 *src, DATA8 *dst, int src_jump,
27 } 26 }
28 return; 27 return;
29} 28}
30#endif 29
31#ifdef BUILD_CONVERT_24_RGB_666
32void 30void
33evas_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__) 31evas_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__)
34{ 32{
@@ -59,8 +57,7 @@ evas_common_convert_rgba_to_24bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump,
59 } 57 }
60 return; 58 return;
61} 59}
62#endif 60
63#ifdef BUILD_CONVERT_24_BGR_888
64void 61void
65evas_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__) 62evas_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__)
66{ 63{
@@ -86,4 +83,3 @@ evas_common_convert_rgba_to_24bpp_bgr_888(DATA32 *src, DATA8 *dst, int src_jump,
86 } 83 }
87 return; 84 return;
88} 85}
89#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 @@
1#include "evas_common.h" 1#include "evas_common.h"
2#include "evas_convert_rgb_32.h" 2#include "evas_convert_rgb_32.h"
3 3
4#ifdef BUILD_CONVERT_32_RGB_8888
5#ifdef BUILD_CONVERT_32_RGB_ROT0
6void 4void
7evas_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__) 5evas_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__)
8{ 6{
@@ -24,11 +22,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888 (DATA32 *src, DATA8 *dst, int src_jum
24 } 22 }
25 return; 23 return;
26} 24}
27#endif
28#endif
29 25
30#ifdef BUILD_CONVERT_32_RGB_8888
31#ifdef BUILD_CONVERT_32_RGB_ROT180
32void 26void
33evas_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__) 27evas_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__)
34{ 28{
@@ -45,8 +39,6 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_180 (DATA32 *src, DATA8 *dst, int
45 CONVERT_LOOP_END_ROT_180(); 39 CONVERT_LOOP_END_ROT_180();
46 return; 40 return;
47} 41}
48#endif
49#endif
50 42
51#ifdef TILE_ROTATE 43#ifdef TILE_ROTATE
52#define FAST_SIMPLE_ROTATE(suffix, pix_type) \ 44#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
196FAST_SIMPLE_ROTATE(8888, DATA32) 188FAST_SIMPLE_ROTATE(8888, DATA32)
197#endif 189#endif
198 190
199
200#ifdef BUILD_CONVERT_32_RGB_8888
201#ifdef BUILD_CONVERT_32_RGB_ROT270
202void 191void
203evas_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__) 192evas_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__)
204{ 193{
@@ -219,11 +208,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_270 (DATA32 *src, DATA8 *dst, int
219#endif 208#endif
220 return; 209 return;
221} 210}
222#endif
223#endif
224 211
225#ifdef BUILD_CONVERT_32_RGB_8888
226#ifdef BUILD_CONVERT_32_RGB_ROT90
227void 212void
228evas_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__) 213evas_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__)
229{ 214{
@@ -341,11 +326,7 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int
341# endif 326# endif
342 return; 327 return;
343} 328}
344#endif
345#endif
346 329
347#ifdef BUILD_CONVERT_32_RGBX_8888
348#ifdef BUILD_CONVERT_32_RGB_ROT0
349void 330void
350evas_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__) 331evas_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__)
351{ 332{
@@ -363,11 +344,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888 (DATA32 *src, DATA8 *dst, int src_ju
363 CONVERT_LOOP_END_ROT_0(); 344 CONVERT_LOOP_END_ROT_0();
364 return; 345 return;
365} 346}
366#endif
367#endif
368 347
369#ifdef BUILD_CONVERT_32_RGBX_8888
370#ifdef BUILD_CONVERT_32_RGB_ROT180
371void 348void
372evas_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__) 349evas_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__)
373{ 350{
@@ -385,11 +362,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_180 (DATA32 *src, DATA8 *dst, in
385 CONVERT_LOOP_END_ROT_180(); 362 CONVERT_LOOP_END_ROT_180();
386 return; 363 return;
387} 364}
388#endif
389#endif
390 365
391#ifdef BUILD_CONVERT_32_RGBX_8888
392#ifdef BUILD_CONVERT_32_RGB_ROT270
393void 366void
394evas_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__) 367evas_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__)
395{ 368{
@@ -407,11 +380,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_270 (DATA32 *src, DATA8 *dst, in
407 CONVERT_LOOP_END_ROT_270(); 380 CONVERT_LOOP_END_ROT_270();
408 return; 381 return;
409} 382}
410#endif
411#endif
412 383
413#ifdef BUILD_CONVERT_32_RGBX_8888
414#ifdef BUILD_CONVERT_32_RGB_ROT90
415void 384void
416evas_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__) 385evas_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__)
417{ 386{
@@ -429,11 +398,7 @@ evas_common_convert_rgba_to_32bpp_rgbx_8888_rot_90 (DATA32 *src, DATA8 *dst, int
429 CONVERT_LOOP_END_ROT_90(); 398 CONVERT_LOOP_END_ROT_90();
430 return; 399 return;
431} 400}
432#endif
433#endif
434 401
435#ifdef BUILD_CONVERT_32_BGR_8888
436#ifdef BUILD_CONVERT_32_RGB_ROT0
437void 402void
438evas_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__) 403evas_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__)
439{ 404{
@@ -450,11 +415,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888 (DATA32 *src, DATA8 *dst, int src_jum
450 CONVERT_LOOP_END_ROT_0(); 415 CONVERT_LOOP_END_ROT_0();
451 return; 416 return;
452} 417}
453#endif
454#endif
455 418
456#ifdef BUILD_CONVERT_32_BGR_8888
457#ifdef BUILD_CONVERT_32_RGB_ROT180
458void 419void
459evas_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__) 420evas_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__)
460{ 421{
@@ -471,11 +432,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_180 (DATA32 *src, DATA8 *dst, int
471 CONVERT_LOOP_END_ROT_180(); 432 CONVERT_LOOP_END_ROT_180();
472 return; 433 return;
473} 434}
474#endif
475#endif
476 435
477#ifdef BUILD_CONVERT_32_BGR_8888
478#ifdef BUILD_CONVERT_32_RGB_ROT270
479void 436void
480evas_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__) 437evas_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__)
481{ 438{
@@ -492,11 +449,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_270 (DATA32 *src, DATA8 *dst, int
492 CONVERT_LOOP_END_ROT_270(); 449 CONVERT_LOOP_END_ROT_270();
493 return; 450 return;
494} 451}
495#endif
496#endif
497 452
498#ifdef BUILD_CONVERT_32_BGR_8888
499#ifdef BUILD_CONVERT_32_RGB_ROT90
500void 453void
501evas_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__) 454evas_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__)
502{ 455{
@@ -513,11 +466,7 @@ evas_common_convert_rgba_to_32bpp_bgr_8888_rot_90 (DATA32 *src, DATA8 *dst, int
513 CONVERT_LOOP_END_ROT_90(); 466 CONVERT_LOOP_END_ROT_90();
514 return; 467 return;
515} 468}
516#endif
517#endif
518 469
519#ifdef BUILD_CONVERT_32_BGRX_8888
520#ifdef BUILD_CONVERT_32_RGB_ROT0
521void 470void
522evas_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__) 471evas_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__)
523{ 472{
@@ -534,11 +483,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888 (DATA32 *src, DATA8 *dst, int src_ju
534 CONVERT_LOOP_END_ROT_0(); 483 CONVERT_LOOP_END_ROT_0();
535 return; 484 return;
536} 485}
537#endif
538#endif
539 486
540#ifdef BUILD_CONVERT_32_BGRX_8888
541#ifdef BUILD_CONVERT_32_RGB_ROT180
542void 487void
543evas_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__) 488evas_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__)
544{ 489{
@@ -555,11 +500,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_180 (DATA32 *src, DATA8 *dst, in
555 CONVERT_LOOP_END_ROT_180(); 500 CONVERT_LOOP_END_ROT_180();
556 return; 501 return;
557} 502}
558#endif
559#endif
560 503
561#ifdef BUILD_CONVERT_32_BGRX_8888
562#ifdef BUILD_CONVERT_32_RGB_ROT270
563void 504void
564evas_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__) 505evas_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__)
565{ 506{
@@ -576,11 +517,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_270 (DATA32 *src, DATA8 *dst, in
576 CONVERT_LOOP_END_ROT_270(); 517 CONVERT_LOOP_END_ROT_270();
577 return; 518 return;
578} 519}
579#endif
580#endif
581 520
582#ifdef BUILD_CONVERT_32_BGRX_8888
583#ifdef BUILD_CONVERT_32_RGB_ROT90
584void 521void
585evas_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__) 522evas_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__)
586{ 523{
@@ -597,11 +534,7 @@ evas_common_convert_rgba_to_32bpp_bgrx_8888_rot_90 (DATA32 *src, DATA8 *dst, int
597 CONVERT_LOOP_END_ROT_90(); 534 CONVERT_LOOP_END_ROT_90();
598 return; 535 return;
599} 536}
600#endif
601#endif
602 537
603#ifdef BUILD_CONVERT_32_RGB_666
604#ifdef BUILD_CONVERT_32_RGB_ROT0
605void 538void
606evas_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__) 539evas_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__)
607{ 540{
@@ -620,6 +553,3 @@ evas_common_convert_rgba_to_32bpp_rgb_666(DATA32 *src, DATA8 *dst, int src_jump,
620 CONVERT_LOOP_END_ROT_0(); 553 CONVERT_LOOP_END_ROT_0();
621 return; 554 return;
622} 555}
623#endif
624#endif
625
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];
8extern const DATA8 _evas_dither_128128[128][128]; 8extern const DATA8 _evas_dither_128128[128][128];
9#endif 9#endif
10 10
11#ifdef BUILD_CONVERT_8_RGB_332
12void 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) 11void 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)
13{ 12{
14 DATA32 *src_ptr; 13 DATA32 *src_ptr;
@@ -40,8 +39,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_332_dith (DATA32 *src, DATA8 *dst,
40 39
41 CONVERT_LOOP_END_ROT_0(); 40 CONVERT_LOOP_END_ROT_0();
42} 41}
43#endif 42
44#ifdef BUILD_CONVERT_8_RGB_666
45static DATA8 p_to_6[256]; 43static DATA8 p_to_6[256];
46static DATA8 p_to_6_err[256]; 44static DATA8 p_to_6_err[256];
47 45
@@ -80,8 +78,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_666_dith (DATA32 *src, DATA8 *dst,
80 78
81 CONVERT_LOOP_END_ROT_0(); 79 CONVERT_LOOP_END_ROT_0();
82} 80}
83#endif 81
84#ifdef BUILD_CONVERT_8_RGB_232
85void 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) 82void 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)
86{ 83{
87 DATA32 *src_ptr; 84 DATA32 *src_ptr;
@@ -113,8 +110,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_232_dith (DATA32 *src, DATA8 *dst,
113 110
114 CONVERT_LOOP_END_ROT_0(); 111 CONVERT_LOOP_END_ROT_0();
115} 112}
116#endif 113
117#ifdef BUILD_CONVERT_8_RGB_222
118void 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) 114void 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)
119{ 115{
120 DATA32 *src_ptr; 116 DATA32 *src_ptr;
@@ -145,8 +141,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_222_dith (DATA32 *src, DATA8 *dst,
145 141
146 CONVERT_LOOP_END_ROT_0(); 142 CONVERT_LOOP_END_ROT_0();
147} 143}
148#endif 144
149#ifdef BUILD_CONVERT_8_RGB_221
150void 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) 145void 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)
151{ 146{
152 DATA32 *src_ptr; 147 DATA32 *src_ptr;
@@ -178,8 +173,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_221_dith (DATA32 *src, DATA8 *dst,
178 173
179 CONVERT_LOOP_END_ROT_0(); 174 CONVERT_LOOP_END_ROT_0();
180} 175}
181#endif 176
182#ifdef BUILD_CONVERT_8_RGB_121
183void 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) 177void 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)
184{ 178{
185 DATA32 *src_ptr; 179 DATA32 *src_ptr;
@@ -212,8 +206,7 @@ void evas_common_convert_rgba_to_8bpp_rgb_121_dith (DATA32 *src, DATA8 *dst,
212 206
213 CONVERT_LOOP_END_ROT_0(); 207 CONVERT_LOOP_END_ROT_0();
214} 208}
215#endif 209
216#ifdef BUILD_CONVERT_8_RGB_111
217void 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) 210void 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)
218{ 211{
219 DATA32 *src_ptr; 212 DATA32 *src_ptr;
@@ -245,4 +238,3 @@ void evas_common_convert_rgba_to_8bpp_rgb_111_dith (DATA32 *src, DATA8 *dst,
245 238
246 CONVERT_LOOP_END_ROT_0(); 239 CONVERT_LOOP_END_ROT_0();
247} 240}
248#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)
245 245
246 if (!done) 246 if (!done)
247 { 247 {
248# ifdef HARD_CODED_P3
249 cpu_feature_mask |= CPU_FEATURE_MMX;
250 cpu_feature_mask |= CPU_FEATURE_SSE;
251#endif
252#ifdef HARD_CODED_P2
253 cpu_feature_mask |= CPU_FEATURE_MMX;
254#endif
255 if (cpu_feature_mask & CPU_FEATURE_MMX) do_mmx = 1; 248 if (cpu_feature_mask & CPU_FEATURE_MMX) do_mmx = 1;
256 if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1; 249 if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1;
257 if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1; 250 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 @@
1#ifndef EVAS_OPTIONS_H 1#ifndef EVAS_OPTIONS_H
2#define EVAS_OPTIONS_H 1 2#define EVAS_OPTIONS_H 1
3 3
4/* these may vary per OS */
5
6/* what to build *//* small dither table is MUCH faster on ipaq */
7/*#define BUILD_SMALL_DITHER_MASK*/
8
9/*#define HARD_CODED_P3*/
10/*#define HARD_CODED_P2*/
11
12/*#define BUILD_CONVERT_1_GRY_1*/
13/*#define BUILD_CONVERT_4_GRY_1*/
14/*#define BUILD_CONVERT_4_GRY_4*/
15/*#define BUILD_CONVERT_8_GRY_1*/
16/*#define BUILD_CONVERT_8_GRY_4*/
17/*#define BUILD_CONVERT_8_GRY_16*/
18/*#define BUILD_CONVERT_8_GRY_64*/
19/*#define BUILD_CONVERT_8_GRY_256*/
20/*#define BUILD_CONVERT_8_RGB_332*/
21/*#define BUILD_CONVERT_8_RGB_666*/
22/*#define BUILD_CONVERT_8_RGB_232*/
23/*#define BUILD_CONVERT_8_RGB_222*/
24/*#define BUILD_CONVERT_8_RGB_221*/
25/*#define BUILD_CONVERT_8_RGB_121*/
26/*#define BUILD_CONVERT_8_RGB_111*/
27/*#define BUILD_CONVERT_16_RGB_565*/
28/*#define BUILD_CONVERT_16_RGB_555*/
29/*#define BUILD_CONVERT_16_RGB_444*/
30/*#define BUILD_CONVERT_16_RGB_454645*/
31/*#define BUILD_CONVERT_16_RGB_ROT0*/
32/*#define BUILD_CONVERT_16_RGB_ROT270*/
33/*#define BUILD_CONVERT_24_RGB_888*/
34/*#define BUILD_CONVERT_24_BGR_888*/
35/*#define BUILD_CONVERT_32_RGB_8888*/
36/*#define BUILD_CONVERT_32_BGR_8888*/
37/*#define BUILD_CONVERT_32_RGB_ROT0*/
38/*#define BUILD_CONVERT_32_RGB_ROT270*/
39
40/*#define BUILD_MMX*/
41/*#define BUILD_SSE3*/
42
43/*#define BUILD_LOADER_PNG*/
44/*#define BUILD_LOADER_JPEG*/
45/*#define BUILD_LOADER_EET*/
46
47/*#define BUILD_FMEMOPEN*/
48
49#define DIRECT_SCALE 4#define DIRECT_SCALE
50 5
51#endif 6#endif