jpeg pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=28a03d6e191abae85a851e9e40b25fa330008602

commit 28a03d6e191abae85a851e9e40b25fa330008602
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Tue Mar 22 15:21:24 2016 +0900

    Evas: Remove unimplemented image comment (internal)
    
    This is a minor cleanup of RGBA_Image.
---
 src/lib/evas/include/evas_common_private.h              | 12 ------------
 src/lib/evas/include/evas_private.h                     |  1 -
 src/modules/evas/engines/gl_cocoa/evas_engine.c         | 12 ------------
 src/modules/evas/engines/gl_generic/evas_engine.c       | 13 -------------
 src/modules/evas/engines/software_generic/evas_engine.c | 11 -----------
 5 files changed, 49 deletions(-)

diff --git a/src/lib/evas/include/evas_common_private.h 
b/src/lib/evas/include/evas_common_private.h
index ca07441..98f9066 100644
--- a/src/lib/evas/include/evas_common_private.h
+++ b/src/lib/evas/include/evas_common_private.h
@@ -835,21 +835,9 @@ struct _RGBA_Pipe_Thread_Info
 struct _RGBA_Image
 {
    Image_Entry          cache_entry;
-
    RGBA_Image_Flags     flags;
-   struct
-     {
-/*     void           *module; */
-/*     void           *loader; */
-/*     char           *real_file; */
-       char           *comment;
-//     int             format;
-     } info;
-
    void                *extended_info;
 
-/*    unsigned char        scale; */
-
    /* Colorspace stuff. */
    struct {
       void              *data;
diff --git a/src/lib/evas/include/evas_private.h 
b/src/lib/evas/include/evas_private.h
index ebfba84..e3eab64 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1358,7 +1358,6 @@ struct _Evas_Func
    void *(*image_border_set)               (void *data, void *image, int l, 
int r, int t, int b);
    void  (*image_border_get)               (void *data, void *image, int *l, 
int *r, int *t, int *b);
    Eina_Bool (*image_draw)                 (void *data, void *context, void 
*surface, void *image, int src_x, int src_y, int src_w, int src_h, int dst_x, 
int dst_y, int dst_w, int dst_h, int smooth, Eina_Bool do_async);
-   char *(*image_comment_get)              (void *data, void *image, char 
*key);
    void (*image_colorspace_set)            (void *data, void *image, 
Evas_Colorspace cspace);
    Evas_Colorspace (*image_colorspace_get) (void *data, void *image);
    Evas_Colorspace (*image_file_colorspace_get)(void *data, void *image);
diff --git a/src/modules/evas/engines/gl_cocoa/evas_engine.c 
b/src/modules/evas/engines/gl_cocoa/evas_engine.c
index 08b62b5..58f26d0 100644
--- a/src/modules/evas/engines/gl_cocoa/evas_engine.c
+++ b/src/modules/evas/engines/gl_cocoa/evas_engine.c
@@ -455,17 +455,6 @@ eng_image_border_get(void *data EINA_UNUSED, void *image 
EINA_UNUSED, int *l EIN
 {
 }
 
-static char *
-eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key 
EINA_UNUSED)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return NULL;
-   im = image;
-   if (!im->im) return NULL;
-   return im->im->info.comment;
-}
-
 static Evas_Colorspace
 eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image)
 {
@@ -1385,7 +1374,6 @@ module_open(Evas_Module *em)
    ORD(image_border_set);
    ORD(image_border_get);
    ORD(image_draw);
-   ORD(image_comment_get);
    ORD(image_colorspace_set);
    ORD(image_colorspace_get);
    ORD(image_file_colorspace_get);
diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c 
b/src/modules/evas/engines/gl_generic/evas_engine.c
index d1d2a6f..a0d956b 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -242,18 +242,6 @@ eng_image_border_get(void *data EINA_UNUSED, void *image 
EINA_UNUSED, int *l EIN
 {
 }
 
-
-static char *
-eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key 
EINA_UNUSED)
-{
-   Evas_GL_Image *im;
-
-   if (!image) return NULL;
-   im = image;
-   if (!im->im) return NULL;
-   return im->im->info.comment;
-}
-
 static Evas_Colorspace
 eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image)
 {
@@ -2833,7 +2821,6 @@ module_open(Evas_Module *em)
    ORD(image_border_set);
    ORD(image_border_get);
    ORD(image_draw);
-   ORD(image_comment_get);
    ORD(image_colorspace_set);
    ORD(image_colorspace_get);
    ORD(image_file_colorspace_get);
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c 
b/src/modules/evas/engines/software_generic/evas_engine.c
index 176e407..2981f5a 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -1069,16 +1069,6 @@ eng_image_border_get(void *data EINA_UNUSED, void *image 
EINA_UNUSED, int *l EIN
 {
 }
 
-static char *
-eng_image_comment_get(void *data EINA_UNUSED, void *image, char *key 
EINA_UNUSED)
-{
-   RGBA_Image *im;
-
-   if (!image) return NULL;
-   im = image;
-   return im->info.comment;
-}
-
 static Evas_Colorspace
 eng_image_file_colorspace_get(void *data EINA_UNUSED, void *image)
 {
@@ -4154,7 +4144,6 @@ static Evas_Func func =
      eng_image_border_set,
      eng_image_border_get,
      eng_image_draw,
-     eng_image_comment_get,
      eng_image_colorspace_set,
      eng_image_colorspace_get,
      eng_image_file_colorspace_get,

-- 


Reply via email to