aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin/edje/edje_cc_out.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/edje/edje_cc_out.c')
-rw-r--r--src/bin/edje/edje_cc_out.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index b13cf20abd..f315526e4f 100644
--- a/src/bin/edje/edje_cc_out.c
+++ b/src/bin/edje/edje_cc_out.c
@@ -1381,7 +1381,7 @@ data_write_images(void)
Image_Write *iw;
img = &edje_file->image_dir->entries[cur_image_entry];
- if ((img->source_type == EDJE_IMAGE_SOURCE_TYPE_USER) || !img->entry)
+ if ((img->source_type >= EDJE_IMAGE_SOURCE_TYPE_USER) || !img->entry)
continue;
if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 ||
@@ -1452,7 +1452,7 @@ data_write_images(void)
}
}
- if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_USER)
+ if (img->source_type < EDJE_IMAGE_SOURCE_TYPE_USER)
{
ext = strrchr(img->entry, '.');
if (ext && (!strcasecmp(ext, ".svg") || !strcasecmp(ext, ".svgz")))
@@ -2713,6 +2713,20 @@ data_write(void)
EFL_VERSION_MAJOR, EFL_VERSION_MINOR);
}
+ if (eina_array_count(requires))
+ {
+ int i = 0;
+
+ edje_file->requires_count = eina_array_count(requires);
+ edje_file->requires = mem_alloc(edje_file->requires_count * sizeof(void*));
+ do
+ {
+ edje_file->requires[i] = eina_array_pop(requires);
+ i++;
+ } while (eina_array_count(requires));
+ eina_array_free(requires);
+ }
+
check_groups(ef);
ecore_thread_max_set(ecore_thread_max_get() * 2);
@@ -3947,7 +3961,7 @@ free_group:
if ((de->entry) && (!strcmp(de->entry, image->name)))
{
- if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_USER)
+ if (de->source_type >= EDJE_IMAGE_SOURCE_TYPE_USER)
*(image->dest) = -de->id - 1;
else
*(image->dest) = de->id;