expedite-cxx: Merge Felipe's c3e798c
with local changes.
This commit is contained in:
parent
c3e798cfd0
commit
ef428b5c31
|
@ -1,103 +0,0 @@
|
|||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include "image_blend_border_capi.h"
|
||||
#include "image_blend_border_recolor_capi.h"
|
||||
#include "image_blend_fade_pow2_unscaled_capi.h"
|
||||
#include "image_blend_fade_unscaled_capi.h"
|
||||
#include "image_blend_many_smooth_same_scaled_capi.h"
|
||||
#include "image_blend_nearest_same_scaled_capi.h"
|
||||
#include "image_blend_nearest_scaled_capi.h"
|
||||
#include "image_blend_nearest_solid_same_scaled_capi.h"
|
||||
#include "image_blend_nearest_solid_scaled_capi.h"
|
||||
#include "image_blend_occlude1_capi.h"
|
||||
#include "image_blend_occlude1_few_capi.h"
|
||||
#include "image_blend_occlude1_many_capi.h"
|
||||
#include "image_blend_occlude1_very_many_capi.h"
|
||||
#include "image_blend_occlude2_capi.h"
|
||||
#include "image_blend_occlude2_few_capi.h"
|
||||
#include "image_blend_occlude2_many_capi.h"
|
||||
#include "image_blend_occlude2_very_many_capi.h"
|
||||
#include "image_blend_occlude3_capi.h"
|
||||
#include "image_blend_occlude3_few_capi.h"
|
||||
#include "image_blend_occlude3_many_capi.h"
|
||||
#include "image_blend_occlude3_very_many_capi.h"
|
||||
#include "image_blend_smooth_same_scaled_capi.h"
|
||||
#include "image_blend_smooth_scaled_capi.h"
|
||||
#include "image_blend_smooth_solid_same_scaled_capi.h"
|
||||
#include "image_blend_smooth_solid_scaled_capi.h"
|
||||
#include "image_blend_solid_border_capi.h"
|
||||
#include "image_blend_solid_fade_pow2_unscaled_capi.h"
|
||||
#include "image_blend_solid_fade_unscaled_capi.h"
|
||||
#include "image_blend_solid_middle_border_capi.h"
|
||||
#include "image_blend_solid_middle_unscaled_capi.h"
|
||||
#include "image_blend_solid_unscaled_capi.h"
|
||||
#include "image_blend_unscaled_capi.h"
|
||||
#include "image_crossfade_capi.h"
|
||||
#include "image_data_argb_alpha_capi.h"
|
||||
#include "image_data_argb_capi.h"
|
||||
#include "image_data_ycbcr601pl_capi.h"
|
||||
#include "image_data_ycbcr601pl_map_nearest_solid_rotate_capi.h"
|
||||
#include "image_data_ycbcr601pl_map_solid_rotate_capi.h"
|
||||
#include "image_data_ycbcr601pl_wide_stride_capi.h"
|
||||
#include "image_map_3d_1_capi.h"
|
||||
#include "image_map_3d_2_capi.h"
|
||||
#include "image_map_3d_3_capi.h"
|
||||
#include "image_map_3d_4_capi.h"
|
||||
#include "image_map_3d_5_capi.h"
|
||||
#include "image_map_3d_6_capi.h"
|
||||
#include "image_map_3d_flow_capi.h"
|
||||
#include "image_map_color_alpha_nearest_rotate_capi.h"
|
||||
#include "image_map_color_alpha_nearest_solid_rotate_capi.h"
|
||||
#include "image_map_color_alpha_rotate_capi.h"
|
||||
#include "image_map_color_alpha_solid_rotate_capi.h"
|
||||
#include "image_map_color_nearest_rotate_capi.h"
|
||||
#include "image_map_color_nearest_solid_rotate_capi.h"
|
||||
#include "image_map_color_rotate_capi.h"
|
||||
#include "image_map_color_solid_rotate_capi.h"
|
||||
#include "image_map_nearest_rotate_capi.h"
|
||||
#include "image_map_nearest_solid_rotate_capi.h"
|
||||
#include "image_map_rotate_capi.h"
|
||||
#include "image_map_solid_rotate_capi.h"
|
||||
#include "image_quality_scale_capi.h"
|
||||
#include "line_blend_capi.h"
|
||||
#include "proxy_image_capi.h"
|
||||
#include "proxy_image_offscreen_capi.h"
|
||||
#include "proxy_text_fixed_capi.h"
|
||||
#include "proxy_text_random_capi.h"
|
||||
#include "rect_blend_capi.h"
|
||||
#include "rect_blend_few_capi.h"
|
||||
#include "rect_blend_pow2_capi.h"
|
||||
#include "rect_blend_pow2_few_capi.h"
|
||||
#include "rect_solid_capi.h"
|
||||
#include "rect_solid_few_capi.h"
|
||||
#include "text_basic_capi.h"
|
||||
#include "text_change_capi.h"
|
||||
#include "text_styles_capi.h"
|
||||
#include "text_styles_different_strings_capi.h"
|
||||
#include "textblock_auto_align_capi.h"
|
||||
#include "textblock_basic_capi.h"
|
||||
#include "textblock_intl_capi.h"
|
||||
#include "textblock_text_append_capi.h"
|
||||
#include "widgets_file_icons_2_capi.h"
|
||||
#include "widgets_file_icons_2_grouped_capi.h"
|
||||
#include "widgets_file_icons_2_same_capi.h"
|
||||
#include "widgets_file_icons_2_same_grouped_capi.h"
|
||||
#include "widgets_file_icons_3_capi.h"
|
||||
#include "widgets_file_icons_4_capi.h"
|
||||
#include "widgets_file_icons_capi.h"
|
||||
#include "widgets_list_1_capi.h"
|
||||
#include "widgets_list_1_grouped_capi.h"
|
||||
#include "widgets_list_2_capi.h"
|
||||
#include "widgets_list_2_grouped_capi.h"
|
||||
#include "widgets_list_3_capi.h"
|
||||
#include "widgets_list_3_grouped_capi.h"
|
||||
#include "widgets_list_4_capi.h"
|
||||
#include "widgets_list_4_grouped_capi.h"
|
||||
#include "font_effect_blur_alpha_capi.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
|
@ -270,6 +270,9 @@ extern "C" {
|
|||
#include "proxy_image.c"
|
||||
#include "cxx/proxy_image_capi.h"
|
||||
|
||||
#include "proxy_image_offscreen.c"
|
||||
#include "cxx/proxy_image_offscreen_capi.h"
|
||||
|
||||
#include "proxy_text_fixed.c"
|
||||
#include "cxx/proxy_text_fixed_capi.h"
|
||||
|
||||
|
@ -318,8 +321,6 @@ extern "C" {
|
|||
#include "filter_object_blur_solid.c"
|
||||
#endif
|
||||
|
||||
/* #include "proxy_image_offscreen_capi.h" */
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue