summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/bin/evas/evas_cserve2_index.c6
-rw-r--r--src/bin/evas/evas_cserve2_slaves.c2
-rw-r--r--src/lib/evas/cserve2/evas_cs2_client.c4
3 files changed, 9 insertions, 3 deletions
diff --git a/src/bin/evas/evas_cserve2_index.c b/src/bin/evas/evas_cserve2_index.c
index 2c4d9dc15b..ce5b93a6fe 100644
--- a/src/bin/evas/evas_cserve2_index.c
+++ b/src/bin/evas/evas_cserve2_index.c
@@ -550,11 +550,15 @@ _shared_index_entry_get_by_id(Shared_Index *si, unsigned int id)
550 obj = (Index_Entry *) (base + (elemsize * id)); 550 obj = (Index_Entry *) (base + (elemsize * id));
551 if (obj->id == id) 551 if (obj->id == id)
552 return obj; 552 return obj;
553 if (obj->id < id)
554 low = id + 1;
555 else
556 high = id;
553 } 557 }
554 558
555 // Binary search 559 // Binary search
556 start_high = high; 560 start_high = high;
557 while(high != low) 561 while(high > low)
558 { 562 {
559 cur = low + ((high - low) / 2); 563 cur = low + ((high - low) / 2);
560 obj = (Index_Entry *) (base + (elemsize * cur)); 564 obj = (Index_Entry *) (base + (elemsize * cur));
diff --git a/src/bin/evas/evas_cserve2_slaves.c b/src/bin/evas/evas_cserve2_slaves.c
index 3bbf39d164..a1fc7f5c82 100644
--- a/src/bin/evas/evas_cserve2_slaves.c
+++ b/src/bin/evas/evas_cserve2_slaves.c
@@ -128,7 +128,7 @@ _slave_proc_dead_cb(int pid, int status EINA_UNUSED)
128{ 128{
129 Slave_Proc *s; 129 Slave_Proc *s;
130 130
131 DBG("Child dead with pid '%d'.", pid); 131 INF("Child dead with pid '%d'.", pid);
132 s = _slave_proc_find(pid); 132 s = _slave_proc_find(pid);
133 if (!s) 133 if (!s)
134 { 134 {
diff --git a/src/lib/evas/cserve2/evas_cs2_client.c b/src/lib/evas/cserve2/evas_cs2_client.c
index 4a005215ad..01bd8b74d0 100644
--- a/src/lib/evas/cserve2/evas_cs2_client.c
+++ b/src/lib/evas/cserve2/evas_cs2_client.c
@@ -1447,13 +1447,15 @@ _font_entry_glyph_map_rebuild_check(Font_Entry *fe, Font_Hint_Flags hints)
1447 fe->map->mempool.data + gl->offset; 1447 fe->map->mempool.data + gl->offset;
1448 gl->base.bitmap.num_grays = gd->num_grays; 1448 gl->base.bitmap.num_grays = gd->num_grays;
1449 gl->base.bitmap.pixel_mode = gd->pixel_mode; 1449 gl->base.bitmap.pixel_mode = gd->pixel_mode;
1450 gl->idx = gd->index;
1450 gl->rid = 0; 1451 gl->rid = 0;
1451 1452
1452 eina_clist_add_head(&fe->map->glyphs, &gl->map_entry); 1453 eina_clist_add_head(&fe->map->glyphs, &gl->map_entry);
1453 fash_gl_add(fe->fash[hints], gd->index, gl); 1454 fash_gl_add(fe->fash[hints], gd->index, gl);
1454 cnt++; 1455 cnt++;
1455 } 1456 }
1456 DBG("Added %d glyphs to the font hash (out of %d scanned)", cnt, tot); 1457 if (cnt)
1458 DBG("Added %d glyphs to the font hash (out of %d scanned)", cnt, tot);
1457 } 1459 }
1458 1460
1459 return cnt; 1461 return cnt;