vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edje: make svg support a beta feature of edje_cc. 

Should we do the same with Canvas3D part ?
This commit is contained in:
Cedric BAIL 2016-06-13 10:54:18 -07:00
parent 54590d677e
commit ba0aac6909
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/edje/edje_cc.c
View File

@ -42,6 +42,7 @@ int threads = 0;
int annotate = 0; int annotate = 0;
int no_etc1 = 0; int no_etc1 = 0;
int no_etc2 = 0; int no_etc2 = 0;
int beta = 0;
static void static void
_edje_cc_log_cb(const Eina_Log_Domain *d, _edje_cc_log_cb(const Eina_Log_Domain *d,
@ -310,6 +311,10 @@ main(int argc, char **argv)
depfile = argv[i]; depfile = argv[i];
unlink(depfile); unlink(depfile);
} }
else if (!strcmp(argv[i], "-beta"))
{
beta = 1;
}
else if (!file_in) else if (!file_in)
file_in = argv[i]; file_in = argv[i];
else if (!file_out) else if (!file_out)

1
src/bin/edje/edje_cc.h
View File

@ -306,6 +306,7 @@ extern int threads;
extern int annotate; extern int annotate;
extern Eina_Bool current_group_inherit; extern Eina_Bool current_group_inherit;
extern Eina_List *color_tree_root; extern Eina_List *color_tree_root;
extern int beta;
extern int had_quote; extern int had_quote;

7
src/bin/edje/edje_cc_out.c
View File

@ -1235,7 +1235,7 @@ on_error:
static void static void
data_write_vectors(Eet_File *ef, int *vector_num) data_write_vectors(Eet_File *ef, int *vector_num)
{ {
int i; unsigned int i;
Svg_Node *root; Svg_Node *root;
Eet_Data_Descriptor *svg_node_eet; Eet_Data_Descriptor *svg_node_eet;
Eina_List *ll; Eina_List *ll;
@ -1249,8 +1249,11 @@ data_write_vectors(Eet_File *ef, int *vector_num)
svg_node_eet = _edje_svg_node_eet(); svg_node_eet = _edje_svg_node_eet();
for (i = 0; i < (int)edje_file->image_dir->vectors_count; i++) for (i = 0; i < edje_file->image_dir->vectors_count; i++)
{ {
if (!beta)
error_and_abort(ef, "Vector part are currently a beta feature, please enable them by running edje_cc with -beta.");
vector = &edje_file->image_dir->vectors[i]; vector = &edje_file->image_dir->vectors[i];
EINA_LIST_FOREACH(img_dirs, ll, s) EINA_LIST_FOREACH(img_dirs, ll, s)
{ {