summaryrefslogtreecommitdiff
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-26 15:44:58 -0500
commite62ac0f10b5e3b00b681292c6cd5fb34f25ee3d4 (patch)
tree599b790254ccf48c9e4206ec71e65410a20f7d7d
parent568b524411651ac5914c06d626444b0d9a309270 (diff)
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)
2376 } 2376 }
2377 else if (v == 5) 2377 else if (v == 5)
2378 { 2378 {
2379 img->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL; 2379 img->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
2380 img->source_param = 0; 2380 img->source_param = 0;
2381 } 2381 }
2382 if ((img->source_type < EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) || 2382 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)
1381 Image_Write *iw; 1381 Image_Write *iw;
1382 1382
1383 img = &edje_file->image_dir->entries[cur_image_entry]; 1383 img = &edje_file->image_dir->entries[cur_image_entry];
1384 if ((img->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) || !img->entry) 1384 if ((img->source_type == EDJE_IMAGE_SOURCE_TYPE_USER) || !img->entry)
1385 continue; 1385 continue;
1386 1386
1387 if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 || 1387 if (img->source_type == EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 ||
@@ -1452,7 +1452,7 @@ data_write_images(void)
1452 } 1452 }
1453 } 1453 }
1454 1454
1455 if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) 1455 if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_USER)
1456 { 1456 {
1457 ext = strrchr(img->entry, '.'); 1457 ext = strrchr(img->entry, '.');
1458 if (ext && (!strcasecmp(ext, ".svg") || !strcasecmp(ext, ".svgz"))) 1458 if (ext && (!strcasecmp(ext, ".svg") || !strcasecmp(ext, ".svgz")))
@@ -3944,7 +3944,7 @@ free_group:
3944 3944
3945 if ((de->entry) && (!strcmp(de->entry, image->name))) 3945 if ((de->entry) && (!strcmp(de->entry, image->name)))
3946 { 3946 {
3947 if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) 3947 if (de->source_type == EDJE_IMAGE_SOURCE_TYPE_USER)
3948 *(image->dest) = -de->id - 1; 3948 *(image->dest) = -de->id - 1;
3949 else 3949 else
3950 *(image->dest) = de->id; 3950 *(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)
299 299
300 if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) && 300 if ((ei->source_type > EDJE_IMAGE_SOURCE_TYPE_NONE) &&
301 (ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) && 301 (ei->source_type < EDJE_IMAGE_SOURCE_TYPE_LAST) &&
302 (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) && 302 (ei->source_type != EDJE_IMAGE_SOURCE_TYPE_USER) &&
303 (ei->entry)) 303 (ei->entry))
304 { 304 {
305 Ecore_Evas *ee; 305 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
614 if (!ed->file->image_dir) ie = NULL; 614 if (!ed->file->image_dir) ie = NULL;
615 else ie = ed->file->image_dir->entries + (-image_id) - 1; 615 else ie = ed->file->image_dir->entries + (-image_id) - 1;
616 if ((ie) && 616 if ((ie) &&
617 (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_EXTERNAL) && 617 (ie->source_type == EDJE_IMAGE_SOURCE_TYPE_USER) &&
618 (ie->entry)) 618 (ie->entry))
619 { 619 {
620 evas_object_image_file_set(ep->object, ie->entry, NULL); 620 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)
10416 case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2: // LOSSY_ETC2 10416 case EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2: // LOSSY_ETC2
10417 return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2; 10417 return EDJE_EDIT_IMAGE_COMP_LOSSY_ETC2;
10418 10418
10419 case EDJE_IMAGE_SOURCE_TYPE_EXTERNAL: // USER 10419 case EDJE_IMAGE_SOURCE_TYPE_USER: // USER
10420 return EDJE_EDIT_IMAGE_COMP_USER; 10420 return EDJE_EDIT_IMAGE_COMP_USER;
10421 } 10421 }
10422 10422
@@ -10483,7 +10483,7 @@ edje_edit_image_compression_type_set(Evas_Object *obj, const char *image, Edje_E
10483 10483
10484 case EDJE_EDIT_IMAGE_COMP_USER: // USER 10484 case EDJE_EDIT_IMAGE_COMP_USER: // USER
10485 { 10485 {
10486 de->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL; 10486 de->source_type = EDJE_IMAGE_SOURCE_TYPE_USER;
10487 return EINA_TRUE; 10487 return EINA_TRUE;
10488 } 10488 }
10489 } 10489 }
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;
429#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY 2 429#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY 2
430#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 3 430#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC1 3
431#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2 4 431#define EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY_ETC2 4
432#define EDJE_IMAGE_SOURCE_TYPE_EXTERNAL 5 432#define EDJE_IMAGE_SOURCE_TYPE_USER 5
433#define EDJE_IMAGE_SOURCE_TYPE_LAST 6 433#define EDJE_IMAGE_SOURCE_TYPE_LAST 6
434 434
435#define EDJE_SOUND_SOURCE_TYPE_NONE 0 435#define EDJE_SOUND_SOURCE_TYPE_NONE 0