summaryrefslogtreecommitdiff
path: root/src/lib/evas/include
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@samsung.com>2013-05-06 19:01:35 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-05-06 19:02:05 +0900
commit0d2c6481b8ed9273f3430d4e8916f4dd881d7221 (patch)
tree4955ef6877469fd41f0eeeea3993169c4c058a81 /src/lib/evas/include
parent692938689592ac9c8a79c7c69f6825be1313bb48 (diff)
evas: final cleanup of the API, should be ready to make it public by now.
Diffstat (limited to 'src/lib/evas/include')
-rw-r--r--src/lib/evas/include/evas_common.h10
-rw-r--r--src/lib/evas/include/evas_private.h17
2 files changed, 16 insertions, 11 deletions
diff --git a/src/lib/evas/include/evas_common.h b/src/lib/evas/include/evas_common.h
index 1991b6b413..a1b94fcc20 100644
--- a/src/lib/evas/include/evas_common.h
+++ b/src/lib/evas/include/evas_common.h
@@ -633,6 +633,13 @@ struct _Image_Entry
633 LK(lock); 633 LK(lock);
634 LK(lock_cancel); 634 LK(lock_cancel);
635 635
636 /* for animation feature */
637 Image_Entry_Animated animated;
638
639 /* Reference to the file */
640 Eina_File *f;
641 void *loader_data;
642
636 Image_Entry_Flags flags; 643 Image_Entry_Flags flags;
637 Evas_Image_Scale_Hint scale_hint; 644 Evas_Image_Scale_Hint scale_hint;
638 void *data1, *data2; 645 void *data1, *data2;
@@ -643,9 +650,6 @@ struct _Image_Entry
643 int connect_num; 650 int connect_num;
644 int channel; 651 int channel;
645 int load_error; 652 int load_error;
646
647 /* for animation feature */
648 Image_Entry_Animated animated;
649}; 653};
650 654
651struct _Engine_Image_Entry 655struct _Engine_Image_Entry
diff --git a/src/lib/evas/include/evas_private.h b/src/lib/evas/include/evas_private.h
index 1adb15b016..bc3805e7cf 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -903,20 +903,21 @@ struct _Evas_Func
903struct _Evas_Image_Load_Func 903struct _Evas_Image_Load_Func
904{ 904{
905 Eina_Bool threadable; 905 Eina_Bool threadable;
906 Eina_Bool (*file_head) (Eina_File *f, const char *key, 906 void *(*file_open) (Eina_File *f, const char *key,
907 Evas_Image_Property *prop,
908 Evas_Image_Load_Opts *opts, 907 Evas_Image_Load_Opts *opts,
909 Evas_Image_Animated *animated, 908 Evas_Image_Animated *animated,
910 int *error); 909 int *error);
911 Eina_Bool (*file_data) (Eina_File *f, const char *key, 910 void (*file_close) (void *loader_data);
911
912 Eina_Bool (*file_head) (void *loader_data,
912 Evas_Image_Property *prop, 913 Evas_Image_Property *prop,
913 Evas_Image_Load_Opts *opts,
914 Evas_Image_Animated *animated,
915 void *pixels,
916 int *error); 914 int *error);
917 double (*frame_duration) (Eina_File *f, 915 Eina_Bool (*file_data) (void *loader_data,
918 Evas_Image_Animated *animated, 916 Evas_Image_Property *prop,
917 void *pixels, int *error);
918 double (*frame_duration) (void *loader_data,
919 int start, int frame_num); 919 int start, int frame_num);
920
920 Eina_Bool do_region; 921 Eina_Bool do_region;
921}; 922};
922 923