jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d931c53919b85ef7b2b6120d7bc60d8ddd207653
commit d931c53919b85ef7b2b6120d7bc60d8ddd207653
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Tue Jun 28 10:52:28 2016 +0900
efl: Remove eo struct Efl.Gfx.Color
So far this was protected behind ifdef EO_API_SUPPORT. It also
was not used internally. Dropping this before the release, since
we will soon have a (hopefully) better solution to handle various
color representations.
---
src/Makefile_Efl.am | 3 ---
src/lib/efl/Efl.h | 13 ------------
src/lib/efl/Makefile.am | 3 ---
src/lib/efl/interfaces/efl_gfx.x | 36 --------------------------------
src/lib/efl/interfaces/efl_gfx_types.eot | 16 --------------
5 files changed, 71 deletions(-)
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index eb976e9..ac5edda 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -104,9 +104,6 @@ dist_installed_eflheaders_DATA = \
lib/efl/Efl.h
installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
-dist_installed_eflinterfaces_DATA = \
- lib/efl/interfaces/efl_gfx.x
-
nodist_installed_eflinterfaces_DATA = \
$(efl_eolian_files_h) \
$(efl_eolian_legacy_files_h)
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 4d5629e..3a00bb5 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -112,19 +112,6 @@ EAPI extern const Eo_Event_Description
_EFL_GFX_PATH_CHANGED;
#include "interfaces/efl_gfx_filter.eo.h"
#include "interfaces/efl_gfx_size_hint.eo.h"
-#define EFL_GFX_COLOR_SET(value) (value << 8)
-#define EFL_GFX_COLOR16_SET(value) (value)
-
-static inline void efl_gfx_color_type_set(Efl_Gfx_Color *color,
- unsigned char r, unsigned char g,
- unsigned char b, unsigned char a);
-
-static inline void efl_gfx_color16_type_set(Efl_Gfx_Color *color,
- unsigned short r, unsigned short g,
- unsigned short b, unsigned short
a);
-
-#include "interfaces/efl_gfx.x"
-
#include "interfaces/efl_canvas.eo.h"
/* Packing & containers */
diff --git a/src/lib/efl/Makefile.am b/src/lib/efl/Makefile.am
index f6138e6..3cae7dd 100644
--- a/src/lib/efl/Makefile.am
+++ b/src/lib/efl/Makefile.am
@@ -82,9 +82,6 @@ Efl_Model_Common.h \
Efl.h
installed_eflinterfacesdir = $(includedir)/efl-@VMAJ@/interfaces
-dist_installed_eflinterfaces_DATA = \
- interfaces/efl_gfx.x
-
nodist_installed_eflinterfaces_DATA = \
$(efl_eolian_files_h) \
$(efl_eolian_legacy_files_h)
diff --git a/src/lib/efl/interfaces/efl_gfx.x b/src/lib/efl/interfaces/efl_gfx.x
deleted file mode 100644
index ed0d48a..0000000
--- a/src/lib/efl/interfaces/efl_gfx.x
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef EFL_GFX_X
-# define EFL_GFX_X
-
-static inline void
-efl_gfx_color_type_set(Efl_Gfx_Color *color,
- unsigned char r, unsigned char g,
- unsigned char b, unsigned char a)
-{
- color->r = EFL_GFX_COLOR_SET(r);
- color->g = EFL_GFX_COLOR_SET(g);
- color->b = EFL_GFX_COLOR_SET(b);
- color->a = EFL_GFX_COLOR_SET(a);
-
- color->type = EFL_GFX_COLOR_TYPE_BITS8;
-}
-
-static inline void
-efl_gfx_color16_type_set(Efl_Gfx_Color *color,
- unsigned short r, unsigned short g,
- unsigned short b, unsigned short a)
-{
- color->r = EFL_GFX_COLOR16_SET(r);
- color->g = EFL_GFX_COLOR16_SET(g);
- color->b = EFL_GFX_COLOR16_SET(b);
- color->a = EFL_GFX_COLOR16_SET(a);
-
- color->type = EFL_GFX_COLOR_TYPE_BITS16;
-}
-
-static inline Efl_Gfx_Color_Type
-efl_gfx_color_type_get(Efl_Gfx_Color *color)
-{
- return color->type;
-}
-
-#endif
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot
b/src/lib/efl/interfaces/efl_gfx_types.eot
index dfabeec..3a70a62 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -26,22 +26,6 @@ enum Efl.Gfx.Render_Op {
last
}
-enum Efl.Gfx.Color_Type {
- bits8, [[Color is encoded in the top 8 bits of the unsigned short as a
unsigned char.]]
- bits16, [[Color is encoded in the 16 bits as an unsigned short.]]
- last
-}
-
-struct Efl.Gfx.Color {
- [[Define an RGBA color.]]
- r: ushort; [[The red component.]]
- g: ushort; [[The green component.]]
- b: ushort; [[The blue component.]]
- a: ushort; [[The alpha component.]]
-
- type: Efl.Gfx.Color_Type; [[Defines whether the color is 8-bit or 16-bit
encoded.]]
-}
-
enum Efl.Gfx.Path.Command_Type {
[[These values determine how the points are interpreted in a stream of
points.
@since 1.14
--
