summaryrefslogtreecommitdiff
path: root/legacy/evas/src/lib
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2009-10-22 15:22:22 +0000
committerCedric BAIL <cedric.bail@free.fr>2009-10-22 15:22:22 +0000
commit8984a75799ad2ae3268ee438da34fee6c88fe7e0 (patch)
tree0377472fb079018e129b903949ce673fa2d51d62 /legacy/evas/src/lib
parent298147556bb4c6746ad50fbbaef3d52ab57b3ec2 (diff)
* evas: Cleanup move to eina log.
Patch from Mathieu Taillefumier. SVN revision: 43200
Diffstat (limited to '')
-rw-r--r--legacy/evas/src/lib/canvas/evas_events.c4
-rw-r--r--legacy/evas/src/lib/canvas/evas_font_dir.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_main.c4
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_box.c18
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_image.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_smart.c8
-rw-r--r--legacy/evas/src/lib/canvas/evas_object_table.c34
-rw-r--r--legacy/evas/src/lib/canvas/evas_render.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_smart.c2
-rw-r--r--legacy/evas/src/lib/canvas/evas_stack.c4
-rw-r--r--legacy/evas/src/lib/cserve/evas_cs_client.c2
-rw-r--r--legacy/evas/src/lib/cserve/evas_cs_server.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_main.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_cpu.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_font_query.c2
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_main.c4
-rw-r--r--legacy/evas/src/lib/engines/common/evas_image_scalecache.c26
-rw-r--r--legacy/evas/src/lib/engines/common/evas_pipe.c8
-rw-r--r--legacy/evas/src/lib/engines/common/evas_tiler.c8
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c6
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c6
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_main.c2
-rw-r--r--legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c2
-rw-r--r--legacy/evas/src/lib/include/evas_common.h47
-rw-r--r--legacy/evas/src/lib/main.c10
26 files changed, 95 insertions, 116 deletions
diff --git a/legacy/evas/src/lib/canvas/evas_events.c b/legacy/evas/src/lib/canvas/evas_events.c
index 64d2a1d10b..b7e985c1bd 100644
--- a/legacy/evas/src/lib/canvas/evas_events.c
+++ b/legacy/evas/src/lib/canvas/evas_events.c
@@ -398,13 +398,13 @@ evas_event_feed_mouse_up(Evas *e, int b, Evas_Button_Flags flags, unsigned int t
398 398
399 if (e->pointer.mouse_grabbed < 0) 399 if (e->pointer.mouse_grabbed < 0)
400 { 400 {
401 ERROR("BUG? e->pointer.mouse_grabbed (=%d) < 0!", 401 ERR("BUG? e->pointer.mouse_grabbed (=%d) < 0!",
402 e->pointer.mouse_grabbed); 402 e->pointer.mouse_grabbed);
403 } 403 }
404 404
405 if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0)) 405 if ((e->pointer.button == 0) && (e->pointer.mouse_grabbed != 0))
406 { 406 {
407 INFO("restore to 0 grabs (from %i)", e->pointer.mouse_grabbed); 407 INF("restore to 0 grabs (from %i)", e->pointer.mouse_grabbed);
408 e->pointer.mouse_grabbed = 0; 408 e->pointer.mouse_grabbed = 0;
409 } 409 }
410 _evas_unwalk(e); 410 _evas_unwalk(e);
diff --git a/legacy/evas/src/lib/canvas/evas_font_dir.c b/legacy/evas/src/lib/canvas/evas_font_dir.c
index 2d2fe47bf6..43d6d59ca7 100644
--- a/legacy/evas/src/lib/canvas/evas_font_dir.c
+++ b/legacy/evas/src/lib/canvas/evas_font_dir.c
@@ -394,7 +394,7 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
394 set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res); 394 set = FcFontSort(NULL, p_nm, FcTrue, NULL, &res);
395 if (!set) 395 if (!set)
396 { 396 {
397 ERROR("No fontconfig font matches '%s'. It was the last resource, no font found!", name); 397 ERR("No fontconfig font matches '%s'. It was the last resource, no font found!", name);
398 goto fc_end; 398 goto fc_end;
399 } 399 }
400 400
diff --git a/legacy/evas/src/lib/canvas/evas_main.c b/legacy/evas/src/lib/canvas/evas_main.c
index 07906d7b65..0b90ce5214 100644
--- a/legacy/evas/src/lib/canvas/evas_main.c
+++ b/legacy/evas/src/lib/canvas/evas_main.c
@@ -27,7 +27,7 @@ evas_init(void)
27 _evas_log_dom_global = eina_log_domain_register("evas_main",EVAS_DEFAULT_LOG_COLOR); 27 _evas_log_dom_global = eina_log_domain_register("evas_main",EVAS_DEFAULT_LOG_COLOR);
28 if (_evas_log_dom_global < 0) 28 if (_evas_log_dom_global < 0)
29 { 29 {
30 fprintf(stderr,"Error: Evas could not create a default log domain\n"); 30 EINA_LOG_ERR("Evas could not create a default log domain\n");
31 goto shutdown_eina; 31 goto shutdown_eina;
32 } 32 }
33 33
@@ -489,7 +489,7 @@ evas_output_viewport_set(Evas *e, Evas_Coord x, Evas_Coord y, Evas_Coord w, Evas
489 if (h <= 0) return; 489 if (h <= 0) return;
490 if ((x != 0) || (y != 0)) 490 if ((x != 0) || (y != 0))
491 { 491 {
492 ERROR("EVAS: compat error. viewport x,y != 0,0 not supported"); 492 ERR("Compat error. viewport x,y != 0,0 not supported");
493 x = 0; 493 x = 0;
494 y = 0; 494 y = 0;
495 } 495 }
diff --git a/legacy/evas/src/lib/canvas/evas_object_box.c b/legacy/evas/src/lib/canvas/evas_object_box.c
index 8bf66a9e63..53a5971f2c 100644
--- a/legacy/evas/src/lib/canvas/evas_object_box.c
+++ b/legacy/evas/src/lib/canvas/evas_object_box.c
@@ -32,7 +32,7 @@ struct _Evas_Object_Box_Accessor
32 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 32 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
33 if (!ptr) \ 33 if (!ptr) \
34 { \ 34 { \
35 CRITICAL("no widget data for object %p (%s)", \ 35 CRIT("no widget data for object %p (%s)", \
36 o, evas_object_type_get(o)); \ 36 o, evas_object_type_get(o)); \
37 fflush(stderr); \ 37 fflush(stderr); \
38 abort(); \ 38 abort(); \
@@ -43,7 +43,7 @@ struct _Evas_Object_Box_Accessor
43 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \ 43 EVAS_OBJECT_BOX_DATA_GET(o, ptr); \
44 if (!ptr) \ 44 if (!ptr) \
45 { \ 45 { \
46 CRITICAL("no widget data for object %p (%s)", \ 46 CRIT("no widget data for object %p (%s)", \
47 o, evas_object_type_get(o)); \ 47 o, evas_object_type_get(o)); \
48 fflush(stderr); \ 48 fflush(stderr); \
49 abort(); \ 49 abort(); \
@@ -374,15 +374,15 @@ _evas_object_box_remove_at_default(Evas_Object *o, Evas_Object_Box_Data *priv, u
374 374
375 if ((!api) || (!api->option_free)) 375 if ((!api) || (!api->option_free))
376 { 376 {
377 fputs("WARNING: api->option_free not set (may cause memory leaks," 377 WRN("api->option_free not set (may cause memory leaks,"
378 " segfaults)\n", stderr); 378 " segfaults)\n");
379 return NULL; 379 return NULL;
380 } 380 }
381 381
382 node = eina_list_nth_list(priv->children, pos); 382 node = eina_list_nth_list(priv->children, pos);
383 if (!node) 383 if (!node)
384 { 384 {
385 ERROR("ERROR: no item to be removed at position %d\n", pos); 385 ERR("No item to be removed at position %d\n", pos);
386 return NULL; 386 return NULL;
387 } 387 }
388 388
@@ -408,7 +408,7 @@ _evas_object_box_smart_add(Evas_Object *o)
408 priv = (Evas_Object_Box_Data *)calloc(1, sizeof(*priv)); 408 priv = (Evas_Object_Box_Data *)calloc(1, sizeof(*priv));
409 if (!priv) 409 if (!priv)
410 { 410 {
411 fputs("ERROR: could not allocate object private data.\n", stderr); 411 ERR("Could not allocate object private data.\n");
412 return; 412 return;
413 } 413 }
414 414
@@ -441,8 +441,8 @@ _evas_object_box_smart_del(Evas_Object *o)
441 api = priv->api; 441 api = priv->api;
442 if ((!api) || (!api->option_free)) 442 if ((!api) || (!api->option_free))
443 { 443 {
444 fputs("WARNING: api->option_free not set (may cause memory leaks," 444 WRN("api->option_free not set (may cause memory leaks,"
445 " segfaults)\n", stderr); 445 " segfaults)\n");
446 return; 446 return;
447 } 447 }
448 448
@@ -478,7 +478,7 @@ _evas_object_box_smart_calculate(Evas_Object *o)
478 if (priv->layout.cb) 478 if (priv->layout.cb)
479 priv->layout.cb(o, priv, priv->layout.data); 479 priv->layout.cb(o, priv, priv->layout.data);
480 else 480 else
481 ERROR("No layout function set for %p box.", o); 481 ERR("No layout function set for %p box.", o);
482} 482}
483 483
484static Evas_Smart * 484static Evas_Smart *
diff --git a/legacy/evas/src/lib/canvas/evas_object_image.c b/legacy/evas/src/lib/canvas/evas_object_image.c
index b55f2b632d..e94fb6cfe5 100644
--- a/legacy/evas/src/lib/canvas/evas_object_image.c
+++ b/legacy/evas/src/lib/canvas/evas_object_image.c
@@ -2533,7 +2533,7 @@ evas_object_image_render_pre(Evas_Object *obj)
2533 2533
2534 if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1)) 2534 if ((o->cur.fill.w < 1) || (o->cur.fill.h < 1))
2535 { 2535 {
2536 ERROR("evas image: %p has invalid fill size: %dx%d. Ignored", 2536 ERR("%p has invalid fill size: %dx%d. Ignored",
2537 obj, o->cur.fill.w, o->cur.fill.h); 2537 obj, o->cur.fill.w, o->cur.fill.h);
2538 return; 2538 return;
2539 } 2539 }
diff --git a/legacy/evas/src/lib/canvas/evas_object_smart.c b/legacy/evas/src/lib/canvas/evas_object_smart.c
index 07fdd469be..cb9b622976 100644
--- a/legacy/evas/src/lib/canvas/evas_object_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_object_smart.c
@@ -174,26 +174,26 @@ evas_object_smart_member_add(Evas_Object *obj, Evas_Object *smart_obj)
174 174
175 if (obj->delete_me) 175 if (obj->delete_me)
176 { 176 {
177 ERROR("Adding deleted object %p to smart obj %p", obj, smart_obj); 177 CRIT("Adding deleted object %p to smart obj %p", obj, smart_obj);
178 abort(); 178 abort();
179 return; 179 return;
180 } 180 }
181 if (smart_obj->delete_me) 181 if (smart_obj->delete_me)
182 { 182 {
183 ERROR("Adding object %p to deleted smart obj %p", obj, smart_obj); 183 CRIT("Adding object %p to deleted smart obj %p", obj, smart_obj);
184 abort(); 184 abort();
185 return; 185 return;
186 } 186 }
187 if (!smart_obj->layer) 187 if (!smart_obj->layer)
188 { 188 {
189 ERROR("No evas surface associated with smart object (%p)", smart_obj); 189 CRIT("No evas surface associated with smart object (%p)", smart_obj);
190 abort(); 190 abort();
191 return; 191 return;
192 } 192 }
193 if (obj->layer && smart_obj->layer 193 if (obj->layer && smart_obj->layer
194 && obj->layer->evas != smart_obj->layer->evas) 194 && obj->layer->evas != smart_obj->layer->evas)
195 { 195 {
196 ERROR("EVAS ERROR: Adding object %p from Evas (%p) from another Evas (%p)", obj, obj->layer->evas, smart_obj->layer->evas); 196 CRIT("Adding object %p from Evas (%p) from another Evas (%p)", obj, obj->layer->evas, smart_obj->layer->evas);
197 abort(); 197 abort();
198 return; 198 return;
199 } 199 }
diff --git a/legacy/evas/src/lib/canvas/evas_object_table.c b/legacy/evas/src/lib/canvas/evas_object_table.c
index 483b6ba0ae..44a8ee755d 100644
--- a/legacy/evas/src/lib/canvas/evas_object_table.c
+++ b/legacy/evas/src/lib/canvas/evas_object_table.c
@@ -93,8 +93,8 @@ struct _Evas_Object_Table_Accessor
93 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ 93 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
94 if (!ptr) \ 94 if (!ptr) \
95 { \ 95 { \
96 CRITICAL("CRITICAL: no widget data for object %p (%s)", \ 96 CRIT("no widget data for object %p (%s)", \
97 o, evas_object_type_get(o)); \ 97 o, evas_object_type_get(o)); \
98 abort(); \ 98 abort(); \
99 return; \ 99 return; \
100} 100}
@@ -103,7 +103,7 @@ struct _Evas_Object_Table_Accessor
103 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \ 103 EVAS_OBJECT_TABLE_DATA_GET(o, ptr); \
104 if (!ptr) \ 104 if (!ptr) \
105 { \ 105 { \
106 CRITICAL("No widget data for object %p (%s)", \ 106 CRIT("No widget data for object %p (%s)", \
107 o, evas_object_type_get(o)); \ 107 o, evas_object_type_get(o)); \
108 abort(); \ 108 abort(); \
109 return val; \ 109 return val; \
@@ -170,7 +170,7 @@ _evas_object_table_cache_alloc(int cols, int rows)
170 cache = malloc(size); 170 cache = malloc(size);
171 if (!cache) 171 if (!cache)
172 { 172 {
173 ERROR("Could not allocate table cache %dx%d (%d bytes): %s", 173 ERR("Could not allocate table cache %dx%d (%d bytes): %s",
174 cols, rows, size, strerror(errno)); 174 cols, rows, size, strerror(errno));
175 return NULL; 175 return NULL;
176 } 176 }
@@ -322,7 +322,7 @@ _evas_object_table_calculate_cell(const Evas_Object_Table_Option *opt, Evas_Coor
322/* } */ 322/* } */
323/* else if (min < 1) */ 323/* else if (min < 1) */
324/* { */ 324/* { */
325/* WARN("Child %p [%s, %s] has no minimum width " */ 325/* WRN("Child %p [%s, %s] has no minimum width " */
326/* "and no %s expand (weight is not > 0.0). " */ 326/* "and no %s expand (weight is not > 0.0). " */
327/* "Assuming weight > 0.0\n", */ 327/* "Assuming weight > 0.0\n", */
328/* child, evas_object_type_get(child), evas_object_name_get(child), */ 328/* child, evas_object_type_get(child), evas_object_name_get(child), */
@@ -429,13 +429,13 @@ _evas_object_table_calculate_hints_homogeneous(Evas_Object *o, Evas_Object_Table
429 { 429 {
430 if (o_minw < 1) 430 if (o_minw < 1)
431 { 431 {
432 ERROR("homogeneous table based on item size but no " 432 ERR("homogeneous table based on item size but no "
433 "horizontal mininum size specified! Using expand."); 433 "horizontal mininum size specified! Using expand.");
434 expand_h = 1; 434 expand_h = 1;
435 } 435 }
436 if (o_minh < 1) 436 if (o_minh < 1)
437 { 437 {
438 ERROR("homogeneous table based on item size but no " 438 ERR("homogeneous table based on item size but no "
439 "vertical mininum size specified! Using expand."); 439 "vertical mininum size specified! Using expand.");
440 expand_v = 1; 440 expand_v = 1;
441 } 441 }
@@ -746,7 +746,7 @@ _evas_object_table_calculate_layout_regular(Evas_Object *o, Evas_Object_Table_Da
746 cols = malloc(size); 746 cols = malloc(size);
747 if (!cols) 747 if (!cols)
748 { 748 {
749 ERROR("Could not allocate temp columns (%d bytes): %s", 749 ERR("Could not allocate temp columns (%d bytes): %s",
750 size, strerror(errno)); 750 size, strerror(errno));
751 return; 751 return;
752 } 752 }
@@ -769,7 +769,7 @@ _evas_object_table_calculate_layout_regular(Evas_Object *o, Evas_Object_Table_Da
769 rows = malloc(size); 769 rows = malloc(size);
770 if (!rows) 770 if (!rows)
771 { 771 {
772 ERROR("could not allocate temp rows (%d bytes): %s", 772 ERR("could not allocate temp rows (%d bytes): %s",
773 size, strerror(errno)); 773 size, strerror(errno));
774 goto end; 774 goto end;
775 } 775 }
@@ -826,7 +826,7 @@ _evas_object_table_smart_add(Evas_Object *o)
826 priv = calloc(1, sizeof(*priv)); 826 priv = calloc(1, sizeof(*priv));
827 if (!priv) 827 if (!priv)
828 { 828 {
829 ERROR("could not allocate object private data."); 829 ERR("could not allocate object private data.");
830 return; 830 return;
831 } 831 }
832 evas_object_smart_data_set(o, priv); 832 evas_object_smart_data_set(o, priv);
@@ -884,7 +884,7 @@ _evas_object_table_smart_calculate(Evas_Object *o)
884 884
885 if ((priv->size.cols < 1) || (priv->size.rows < 1)) 885 if ((priv->size.cols < 1) || (priv->size.rows < 1))
886 { 886 {
887 DEBUG("Nothing to do: cols=%d, rows=%d", 887 DBG("Nothing to do: cols=%d, rows=%d",
888 priv->size.cols, priv->size.rows); 888 priv->size.cols, priv->size.rows);
889 return; 889 return;
890 } 890 }
@@ -1118,26 +1118,26 @@ evas_object_table_pack(Evas_Object *o, Evas_Object *child, unsigned short col, u
1118 1118
1119 if (rowspan < 1) 1119 if (rowspan < 1)
1120 { 1120 {
1121 ERROR("rowspan < 1"); 1121 ERR("rowspan < 1");
1122 return EINA_FALSE; 1122 return EINA_FALSE;
1123 } 1123 }
1124 if (colspan < 1) 1124 if (colspan < 1)
1125 { 1125 {
1126 ERROR("colspan < 1"); 1126 ERR("colspan < 1");
1127 return EINA_FALSE; 1127 return EINA_FALSE;
1128 } 1128 }
1129 1129
1130 opt = _evas_object_table_option_get(child); 1130 opt = _evas_object_table_option_get(child);
1131 if (opt) 1131 if (opt)
1132 { 1132 {
1133 ERROR("cannot add object that is already part of a table!"); 1133 ERR("cannot add object that is already part of a table!");
1134 return EINA_FALSE; 1134 return EINA_FALSE;
1135 } 1135 }
1136 1136
1137 opt = malloc(sizeof(*opt)); 1137 opt = malloc(sizeof(*opt));
1138 if (!opt) 1138 if (!opt)
1139 { 1139 {
1140 ERROR("could not allocate table option data."); 1140 ERR("could not allocate table option data.");
1141 return EINA_FALSE; 1141 return EINA_FALSE;
1142 } 1142 }
1143 1143
@@ -1241,14 +1241,14 @@ evas_object_table_unpack(Evas_Object *o, Evas_Object *child)
1241 1241
1242 if (o != evas_object_smart_parent_get(child)) 1242 if (o != evas_object_smart_parent_get(child))
1243 { 1243 {
1244 ERROR("cannot unpack child from incorrect table!"); 1244 ERR("cannot unpack child from incorrect table!");
1245 return EINA_FALSE; 1245 return EINA_FALSE;
1246 } 1246 }
1247 1247
1248 opt = _evas_object_table_option_del(child); 1248 opt = _evas_object_table_option_del(child);
1249 if (!opt) 1249 if (!opt)
1250 { 1250 {
1251 ERROR("cannot unpack child with no packing option!"); 1251 ERR("cannot unpack child with no packing option!");
1252 return EINA_FALSE; 1252 return EINA_FALSE;
1253 } 1253 }
1254 1254
diff --git a/legacy/evas/src/lib/canvas/evas_render.c b/legacy/evas/src/lib/canvas/evas_render.c
index 39eb429916..99e32775fc 100644
--- a/legacy/evas/src/lib/canvas/evas_render.c
+++ b/legacy/evas/src/lib/canvas/evas_render.c
@@ -404,7 +404,7 @@ evas_render_updates_internal(Evas *e, unsigned char make_updates, unsigned char
404 } 404 }
405 if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h)) 405 if ((e->output.w != e->viewport.w) || (e->output.h != e->viewport.h))
406 { 406 {
407 ERROR("viewport size != output size!"); 407 ERR("viewport size != output size!");
408 } 408 }
409 /* phase 5. add obscures */ 409 /* phase 5. add obscures */
410 EINA_LIST_FOREACH(e->obscures, ll, r) 410 EINA_LIST_FOREACH(e->obscures, ll, r)
diff --git a/legacy/evas/src/lib/canvas/evas_smart.c b/legacy/evas/src/lib/canvas/evas_smart.c
index 09769e1736..83309dcb8b 100644
--- a/legacy/evas/src/lib/canvas/evas_smart.c
+++ b/legacy/evas/src/lib/canvas/evas_smart.c
@@ -65,7 +65,7 @@ evas_smart_new(const char *name,
65 Evas_Smart *s; 65 Evas_Smart *s;
66 Evas_Smart_Class *sc; 66 Evas_Smart_Class *sc;
67 67
68 WARN("----- WARNING. evas_smart_new() will be deprecated and removed soon" 68 WRN("----- WARNING. evas_smart_new() will be deprecated and removed soon"
69 "----- Please use evas_smart_class_new() instead"); 69 "----- Please use evas_smart_class_new() instead");
70 70
71 if (!name) return NULL; 71 if (!name) return NULL;
diff --git a/legacy/evas/src/lib/canvas/evas_stack.c b/legacy/evas/src/lib/canvas/evas_stack.c
index 84e600a883..f0b04c45f6 100644
--- a/legacy/evas/src/lib/canvas/evas_stack.c
+++ b/legacy/evas/src/lib/canvas/evas_stack.c
@@ -187,7 +187,7 @@ evas_object_stack_above(Evas_Object *obj, Evas_Object *above)
187 { 187 {
188 if (obj->smart.parent != above->smart.parent) 188 if (obj->smart.parent != above->smart.parent)
189 { 189 {
190// ERROR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above); 190// ERR("BITCH! evas_object_stack_above(), %p not inside same smart as %p!", obj, above);
191 return; 191 return;
192 } 192 }
193 evas_object_smart_member_stack_above(obj, above); 193 evas_object_smart_member_stack_above(obj, above);
@@ -275,7 +275,7 @@ evas_object_stack_below(Evas_Object *obj, Evas_Object *below)
275 { 275 {
276 if (obj->smart.parent != below->smart.parent) 276 if (obj->smart.parent != below->smart.parent)
277 { 277 {
278// ERROR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below); 278// ERR("BITCH! evas_object_stack_below(), %p not inside same smart as %p!", obj, below);
279 return; 279 return;
280 } 280 }
281 evas_object_smart_member_stack_below(obj, below); 281 evas_object_smart_member_stack_below(obj, below);
diff --git a/legacy/evas/src/lib/cserve/evas_cs_client.c b/legacy/evas/src/lib/cserve/evas_cs_client.c
index ea3da306b2..18f2c4ab5e 100644
--- a/legacy/evas/src/lib/cserve/evas_cs_client.c
+++ b/legacy/evas/src/lib/cserve/evas_cs_client.c
@@ -145,7 +145,7 @@ server_read(Server *s, int channel, int *opcode, int *size)
145 if ((*size < 0) || (*size > (1024 * 1024))) return NULL; 145 if ((*size < 0) || (*size > (1024 * 1024))) return NULL;
146 if (ints[2] != (s->ch[channel].req_from + 1)) 146 if (ints[2] != (s->ch[channel].req_from + 1))
147 { 147 {
148 ERROR("EEK! sequence number mismatch from serer with pid: %i\n" 148 ERR("EEK! sequence number mismatch from serer with pid: %i\n"
149 "---- num %i is not 1 more than %i" 149 "---- num %i is not 1 more than %i"
150 , 150 ,
151 s->pid, ints[2], s->ch[channel].req_from); 151 s->pid, ints[2], s->ch[channel].req_from);
diff --git a/legacy/evas/src/lib/cserve/evas_cs_server.c b/legacy/evas/src/lib/cserve/evas_cs_server.c
index d73f04278d..c3fb6dfa43 100644
--- a/legacy/evas/src/lib/cserve/evas_cs_server.c
+++ b/legacy/evas/src/lib/cserve/evas_cs_server.c
@@ -225,7 +225,7 @@ server_parse(Server *s, Client *c)
225 data = c->inbuf + (sizeof(int) * 3); 225 data = c->inbuf + (sizeof(int) * 3);
226 if (ints[2] != (c->req_from + 1)) 226 if (ints[2] != (c->req_from + 1))
227 { 227 {
228 ERROR("EEK! sequence number mismatch from client with pid: %i\n" 228 ERR("EEK! sequence number mismatch from client with pid: %i\n"
229 "---- num %i is not 1 more than %i" 229 "---- num %i is not 1 more than %i"
230 , 230 ,
231 c->pid, ints[2], c->req_from); 231 c->pid, ints[2], c->req_from);
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_main.c b/legacy/evas/src/lib/engines/common/evas_convert_main.c
index a460109db9..9d369005f0 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_convert_main.c
@@ -591,7 +591,7 @@ evas_common_convert_func_get(DATA8 *dest, int w, int h, int depth, DATA32 rmask,
591 } 591 }
592#endif 592#endif
593 } 593 }
594 INFO("depth = %i mode = %i", depth, pal_mode); 594 INF("depth = %i mode = %i", depth, pal_mode);
595 if (depth == 8) 595 if (depth == 8)
596 { 596 {
597#ifdef BUILD_CONVERT_8_RGB_332 597#ifdef BUILD_CONVERT_8_RGB_332
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
index f46f770549..143f1507b0 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
+++ b/legacy/evas/src/lib/engines/common/evas_convert_rgb_16.c
@@ -715,7 +715,7 @@ evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180 (DATA32 *src, DATA8 *dst,
715 715
716 dst_ptr = (DATA16 *)dst; 716 dst_ptr = (DATA16 *)dst;
717 717
718 ERROR("evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180"); 718 ERR("evas_common_convert_rgba_to_16bpp_bgr_565_dith_rot_180");
719 719
720 CONVERT_LOOP_START_ROT_180(); 720 CONVERT_LOOP_START_ROT_180();
721 721
diff --git a/legacy/evas/src/lib/engines/common/evas_cpu.c b/legacy/evas/src/lib/engines/common/evas_cpu.c
index f4cc528e30..b0797f3050 100644
--- a/legacy/evas/src/lib/engines/common/evas_cpu.c
+++ b/legacy/evas/src/lib/engines/common/evas_cpu.c
@@ -221,7 +221,7 @@ evas_common_cpu_can_do(int *mmx, int *sse, int *sse2)
221 if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1; 221 if (cpu_feature_mask & CPU_FEATURE_MMX2) do_sse = 1;
222 if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1; 222 if (cpu_feature_mask & CPU_FEATURE_SSE) do_sse = 1;
223 } 223 }
224// INFO("%i %i %i", do_mmx, do_sse, do_sse2); 224// INF("%i %i %i", do_mmx, do_sse, do_sse2);
225 *mmx = do_mmx; 225 *mmx = do_mmx;
226 *sse = do_sse; 226 *sse = do_sse;
227 *sse2 = do_sse2; 227 *sse2 = do_sse2;
diff --git a/legacy/evas/src/lib/engines/common/evas_font_query.c b/legacy/evas/src/lib/engines/common/evas_font_query.c
index d962d6b10b..43cec87c4a 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_query.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_query.c
@@ -149,7 +149,7 @@ evas_common_font_query_inset(RGBA_Font *fn, const char *text)
149 fg = evas_common_font_int_cache_glyph_get(fi, index); 149 fg = evas_common_font_int_cache_glyph_get(fi, index);
150 if (!fg) return 0; 150 if (!fg) return 0;
151/* 151/*
152 INFO("fg->glyph_out->left = %i\n" 152 INF("fg->glyph_out->left = %i\n"
153 "fi->src->ft.face->glyph->bitmap_left = %i\n" 153 "fi->src->ft.face->glyph->bitmap_left = %i\n"
154 "fi->src->ft.face->glyph->metrics.horiBearingX = %i\n" 154 "fi->src->ft.face->glyph->metrics.horiBearingX = %i\n"
155 "fi->src->ft.face->glyph->metrics.horiBearingY = %i\n" 155 "fi->src->ft.face->glyph->metrics.horiBearingY = %i\n"
diff --git a/legacy/evas/src/lib/engines/common/evas_image_main.c b/legacy/evas/src/lib/engines/common/evas_image_main.c
index 4e1fe3ac14..5827bef4da 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_main.c
@@ -53,7 +53,7 @@ static int _evas_common_rgba_image_dirty(Image_Entry* dst, const I
53static void 53static void
54_evas_common_rgba_image_debug(const char* context, Image_Entry *eim) 54_evas_common_rgba_image_debug(const char* context, Image_Entry *eim)
55{ 55{
56 DEBUG("%p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h); 56 DBG("%p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h);
57} 57}
58 58
59static const Evas_Cache_Image_Func _evas_common_image_func = 59static const Evas_Cache_Image_Func _evas_common_image_func =
@@ -83,7 +83,7 @@ evas_common_image_init(void)
83 if (!eci) 83 if (!eci)
84 eci = evas_cache_image_init(&_evas_common_image_func); 84 eci = evas_cache_image_init(&_evas_common_image_func);
85 reference++; 85 reference++;
86//// ERROR("REF++=%i", reference); 86//// ERR("REF++=%i", reference);
87 87
88#ifdef BUILD_LOADER_EET 88#ifdef BUILD_LOADER_EET
89 eet_init(); 89 eet_init();
diff --git a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
index d66b2501b6..ec8a5255cb 100644
--- a/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
+++ b/legacy/evas/src/lib/engines/common/evas_image_scalecache.c
@@ -118,7 +118,7 @@ evas_common_rgba_image_scalecache_dirty(Image_Entry *ie)
118 im->cache.list = eina_list_remove(im->cache.list, sci); 118 im->cache.list = eina_list_remove(im->cache.list, sci);
119 if (sci->im) 119 if (sci->im)
120 { 120 {
121// INFO(" 0- %i", sci->dst_w * sci->dst_h * 4); 121// INF(" 0- %i", sci->dst_w * sci->dst_h * 4);
122 LKL(cache_lock); 122 LKL(cache_lock);
123 evas_common_rgba_image_free(&sci->im->cache_entry); 123 evas_common_rgba_image_free(&sci->im->cache_entry);
124 if (!sci->forced_unload) 124 if (!sci->forced_unload)
@@ -185,7 +185,7 @@ _sci_fix_newest(RGBA_Image *im)
185 if (sci->usage_count > im->cache.newest_usage_count) 185 if (sci->usage_count > im->cache.newest_usage_count)
186 im->cache.newest_usage_count = sci->usage_count; 186 im->cache.newest_usage_count = sci->usage_count;
187 } 187 }
188// INFO("_sci_fix_newest! -> %i", im->cache.newest_usage); 188// INF("_sci_fix_newest! -> %i", im->cache.newest_usage);
189} 189}
190 190
191static Scaleitem * 191static Scaleitem *
@@ -233,7 +233,7 @@ _sci_find(RGBA_Image *im,
233 cache_size -= sci->dst_w * sci->dst_h * 4; 233 cache_size -= sci->dst_w * sci->dst_h * 4;
234 else 234 else
235 cache_size -= sci->size_adjust; 235 cache_size -= sci->size_adjust;
236// INFO(" 1- %i", sci->dst_w * sci->dst_h * 4); 236// INF(" 1- %i", sci->dst_w * sci->dst_h * 4);
237 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci); 237 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
238 } 238 }
239 if (max_scale_items < 1) return NULL; 239 if (max_scale_items < 1) return NULL;
@@ -291,11 +291,11 @@ _cache_prune(Scaleitem *notsci, Eina_Bool copies_only)
291 cache_size -= sci->dst_w * sci->dst_h * 4; 291 cache_size -= sci->dst_w * sci->dst_h * 4;
292 else 292 else
293 cache_size -= sci->size_adjust; 293 cache_size -= sci->size_adjust;
294// INFO(" 2- %i", sci->dst_w * sci->dst_h * 4); 294// INF(" 2- %i", sci->dst_w * sci->dst_h * 4);
295 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci); 295 cache_list = eina_inlist_remove(cache_list, (Eina_Inlist *)sci);
296 memset(sci, 0, sizeof(Eina_Inlist)); 296 memset(sci, 0, sizeof(Eina_Inlist));
297 } 297 }
298// INFO("FLUSH %i > %i", cache_size, max_cache_size); 298// INF("FLUSH %i > %i", cache_size, max_cache_size);
299 } 299 }
300} 300}
301#endif 301#endif
@@ -385,7 +385,7 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst,
385 LKU(im->cache.lock); 385 LKU(im->cache.lock);
386 return; 386 return;
387 } 387 }
388// INFO("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i", 388// INF("%10i | %4i %4i %4ix%4i -> %4i %4i %4ix%4i | %i",
389// (int)use_counter, 389// (int)use_counter,
390// src_region_x, src_region_y, src_region_w, src_region_h, 390// src_region_x, src_region_y, src_region_w, src_region_h,
391// dst_region_x, dst_region_y, dst_region_w, dst_region_h, 391// dst_region_x, dst_region_y, dst_region_w, dst_region_h,
@@ -413,12 +413,12 @@ evas_common_rgba_image_scalecache_prepare(Image_Entry *ie, RGBA_Image *dst,
413 LKU(cache_lock); 413 LKU(cache_lock);
414 if (sci->usage > im->cache.newest_usage) 414 if (sci->usage > im->cache.newest_usage)
415 im->cache.newest_usage = sci->usage; 415 im->cache.newest_usage = sci->usage;
416// INFO("newset? %p %i > %i", im, 416// INF("newset? %p %i > %i", im,
417// (int)sci->usage, 417// (int)sci->usage,
418// (int)im->cache.newest_usage); 418// (int)im->cache.newest_usage);
419 if (sci->usage_count > im->cache.newest_usage_count) 419 if (sci->usage_count > im->cache.newest_usage_count)
420 im->cache.newest_usage_count = sci->usage_count; 420 im->cache.newest_usage_count = sci->usage_count;
421// INFO(" -------------- used %8i#, %8i@", (int)sci->usage, (int)sci->usage_count); 421// INF(" -------------- used %8i#, %8i@", (int)sci->usage, (int)sci->usage_count);
422 LKU(im->cache.lock); 422 LKU(im->cache.lock);
423#endif 423#endif
424} 424}
@@ -449,7 +449,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
449 i++; 449 i++;
450 if (i > 2000) 450 if (i > 2000)
451 { 451 {
452 INFO("p: %6i, h: %6i, m: %6i, n: %6i", 452 INF("p: %6i, h: %6i, m: %6i, n: %6i",
453 pops, hits, misses, noscales); 453 pops, hits, misses, noscales);
454 i = 0; 454 i = 0;
455 } 455 }
@@ -552,7 +552,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
552 } 552 }
553 if (sci->populate_me) 553 if (sci->populate_me)
554 { 554 {
555// INFO("##! populate!"); 555// INF("##! populate!");
556 sci->im = evas_common_image_new 556 sci->im = evas_common_image_new
557 (dst_region_w, dst_region_h, im->cache_entry.flags.alpha); 557 (dst_region_w, dst_region_h, im->cache_entry.flags.alpha);
558 if (sci->im) 558 if (sci->im)
@@ -625,7 +625,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
625 { 625 {
626 cache_size += sci->dst_w * sci->dst_h * 4; 626 cache_size += sci->dst_w * sci->dst_h * 4;
627 } 627 }
628// INFO(" + %i @ flop: %i (%ix%i)", 628// INF(" + %i @ flop: %i (%ix%i)",
629// sci->dst_w * sci->dst_h * 4, sci->flop, 629// sci->dst_w * sci->dst_h * 4, sci->flop,
630// sci->dst_w, sci->dst_h); 630// sci->dst_w, sci->dst_h);
631 cache_list = eina_inlist_append(cache_list, (Eina_Inlist *)sci); 631 cache_list = eina_inlist_append(cache_list, (Eina_Inlist *)sci);
@@ -645,7 +645,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
645 { 645 {
646 if (sci->flop > 0) sci->flop -= FLOP_DEL; 646 if (sci->flop > 0) sci->flop -= FLOP_DEL;
647 } 647 }
648// INFO("use cached!"); 648// INF("use cached!");
649 evas_common_scale_rgba_in_to_out_clip_sample 649 evas_common_scale_rgba_in_to_out_clip_sample
650 (sci->im, dst, dc, 650 (sci->im, dst, dc,
651 0, 0, 651 0, 0,
@@ -653,7 +653,7 @@ evas_common_rgba_image_scalecache_do(Image_Entry *ie, RGBA_Image *dst,
653 dst_region_x, dst_region_y, 653 dst_region_x, dst_region_y,
654 dst_region_w, dst_region_h); 654 dst_region_w, dst_region_h);
655// hits++; 655// hits++;
656// INFO("check %p %i < %i", 656// INF("check %p %i < %i",
657// im, 657// im,
658// (int)im->cache.orig_usage, 658// (int)im->cache.orig_usage,
659// (int)im->cache.newest_usage); 659// (int)im->cache.newest_usage);
diff --git a/legacy/evas/src/lib/engines/common/evas_pipe.c b/legacy/evas/src/lib/engines/common/evas_pipe.c
index 9ef20e4a14..a9fee85e12 100644
--- a/legacy/evas/src/lib/engines/common/evas_pipe.c
+++ b/legacy/evas/src/lib/engines/common/evas_pipe.c
@@ -75,7 +75,7 @@ evas_common_pipe_thread(void *data)
75{ 75{
76 Thinfo *thinfo; 76 Thinfo *thinfo;
77 77
78// INFO("TH [..........."); 78// INF("TH [...........");
79 thinfo = data; 79 thinfo = data;
80 for (;;) 80 for (;;)
81 { 81 {
@@ -83,13 +83,13 @@ evas_common_pipe_thread(void *data)
83 RGBA_Pipe *p; 83 RGBA_Pipe *p;
84 84
85 /* wait for start signal */ 85 /* wait for start signal */
86// INFO(" TH %i START...", thinfo->thread_num); 86// INF(" TH %i START...", thinfo->thread_num);
87 pthread_barrier_wait(&(thinfo->barrier[0])); 87 pthread_barrier_wait(&(thinfo->barrier[0]));
88 info = thinfo->info; 88 info = thinfo->info;
89// if (info) 89// if (info)
90// { 90// {
91// thinfo->info = NULL; 91// thinfo->info = NULL;
92// INFO(" TH %i GO", thinfo->thread_num); 92// INF(" TH %i GO", thinfo->thread_num);
93 EINA_INLIST_FOREACH(EINA_INLIST_GET(info->im->pipe), p) 93 EINA_INLIST_FOREACH(EINA_INLIST_GET(info->im->pipe), p)
94 { 94 {
95 int i; 95 int i;
@@ -102,7 +102,7 @@ evas_common_pipe_thread(void *data)
102 } 102 }
103 free(info); 103 free(info);
104// } 104// }
105// INFO(" TH %i DONE", thinfo->thread_num); 105// INF(" TH %i DONE", thinfo->thread_num);
106 /* send finished signal */ 106 /* send finished signal */
107 pthread_barrier_wait(&(thinfo->barrier[1])); 107 pthread_barrier_wait(&(thinfo->barrier[1]));
108 } 108 }
diff --git a/legacy/evas/src/lib/engines/common/evas_tiler.c b/legacy/evas/src/lib/engines/common/evas_tiler.c
index c28641cc45..c29359f1fe 100644
--- a/legacy/evas/src/lib/engines/common/evas_tiler.c
+++ b/legacy/evas/src/lib/engines/common/evas_tiler.c
@@ -94,7 +94,7 @@ rect_init(rect_t *r, int x, int y, int w, int h)
94void 94void
95rect_print(const rect_t r) 95rect_print(const rect_t r)
96{ 96{
97 INFO("<rect(%d, %d, %d, %d)>", r.left, r.top, r.width, r.height); 97 INF("<rect(%d, %d, %d, %d)>", r.left, r.top, r.width, r.height);
98} 98}
99 99
100void 100void
@@ -716,7 +716,7 @@ rect_list_add_split_fuzzy(list_t *rects, list_node_t *node, int accepted_error)
716 */ 716 */
717 /* prev_cur_node = cur_node; */ 717 /* prev_cur_node = cur_node; */
718 /* cur_node = cur_node->next; */ 718 /* cur_node = cur_node->next; */
719 WARN("Should not get here!"); 719 WRN("Should not get here!");
720 abort(); 720 abort();
721 } 721 }
722 722
@@ -919,7 +919,7 @@ _add_redraw(list_t *rects, int max_w, int max_h, int x, int y, int w, int h)
919 rn = (rect_node_t *)rect_list_node_pool_get(); 919 rn = (rect_node_t *)rect_list_node_pool_get();
920 rn->_lst = list_node_zeroed; 920 rn->_lst = list_node_zeroed;
921 rect_init(&rn->rect, x, y, w, h); 921 rect_init(&rn->rect, x, y, w, h);
922 //INFO(stderr, "ACCOUNTING: add_redraw: %4d,%4d %3dx%3d", x, y, w, h); 922 //INF("ACCOUNTING: add_redraw: %4d,%4d %3dx%3d", x, y, w, h);
923 //testing on my core2 duo desktop - fuzz of 32 or 48 is best. 923 //testing on my core2 duo desktop - fuzz of 32 or 48 is best.
924#define FUZZ 32 924#define FUZZ 32
925 rect_list_add_split_fuzzy_and_merge(rects, (list_node_t *)rn, 925 rect_list_add_split_fuzzy_and_merge(rects, (list_node_t *)rn,
@@ -1007,7 +1007,7 @@ evas_common_tilebuf_del_redraw(Tilebuf *tb, int x, int y, int w, int h)
1007 if ((w <= 0) || (h <= 0)) return 0; 1007 if ((w <= 0) || (h <= 0)) return 0;
1008 1008
1009 rect_init(&r, x, y, w, h); 1009 rect_init(&r, x, y, w, h);
1010 //ERROR("ACCOUNTING: del_redraw: %4d,%4d %3dx%3d", x, y, w, h); 1010 //ERR("ACCOUNTING: del_redraw: %4d,%4d %3dx%3d", x, y, w, h);
1011 1011
1012 rect_list_del_split_strict(&tb->rects, r); 1012 rect_list_del_split_strict(&tb->rects, r);
1013 tb->need_merge = 1; 1013 tb->need_merge = 1;
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c
index 675be741da..b5b07d6a12 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_scaled_sampled.c
@@ -101,7 +101,7 @@ _soft16_image_draw_scaled_no_mul(Soft16_Image *src, Soft16_Image *dst,
101 _soft16_image_draw_scaled_solid_solid 101 _soft16_image_draw_scaled_solid_solid
102 (src, dst, dc, dst_offset, w, h, offset_x, offset_y); 102 (src, dst, dc, dst_offset, w, h, offset_x, offset_y);
103 else 103 else
104 ERROR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, " 104 ERR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, "
105 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL", 105 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL",
106 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha); 106 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha);
107} 107}
@@ -213,7 +213,7 @@ _soft16_image_draw_scaled_mul_alpha(Soft16_Image *src, Soft16_Image *dst,
213 _soft16_image_draw_scaled_solid_solid_mul_alpha 213 _soft16_image_draw_scaled_solid_solid_mul_alpha
214 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, a); 214 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, a);
215 else 215 else
216 ERROR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, " 216 ERR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, "
217 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d", 217 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d",
218 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col)); 218 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col));
219} 219}
@@ -395,7 +395,7 @@ _soft16_image_draw_scaled_mul_color(Soft16_Image *src, Soft16_Image *dst,
395 _soft16_image_draw_scaled_solid_solid_mul_color 395 _soft16_image_draw_scaled_solid_solid_mul_color
396 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, r, g, b, a); 396 (src, dst, dc, dst_offset, w, h, offset_x, offset_y, r, g, b, a);
397 else 397 else
398 ERROR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, " 398 ERR("Unsupported draw of scaled images src->cache_entry.flags.alpha=%d, "
399 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x", 399 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x",
400 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col); 400 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col);
401} 401}
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c
index fc782ad94a..b7a428dfa2 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_image_unscaled.c
@@ -60,7 +60,7 @@ _soft16_image_draw_unscaled_no_mul(Soft16_Image *src, Soft16_Image *dst,
60 src_offset, dst_offset, 60 src_offset, dst_offset,
61 width, height); 61 width, height);
62 else 62 else
63 ERROR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, " 63 ERR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, "
64 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL", 64 "dst->cache_entry.flags.alpha=%d, WITHOUT COLOR MUL",
65 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha); 65 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha);
66} 66}
@@ -127,7 +127,7 @@ _soft16_image_draw_unscaled_mul_alpha(Soft16_Image *src, Soft16_Image *dst,
127 _soft16_image_draw_unscaled_solid_solid_mul_alpha 127 _soft16_image_draw_unscaled_solid_solid_mul_alpha
128 (src, dst, dc, src_offset, dst_offset, width, height, a); 128 (src, dst, dc, src_offset, dst_offset, width, height, a);
129 else 129 else
130 ERROR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, " 130 ERR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, "
131 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d", 131 "dst->cache_entry.flags.alpha=%d, WITH ALPHA MUL %d",
132 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col)); 132 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, A_VAL(&dc->mul.col));
133} 133}
@@ -217,7 +217,7 @@ _soft16_image_draw_unscaled_mul_color(Soft16_Image *src, Soft16_Image *dst,
217 _soft16_image_draw_unscaled_solid_solid_mul_color 217 _soft16_image_draw_unscaled_solid_solid_mul_color
218 (src, dst, dc, src_offset, dst_offset, width, height, r, g, b, a); 218 (src, dst, dc, src_offset, dst_offset, width, height, r, g, b, a);
219 else 219 else
220 ERROR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, " 220 ERR("Unsupported draw of unscaled images src->cache_entry.flags.alpha=%d, "
221 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x", 221 "dst->cache_entry.flags.alpha=%d, WITH COLOR MUL 0x%08x",
222 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col); 222 src->cache_entry.flags.alpha, dst->cache_entry.flags.alpha, dc->mul.col);
223} 223}
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c
index 64b9cb83cc..415d137421 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_main.c
@@ -28,7 +28,7 @@ static int _evas_common_load_soft16_image_data_from_file(Image_Ent
28/* static void */ 28/* static void */
29/* _evas_common_soft16_image_debug(const char* context, Image_Entry *eim) */ 29/* _evas_common_soft16_image_debug(const char* context, Image_Entry *eim) */
30/* { */ 30/* { */
31/* DEBUG("[16] %p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h); */ 31/* DBG("[16] %p = [%s] {%s,%s} %i [%i|%i]", eim, context, eim->file, eim->key, eim->references, eim->w, eim->h); */
32/* } */ 32/* } */
33 33
34static const Evas_Cache_Image_Func _evas_common_soft16_image_func = 34static const Evas_Cache_Image_Func _evas_common_soft16_image_func =
diff --git a/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c b/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c
index dd5571df71..37b1d56c3a 100644
--- a/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c
+++ b/legacy/evas/src/lib/engines/common_16/evas_soft16_rectangle.c
@@ -71,7 +71,7 @@ _soft16_rectangle_draw_int(Soft16_Image *dst, RGBA_Draw_Context *dc,
71 (dst, dst_offset, dr.w, dr.h, rgb565, alpha); 71 (dst, dst_offset, dr.w, dr.h, rgb565, alpha);
72 } 72 }
73 else 73 else
74 ERROR("Unsupported feature: drawing rectangle to non-opaque destination."); 74 ERR("Unsupported feature: drawing rectangle to non-opaque destination.");
75} 75}
76 76
77void 77void
diff --git a/legacy/evas/src/lib/include/evas_common.h b/legacy/evas/src/lib/include/evas_common.h
index 924ee3adbe..377320ddb4 100644
--- a/legacy/evas/src/lib/include/evas_common.h
+++ b/legacy/evas/src/lib/include/evas_common.h
@@ -14,61 +14,40 @@
14 14
15/* macros needed to log message through eina_log */ 15/* macros needed to log message through eina_log */
16extern EAPI int _evas_log_dom_global; 16extern EAPI int _evas_log_dom_global;
17#ifdef _EVAS_DEFAULT_MODULE_LOG_DOM 17#ifdef _EVAS_DEFAULT_LOG_DOM
18# undef _EVAS_DEFAULT_MODULE_LOG_DOM 18# undef _EVAS_DEFAULT_LOG_DOM
19#endif 19#endif
20#define _EVAS_DEFAULT_MODULE_LOG_DOM _evas_log_dom_global 20#define _EVAS_DEFAULT_LOG_DOM _evas_log_dom_global
21 21
22#ifdef EVAS_DEFAULT_LOG_COLOR 22#ifdef EVAS_DEFAULT_LOG_COLOR
23# undef EVAS_DEFAULT_LOG_COLOR 23# undef EVAS_DEFAULT_LOG_COLOR
24#endif 24#endif
25#define EVAS_DEFAULT_LOG_COLOR "\033[36m" 25#define EVAS_DEFAULT_LOG_COLOR EINA_COLOR_BLUE
26#ifdef ERROR
27# undef ERROR
28#endif
29#define ERROR(...) EINA_LOG_DOM_ERR(_evas_log_dom_global, __VA_ARGS__)
30#ifdef DEBUG
31# undef DEBUG
32#endif
33#define DEBUG(...) EINA_LOG_DOM_DBG(_evas_log_dom_global, __VA_ARGS__)
34#ifdef INFO
35# undef INFO
36#endif
37#define INFO(...) EINA_LOG_DOM_INFO(_evas_log_dom_global, __VA_ARGS__)
38#ifdef WARN
39# undef WARN
40#endif
41#define WARN(...) EINA_LOG_DOM_WARN(_evas_log_dom_global, __VA_ARGS__)
42#ifdef CRITICAL
43# undef CRITICAL
44#endif
45#define CRITICAL(...) EINA_LOG_DOM_CRIT(_evas_log_dom_global, __VA_ARGS__)
46/**
47 * macros that are used all around the code for message processing
48 * four macros are defined ERR, WRN, DGB, INF.
49 * EFREET_MODULE_LOG_DOM should be defined individually for each module
50 */
51 26
52#ifdef ERR 27#ifdef ERR
53# undef ERR 28# undef ERR
54#endif 29#endif
55#define ERR(...) EINA_LOG_DOM_ERR(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__) 30#define ERR(...) EINA_LOG_DOM_ERR(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
31
56#ifdef DBG 32#ifdef DBG
57# undef DBG 33# undef DBG
58#endif 34#endif
59#define DBG(...) EINA_LOG_DOM_DBG(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__) 35#define DBG(...) EINA_LOG_DOM_DBG(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
36
60#ifdef INF 37#ifdef INF
61# undef INF 38# undef INF
62#endif 39#endif
63#define INF(...) EINA_LOG_DOM_INFO(_EVAS_DEFAULT__MODULE_LOG_DOM, __VA_ARGS__) 40#define INF(...) EINA_LOG_DOM_INFO(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
41
64#ifdef WRN 42#ifdef WRN
65# undef WRN 43# undef WRN
66#endif 44#endif
67#define WRN(...) EINA_LOG_DOM_WARN(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__) 45#define WRN(...) EINA_LOG_DOM_WARN(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
46
68#ifdef CRIT 47#ifdef CRIT
69# undef CRIT 48# undef CRIT
70#endif 49#endif
71#define CRIT(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_MODULE_LOG_DOM, __VA_ARGS__) 50#define CRIT(...) EINA_LOG_DOM_CRIT(_EVAS_DEFAULT_LOG_DOM, __VA_ARGS__)
72 51
73/*****************************************************************************/ 52/*****************************************************************************/
74 53
diff --git a/legacy/evas/src/lib/main.c b/legacy/evas/src/lib/main.c
index f95da6f136..a50e8cdd30 100644
--- a/legacy/evas/src/lib/main.c
+++ b/legacy/evas/src/lib/main.c
@@ -101,7 +101,7 @@ evas_debug_error(void)
101 _evas_debug_init = 1; 101 _evas_debug_init = 1;
102 } 102 }
103 if (_evas_debug_show) 103 if (_evas_debug_show)
104 DEBUG("*** EVAS ERROR: Evas Magic Check Failed!!!"); 104 DBG("*** EVAS ERROR: Evas Magic Check Failed!!!");
105} 105}
106 106
107void 107void
@@ -114,7 +114,7 @@ evas_debug_input_null(void)
114 _evas_debug_init = 1; 114 _evas_debug_init = 1;
115 } 115 }
116 if (_evas_debug_show) 116 if (_evas_debug_show)
117 DEBUG("Input object pointer is NULL!"); 117 DBG("Input object pointer is NULL!");
118 if (_evas_debug_abort) abort(); 118 if (_evas_debug_abort) abort();
119} 119}
120 120
@@ -128,7 +128,7 @@ evas_debug_magic_null(void)
128 _evas_debug_init = 1; 128 _evas_debug_init = 1;
129 } 129 }
130 if (_evas_debug_show) 130 if (_evas_debug_show)
131 DEBUG("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!"); 131 DBG("Input object is zero'ed out (maybe a freed object or zero-filled RAM)!");
132 if (_evas_debug_abort) abort(); 132 if (_evas_debug_abort) abort();
133} 133}
134 134
@@ -142,7 +142,7 @@ evas_debug_magic_wrong(DATA32 expected, DATA32 supplied)
142 _evas_debug_init = 1; 142 _evas_debug_init = 1;
143 } 143 }
144 if (_evas_debug_show) 144 if (_evas_debug_show)
145 DEBUG(" Input object is wrong type\n" 145 DBG(" Input object is wrong type\n"
146 " Expected: %08x - %s\n" 146 " Expected: %08x - %s\n"
147 " Supplied: %08x - %s", 147 " Supplied: %08x - %s",
148 expected, evas_debug_magic_string_get(expected), 148 expected, evas_debug_magic_string_get(expected),
@@ -160,7 +160,7 @@ evas_debug_generic(const char *str)
160 _evas_debug_init = 1; 160 _evas_debug_init = 1;
161 } 161 }
162 if (_evas_debug_show) 162 if (_evas_debug_show)
163 DEBUG("*** EVAS ERROR:\n" 163 DBG("*** EVAS ERROR:\n"
164 "%s", (char *)str); 164 "%s", (char *)str);
165 if (_evas_debug_abort) abort(); 165 if (_evas_debug_abort) abort();
166} 166}