summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-10-13 14:55:39 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-10-13 14:55:39 -0300
commitef428b5c319cf9bdce789c427fa463c815152c59 (patch)
tree89f5a02f919debfcf7e2ab8d80fbc165f57a8c88
parentc3e798cfd0b5227722db7c71ac114be16eb52f78 (diff)
expedite-cxx: Merge Felipe's c3e798c with local changes.
-rw-r--r--src/bin/cxx/tests.h103
-rw-r--r--src/bin/tests.h5
2 files changed, 3 insertions, 105 deletions
diff --git a/src/bin/cxx/tests.h b/src/bin/cxx/tests.h
deleted file mode 100644
index 9395abc..0000000
--- a/src/bin/cxx/tests.h
+++ /dev/null
@@ -1,103 +0,0 @@
1
2#ifdef __cplusplus
3extern "C" {
4#endif
5
6#include "image_blend_border_capi.h"
7#include "image_blend_border_recolor_capi.h"
8#include "image_blend_fade_pow2_unscaled_capi.h"
9#include "image_blend_fade_unscaled_capi.h"
10#include "image_blend_many_smooth_same_scaled_capi.h"
11#include "image_blend_nearest_same_scaled_capi.h"
12#include "image_blend_nearest_scaled_capi.h"
13#include "image_blend_nearest_solid_same_scaled_capi.h"
14#include "image_blend_nearest_solid_scaled_capi.h"
15#include "image_blend_occlude1_capi.h"
16#include "image_blend_occlude1_few_capi.h"
17#include "image_blend_occlude1_many_capi.h"
18#include "image_blend_occlude1_very_many_capi.h"
19#include "image_blend_occlude2_capi.h"
20#include "image_blend_occlude2_few_capi.h"
21#include "image_blend_occlude2_many_capi.h"
22#include "image_blend_occlude2_very_many_capi.h"
23#include "image_blend_occlude3_capi.h"
24#include "image_blend_occlude3_few_capi.h"
25#include "image_blend_occlude3_many_capi.h"
26#include "image_blend_occlude3_very_many_capi.h"
27#include "image_blend_smooth_same_scaled_capi.h"
28#include "image_blend_smooth_scaled_capi.h"
29#include "image_blend_smooth_solid_same_scaled_capi.h"
30#include "image_blend_smooth_solid_scaled_capi.h"
31#include "image_blend_solid_border_capi.h"
32#include "image_blend_solid_fade_pow2_unscaled_capi.h"
33#include "image_blend_solid_fade_unscaled_capi.h"
34#include "image_blend_solid_middle_border_capi.h"
35#include "image_blend_solid_middle_unscaled_capi.h"
36#include "image_blend_solid_unscaled_capi.h"
37#include "image_blend_unscaled_capi.h"
38#include "image_crossfade_capi.h"
39#include "image_data_argb_alpha_capi.h"
40#include "image_data_argb_capi.h"
41#include "image_data_ycbcr601pl_capi.h"
42#include "image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h"
43#include "image_data_ycbcr601pl_map_solid_rotate_capi.h"
44#include "image_data_ycbcr601pl_wide_stride_capi.h"
45#include "image_map_3d_1_capi.h"
46#include "image_map_3d_2_capi.h"
47#include "image_map_3d_3_capi.h"
48#include "image_map_3d_4_capi.h"
49#include "image_map_3d_5_capi.h"
50#include "image_map_3d_6_capi.h"
51#include "image_map_3d_flow_capi.h"
52#include "image_map_color_alpha_nearest_rotate_capi.h"
53#include "image_map_color_alpha_nearest_solid_rotate_capi.h"
54#include "image_map_color_alpha_rotate_capi.h"
55#include "image_map_color_alpha_solid_rotate_capi.h"
56#include "image_map_color_nearest_rotate_capi.h"
57#include "image_map_color_nearest_solid_rotate_capi.h"
58#include "image_map_color_rotate_capi.h"
59#include "image_map_color_solid_rotate_capi.h"
60#include "image_map_nearest_rotate_capi.h"
61#include "image_map_nearest_solid_rotate_capi.h"
62#include "image_map_rotate_capi.h"
63#include "image_map_solid_rotate_capi.h"
64#include "image_quality_scale_capi.h"
65#include "line_blend_capi.h"
66#include "proxy_image_capi.h"
67#include "proxy_image_offscreen_capi.h"
68#include "proxy_text_fixed_capi.h"
69#include "proxy_text_random_capi.h"
70#include "rect_blend_capi.h"
71#include "rect_blend_few_capi.h"
72#include "rect_blend_pow2_capi.h"
73#include "rect_blend_pow2_few_capi.h"
74#include "rect_solid_capi.h"
75#include "rect_solid_few_capi.h"
76#include "text_basic_capi.h"
77#include "text_change_capi.h"
78#include "text_styles_capi.h"
79#include "text_styles_different_strings_capi.h"
80#include "textblock_auto_align_capi.h"
81#include "textblock_basic_capi.h"
82#include "textblock_intl_capi.h"
83#include "textblock_text_append_capi.h"
84#include "widgets_file_icons_2_capi.h"
85#include "widgets_file_icons_2_grouped_capi.h"
86#include "widgets_file_icons_2_same_capi.h"
87#include "widgets_file_icons_2_same_grouped_capi.h"
88#include "widgets_file_icons_3_capi.h"
89#include "widgets_file_icons_4_capi.h"
90#include "widgets_file_icons_capi.h"
91#include "widgets_list_1_capi.h"
92#include "widgets_list_1_grouped_capi.h"
93#include "widgets_list_2_capi.h"
94#include "widgets_list_2_grouped_capi.h"
95#include "widgets_list_3_capi.h"
96#include "widgets_list_3_grouped_capi.h"
97#include "widgets_list_4_capi.h"
98#include "widgets_list_4_grouped_capi.h"
99#include "font_effect_blur_alpha_capi.h"
100
101#ifdef __cplusplus
102}
103#endif
diff --git a/src/bin/tests.h b/src/bin/tests.h
index 9aef2f4..0a54a13 100644
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -270,6 +270,9 @@ extern "C" {
270#include "proxy_image.c" 270#include "proxy_image.c"
271#include "cxx/proxy_image_capi.h" 271#include "cxx/proxy_image_capi.h"
272 272
273#include "proxy_image_offscreen.c"
274#include "cxx/proxy_image_offscreen_capi.h"
275
273#include "proxy_text_fixed.c" 276#include "proxy_text_fixed.c"
274#include "cxx/proxy_text_fixed_capi.h" 277#include "cxx/proxy_text_fixed_capi.h"
275 278
@@ -318,8 +321,6 @@ extern "C" {
318#include "filter_object_blur_solid.c" 321#include "filter_object_blur_solid.c"
319#endif 322#endif
320 323
321/* #include "proxy_image_offscreen_capi.h" */
322
323#ifdef __cplusplus 324#ifdef __cplusplus
324} 325}
325#endif 326#endif