aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-02-26 15:44:58 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-02-28 16:02:37 -0500
commit645c573efb42721ed4e076fba40d33d10dd244ec (patch)
tree915ac88f69aec6e3441ed4b1df6d8f487abee9ac
parentRevert "wayland_imf: Fix bug in shutdown" (diff)
downloadefl-645c573efb42721ed4e076fba40d33d10dd244ec.tar.gz
edje: EDJE_IMAGE_SOURCE_TYPE_EXTERNAL -> EDJE_IMAGE_SOURCE_TYPE_USER
no functional changes, just a confusing define rename
-rw-r--r--src/bin/edje/edje_cc_handlers.c2
-rw-r--r--src/bin/edje/edje_cc_out.c6
-rw-r--r--src/bin/edje/edje_decc.c2
-rw-r--r--src/lib/edje/edje_calc.c2
-rw-r--r--src/lib/edje/edje_edit.c4
-rw-r--r--src/lib/edje/edje_private.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c
index c32609b1df..1c5cfcd88f 100644
--- a/src/bin/edje/edje_cc_handlers.c
+++ b/src/bin/edje/edje_cc_handlers.c
@@ -2376,7 +2376,7 @@ st_images_image(void)
}
else if (v == 5)
{
- img->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
+ img->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
img->source_param = 0;
}
if ((img->source_type < EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) ||
diff --git a/src/bin/edje/edje_cc_out.c b/src/bin/edje/edje_cc_out.c
index ef6c13ed1e..9b828b87e2 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_EXTERNAL) || !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_EXTERNAL)
+ if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_USER)
{
ext = strrchr(img->entry, '.');
if (ext && (!strcasecmp(ext, ".svg") || !strcasecmp(ext, ".svgz")))
@@ -3944,7 +3944,7 @@ free_group:
if ((de->entry) && (!strcmp(de->entry, image->name)))
{
- if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL)
+ if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_USER)
*(image->dest) = -de->id - 1;
else
*(image->dest) = de->id;
diff --git a/src/bin/edje/edje_decc.c b/src/bin/edje/edje_decc.c
index 5327897d0d..1b8c3120a0 100644
--- a/src/bin/edje/edje_decc.c
+++ b/src/bin/edje/edje_decc.c
@@ -299,7 +299,7 @@ output(void)
if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) &&
(ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) &&
- (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) &&
+ (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_USER) &&
(ei->entry))
{
Ecore_Evas *ee;
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 93ab2f7222..1bb2833265 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -614,7 +614,7 @@ _edje_real_part_image_set(Edje *ed, Edje_Real_Part *ep, Edje_Real_Part_Set **set
if (!ed->file->image_dir) ie = NULL;
else ie = ed->file->image_dir->entries + (-image_id) - 1;
if ((ie) &&
- (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) &&
+ (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_USER) &&
(ie->entry))
{
evas_object_image_file_set(ep->object, ie->entry, NULL);
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index c908beba45..fcd1ff236e 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -10416,7 +10416,7 @@ edje_edit_image_compression_type_get(Evas_Object *obj, const char *image)
case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2: // LOSSY_ETC2
return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2;
- case EDJE_IMAGE_SOURCE_TYPE_EXTERNAL: // USER
+ case EDJE_IMAGE_SOURCE_TYPE_USER: // USER
return EDJE_EDIT_IMAGE_COMP_USER;
}
@@ -10483,7 +10483,7 @@ edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_E
case EDJE_EDIT_IMAGE_COMP_USER: // USER
{
- de->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
+ de->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
return EINA_TRUE;
}
}
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 3d13c531eb..8200d43aa7 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -429,7 +429,7 @@ typedef struct _Edje_Signal_Callback_Custom Edje_Signal_Callback_Custom;
#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY 2
#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 3
#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2 4
-#define EDJE_IMAGE_SOURCE_TYPE_EXTERNAL 5
+#define EDJE_IMAGE_SOURCE_TYPE_USER 5
#define EDJE_IMAGE_SOURCE_TYPE_LAST 6
#define EDJE_SOUND_SOURCE_TYPE_NONE 0