e_view_image: make EINTERN

these apis does not used by e20 modules

Change-Id: I23a88eaa8efc4ad5de6b8289a5f97e23370733bb

diff --git a/src/bin/core/e_view_image.c b/src/bin/core/e_view_image.c
index b976fdf38ded88627654870ea267dd7a22b85722..7df446410a65d9f83740eaa7b7e82ad748445e91 100644 (file)
--- a/src/bin/core/e_view_image.c
+++ b/src/bin/core/e_view_image.c
@@ -1,3 +1,4 @@
+#include "e_intern.h"\r
 #include "e_view_image_intern.h"\r
 #include "e_view_intern.h"\r
 #include "e_canvas_intern.h"\r
@@ -396,43 +397,43 @@ e_view_image_alpha_set(E_View_Image *image, bool alpha)
    evas_object_image_alpha_set(image->view.eo, alpha);\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_alpha_get(E_View_Image* image)\r
 {\r
    return evas_object_image_alpha_get(image->view.eo);\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_animated_get(E_View_Image* image)\r
 {\r
    return evas_object_image_animated_get(image->view.eo);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_animated_frame_set(E_View_Image* image, int frame_index)\r
 {\r
    evas_object_image_animated_frame_set(image->view.eo, frame_index);\r
 }\r
 \r
-E_API int\r
+EINTERN int\r
 e_view_image_animated_frame_get(E_View_Image* image)\r
 {\r
    return evas_object_image_animated_frame_get(image->view.eo);\r
 }\r
 \r
-E_API int\r
+EINTERN int\r
 e_view_image_animated_frame_count_get(E_View_Image* image)\r
 {\r
    return evas_object_image_animated_frame_count_get(image->view.eo);\r
 }\r
 \r
-E_API double\r
+EINTERN double\r
 e_view_image_animated_frame_duration_get(const E_View_Image *image, int start_frame, int frame_num)\r
 {\r
    return evas_object_image_animated_frame_duration_get(image->view.eo, start_frame, frame_num);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_border_center_fill_set(const E_View_Image *image, E_View_Border_Fill_Mode fill)\r
 {\r
    switch (fill)\r
@@ -449,7 +450,7 @@ e_view_image_border_center_fill_set(const E_View_Image *image, E_View_Border_Fil
      }\r
 }\r
 \r
-E_API E_View_Border_Fill_Mode\r
+EINTERN E_View_Border_Fill_Mode\r
 e_view_image_border_center_fill_get(const E_View_Image *image)\r
 {\r
    Evas_Border_Fill_Mode fill_mode = evas_object_image_border_center_fill_get(image->view.eo);\r
@@ -465,13 +466,13 @@ e_view_image_border_center_fill_get(const E_View_Image *image)
    return E_VIEW_BORDER_FILL_NONE;\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_border_set(E_View_Image *image, int l, int r, int t, int b)\r
 {\r
    evas_object_image_border_set(image->view.eo, l, r, t, b);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_border_get(const E_View_Image *image, int *l, int *r, int *t, int *b)\r
 {\r
    evas_object_image_border_get(image->view.eo, l, r, t, b);\r
@@ -483,13 +484,13 @@ e_view_image_colorspace_set(E_View_Image *image, E_View_Colorspace cspace)
    evas_object_image_colorspace_set(image->view.eo, e_view_image_colorspace_map_to(cspace));\r
 }\r
 \r
-E_API E_View_Colorspace\r
+EINTERN E_View_Colorspace\r
 e_view_image_colorspace_get(E_View_Image *image)\r
 {\r
    return e_view_image_colorspace_map(evas_object_image_colorspace_get(image->view.eo));\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_data_copy_set(E_View_Image *image, void *data)\r
 {\r
    evas_object_image_data_copy_set(image->view.eo, data);\r
@@ -501,7 +502,7 @@ e_view_image_data_set(E_View_Image *image, void *data)
    evas_object_image_data_set(image->view.eo, data);\r
 }\r
 \r
-E_API void*\r
+EINTERN void*\r
 e_view_image_data_get(E_View_Image *image, bool for_writing)\r
 {\r
    return evas_object_image_data_get(image->view.eo, for_writing);\r
@@ -519,7 +520,7 @@ e_view_image_file_set(E_View_Image *image, const char *file, const char *key)
    evas_object_image_file_set(image->view.eo, file, key);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_file_get(E_View_Image *image, const char **file, const char **key)\r
 {\r
    evas_object_image_file_get(image->view.eo, file, key);\r
@@ -531,7 +532,7 @@ e_view_image_fill_set(E_View_Image *image, int x, int y, int w, int h)
    evas_object_image_fill_set(image->view.eo, x, y, w, h);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_fill_get(const E_View_Image *image, int *x, int *y, int *w, int *h)\r
 {\r
    evas_object_image_fill_get(image->view.eo, x, y, w, h);\r
@@ -543,7 +544,7 @@ e_view_image_filled_set(E_View_Image *image, bool filled)
    evas_object_image_filled_set(image->view.eo, filled);\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_filled_get(E_View_Image *image)\r
 {\r
    return evas_object_image_filled_get(image->view.eo);\r
@@ -555,7 +556,7 @@ e_view_image_load_error_get(const E_View_Image *image)
    return evas_object_image_load_error_get(image->view.eo);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_load_size_set(E_View_Image *image, int w, int h)\r
 {\r
    image->width = w;\r
@@ -626,13 +627,13 @@ e_view_image_pixels_dirty_set(E_View_Image *image, bool dirty)
    evas_object_image_pixels_dirty_set(image->view.eo, dirty);\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_pixels_dirty_get(E_View_Image *image)\r
 {\r
    return evas_object_image_pixels_dirty_get(image->view.eo);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_pixels_get_callback_set(E_View_Image *image, E_View_Image_Pixels_Get_Cb func, void *data)\r
 {\r
    image->pixel_get_cb      = func;\r
@@ -641,7 +642,7 @@ e_view_image_pixels_get_callback_set(E_View_Image *image, E_View_Image_Pixels_Ge
    evas_object_image_pixels_get_callback_set(image->view.eo, image_pixels_get_cb, (void*)image);\r
 }\r
 \r
-E_API void\r
+EINTERN void\r
 e_view_image_pixels_noti_callback_set(E_View_Image *image, E_View_Image_Pixels_Get_Cb func, void *data)\r
 {\r
    image->pixel_noti_cb      = func;\r
@@ -656,7 +657,7 @@ e_view_image_smooth_scale_set(E_View_Image *image, bool smooth_scale)
    evas_object_image_smooth_scale_set(image->view.eo, smooth_scale);\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_smooth_scale_get(E_View_Image *image)\r
 {\r
    return evas_object_image_smooth_scale_get(image->view.eo);\r
@@ -706,13 +707,13 @@ e_view_image_source_set(E_View_Image *image, E_View *src)
    return evas_object_image_source_set(image->view.eo, NULL);\r
 }\r
 \r
-E_API E_View *\r
+EINTERN E_View *\r
 e_view_image_source_get(E_View_Image *image)\r
 {\r
    return image->source;\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_source_unset(E_View_Image *image)\r
 {\r
    if (evas_object_image_source_unset(image->view.eo))\r
@@ -723,25 +724,25 @@ e_view_image_source_unset(E_View_Image *image)
    return false;\r
 }\r
 \r
-E_API bool\r
+EINTERN bool\r
 e_view_image_save(E_View_Image *image, const char* file, const char *key, const char *flags)\r
 {\r
    return evas_object_image_save(image->view.eo, file, key, flags);\r
 }\r
 \r
-void\r
+E_API void\r
 e_view_image_preload(E_View_Image *image, bool cancel)\r
 {\r
    evas_object_image_preload(image->view.eo, cancel);\r
 }\r
 \r
-void\r
+EINTERN void\r
 e_view_image_snapshot_set(E_View_Image *image, bool set)\r
 {\r
    evas_object_image_snapshot_set(image->view.eo, set);\r
 }\r
 \r
-void\r
+E_API void\r
 e_view_image_geometry_set(E_View_Image *image, int x, int y, int w, int h)\r
 {\r
    int image_x, image_y;\r
@@ -752,7 +753,7 @@ e_view_image_geometry_set(E_View_Image *image, int x, int y, int w, int h)
    evas_object_geometry_set(image->view.eo, image_x, image_y, w, h);\r
 }\r
 \r
-void\r
+E_API void\r
 e_view_image_geometry_get(E_View_Image *image, int *x, int *y, int *w, int *h)\r
 {\r
    int image_x, image_y;\r
@@ -761,7 +762,7 @@ e_view_image_geometry_get(E_View_Image *image, int *x, int *y, int *w, int *h)
    evas_object_geometry_get(image->view.eo, &image_x, &image_y, w, h);\r
 }\r
 \r
-void\r
+EINTERN void\r
 e_view_image_gfx_filter_program_set(E_View_Image *image, const char *code, const char *name)\r
 {\r
    efl_gfx_filter_program_set(image->view.eo, code, name);\r

diff --git a/src/bin/core/e_view_image_intern.h b/src/bin/core/e_view_image_intern.h
index 21cecdd7a9c24b5ddb03268445ae2f2599cf41b8..84ca0e77876057a1a9b8ffe8236c557201b85eab 100644 (file)
--- a/src/bin/core/e_view_image_intern.h
+++ b/src/bin/core/e_view_image_intern.h
@@ -1,9 +1,56 @@
 #ifndef E_VIEW_IMAGE_INTERN_H
 #define E_VIEW_IMAGE_INTERN_H
 
-#include "e_intern.h"
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 #include "e_view_image.h"
 
+bool e_view_image_alpha_get(E_View_Image* image);
+
+bool e_view_image_animated_get(E_View_Image* image);
+void e_view_image_animated_frame_set(E_View_Image* image, int frame_index);
+int e_view_image_animated_frame_get(E_View_Image* image);
+int e_view_image_animated_frame_count_get(E_View_Image* image);
+double e_view_image_animated_frame_duration_get(const E_View_Image *image, int start_frame, int frame_num);
+
+void e_view_image_border_center_fill_set(const E_View_Image *image, E_View_Border_Fill_Mode fill);
+E_View_Border_Fill_Mode e_view_image_border_center_fill_get(const E_View_Image *image);
+void e_view_image_border_set(E_View_Image *image, int l, int r, int t, int b);
+void e_view_image_border_get(const E_View_Image *image, int *l, int *r, int *t, int *b);
+
+E_View_Colorspace e_view_image_colorspace_get(E_View_Image *image);
+
+void e_view_image_data_copy_set(E_View_Image *image, void *data);
+void *e_view_image_data_get(E_View_Image *image, bool for_writing);
+
+void e_view_image_file_get(E_View_Image *image, const char **file, const char **key);
+
+void e_view_image_fill_get(const E_View_Image *image, int *x, int *y, int *w, int *h);
+bool e_view_image_filled_get(E_View_Image *image);
+
+void e_view_image_load_size_set(E_View_Image *image, int w, int h);
+
+bool e_view_image_pixels_dirty_get(E_View_Image *image);
+void e_view_image_pixels_get_callback_set(E_View_Image *image, E_View_Image_Pixels_Get_Cb func, void *data);
+void e_view_image_pixels_noti_callback_set(E_View_Image *image, E_View_Image_Pixels_Get_Cb func, void *data);
+
+bool e_view_image_smooth_scale_get(E_View_Image *image);
+
+E_View *e_view_image_source_get(E_View_Image *image);
+bool e_view_image_source_unset(E_View_Image *image);
+
+bool e_view_image_save(E_View_Image *image, const char* file, const char *key, const char *flags);
+
+void e_view_image_snapshot_set(E_View_Image *image, bool set);
+
+void e_view_image_gfx_filter_program_set(E_View_Image *image, const char *code, const char *name);
+
 void e_view_image_resize_listener_add(E_View_Image *image, struct wl_listener *listener);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif

diff --git a/src/bin/server/e_blur.c b/src/bin/server/e_blur.c
index e78e35b4b3144aa372bff8c3a2ac609813e32115..153a590c344484ed5a4574a0a75db29425801d06 100644 (file)
--- a/src/bin/server/e_blur.c
+++ b/src/bin/server/e_blur.c
@@ -3,8 +3,7 @@
 #include "e_blur_video_capture_intern.h"
 #include "e_comp_wl_intern.h"
 #include "e_client_intern.h"
-#include "e_view.h"
-#include "e_view_image.h"
+#include "e_view_image_intern.h"
 #include <pixman.h>
 #include <libds-tizen/blur.h>
 

diff --git a/src/include/e_view_image.h b/src/include/e_view_image.h
index e27c84e09d59f5445272da11da44643109984b65..dad13d7fc531665a8938c72c79d0f3865d2883d6 100644 (file)
--- a/src/include/e_view_image.h
+++ b/src/include/e_view_image.h
@@ -175,81 +175,16 @@ E_View_Image *e_view_image_try_from_view(E_View *view);
  */
 void e_view_image_alpha_set(E_View_Image *image, bool alpha);
 
-/**
- * TODO
- */
-bool e_view_image_alpha_get(E_View_Image* image);
-
-/**
- * TODO
- */
-bool e_view_image_animated_get(E_View_Image* image);
-
-/**
- * TODO
- */
-void e_view_image_animated_frame_set(E_View_Image* image, int frame_index);
-
-/**
- * TODO
- */
-int e_view_image_animated_frame_get(E_View_Image* image);
-
-/**
- * TODO
- */
-int e_view_image_animated_frame_count_get(E_View_Image* image);
-
-/**
- * TODO
- */
-double e_view_image_animated_frame_duration_get(const E_View_Image *image, int start_frame, int frame_num);
-
-/**
- * TODO
- */
-void e_view_image_border_center_fill_set(const E_View_Image *image, E_View_Border_Fill_Mode fill);
-
-/**
- * TODO
- */
-E_View_Border_Fill_Mode e_view_image_border_center_fill_get(const E_View_Image *image);
-
-/**
- * TODO
- */
-void e_view_image_border_set(E_View_Image *image, int l, int r, int t, int b);
-
-/**
- * TODO
- */
-void e_view_image_border_get(const E_View_Image *image, int *l, int *r, int *t, int *b);
-
 /**
  * TODO
  */
 void e_view_image_colorspace_set(E_View_Image *image, E_View_Colorspace cspace);
 
-/**
- * TODO
- */
-E_View_Colorspace e_view_image_colorspace_get(E_View_Image *image);
-
-/**
- * TODO
- */
-void e_view_image_data_copy_set(E_View_Image *image, void *data);
-
 /**
  * TODO
 */
 void e_view_image_data_set(E_View_Image *image, void *data);
 
-/**
- * TODO
- */
-void *e_view_image_data_get(E_View_Image *image, bool for_writing);
-
 /**
  * TODO
  */
@@ -260,41 +195,21 @@ void e_view_image_data_update_add(E_View_Image *image, int x, int y, int w, int
  */
 void e_view_image_file_set(E_View_Image *image, const char *file, const char *key);
 
-/**
- * TODO
- */
-void e_view_image_file_get(E_View_Image *image, const char **file, const char **key);
-
 /**
  * TODO
  */
 void e_view_image_fill_set(E_View_Image *image, int x, int y, int w, int h);
 
-/**
- * TODO
- */
-void e_view_image_fill_get(const E_View_Image *image, int *x, int *y, int *w, int *h);
-
 /**
  * TODO
  */
 void e_view_image_filled_set(E_View_Image *image, bool filled);
 
-/**
- * TODO
- */
-bool e_view_image_filled_get(E_View_Image *image);
-
 /**
  * TODO
  */
 E_View_Load_Error e_view_image_load_error_get(const E_View_Image *image);
 
-/**
- * TODO
- */
-void e_view_image_load_size_set(E_View_Image *image, int w, int h);
-
 /**
  * TODO
  */
@@ -315,31 +230,11 @@ E_View_Native_Surface *e_view_image_native_surface_get(E_View_Image *image);
  */
 void e_view_image_pixels_dirty_set(E_View_Image *Image, bool dirty);
 
-/**
- * TODO
- */
-bool e_view_image_pixels_dirty_get(E_View_Image *image);
-
-/**
- * TODO
- */
-void e_view_image_pixels_get_callback_set(E_View_Image *image, E_View_Image_Pixels_Get_Cb func, void *data);
-
-/**
- * TODO
- */
-void e_view_image_pixels_noti_callback_set(E_View_Image *image, E_View_Image_Pixels_Get_Cb func, void *data);
-
 /**
  * TODO
  */
 void e_view_image_smooth_scale_set(E_View_Image *image, bool smooth_scale);
 
-/**
- * TODO
- */
-bool e_view_image_smooth_scale_get(E_View_Image *image);
-
 /**
  * TODO
  */
@@ -355,31 +250,11 @@ void e_view_image_size_get(E_View_Image *image, int *w, int *h);
  */
 bool e_view_image_source_set(E_View_Image *image, E_View *src);
 
-/**
- * TODO
- */
-E_View *e_view_image_source_get(E_View_Image *image);
-
-/**
- * TODO
- */
-bool e_view_image_source_unset(E_View_Image *image);
-
-/**
- * TODO
- */
-bool e_view_image_save(E_View_Image *image, const char* file, const char *key, const char *flags);
-
 /**
  * TODO
  */
 void e_view_image_preload(E_View_Image *image, bool cancel);
 
-/**
- * TODO
- */
-void e_view_image_snapshot_set(E_View_Image *image, bool set);
-
 /**
  * TODO
  */
@@ -391,11 +266,6 @@ void e_view_image_geometry_set(E_View_Image *image, int x, int y, int w, int h);
 void e_view_image_geometry_get(E_View_Image *image, int *x, int *y, int *w, int *h);
 
 
-/**
- * TODO
- */
-void e_view_image_gfx_filter_program_set(E_View_Image *image, const char *code, const char *name);
-
 #ifdef  __cplusplus
 }
 #endif

diff --git a/tests/tc-e_view_image.cpp b/tests/tc-e_view_image.cpp
index 8ed420e2cca909c9bb60ac1320bfd59aa64d9453..e002290e9eaafebbb7ffa934d984f28743885075 100755 (executable)
--- a/tests/tc-e_view_image.cpp
+++ b/tests/tc-e_view_image.cpp
@@ -2,6 +2,7 @@
 #include "evas_wrapper.h"
 
 #include "src/bin/core/e_view_intern.h"
+#include "src/bin/core/e_view_image_intern.h"
 #include "src/bin/core/e_canvas_intern.h"
 #include "e_view_image.h"
 #include "e_canvas.h"