Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_object_textblock.c
Log Message:
got rid of data subdirectory in pkgdatadir. fixed a bunch of warnings
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- evas_object_textblock.c 20 Feb 2005 08:02:41 -0000 1.44
+++ evas_object_textblock.c 23 Feb 2005 20:32:07 -0000 1.45
@@ -317,6 +317,8 @@
if (data[0] == '#')
{
int r, g, b, a;
+
+ r = g = b = a = 0;
if (strlen(data) == 7) /* #RRGGBB */
{
@@ -708,7 +710,7 @@
int inquote = 0, inescape = 0;
Evas_List *params = NULL;
- if (!format) return;
+ if (!format) return NULL;
p = format - 1;
do
{
@@ -1240,12 +1242,12 @@
}
else if (node->text)
{
- int inset = 0, hadvance = 0, vadvance = 0;
+ int inset = 0, hadvance = 0;
int ascent = 0, descent = 0, tw = 0, th = 0;
- int chrpos = -1, nchrpos = -1, x, y, cx, cy, cw, ch;
+ int chrpos = -1, nchrpos = -1, cx, cy, cw, ch;
void *font = NULL;
char *text;
- int adj, lastnode;
+ int adj;
int srcpos = 0;
text = strdup(node->text);
@@ -1523,7 +1525,7 @@
}
}
}
- breakout:
+ /*breakout:*/
evas_object_textblock_layout_clear(obj, &layout);
*line_count = last_line + 1;
fw += pad_r;
@@ -1576,7 +1578,6 @@
evas_object_textblock_native_calc(Evas_Object *obj)
{
Evas_Object_Textblock *o;
- Layout layout;
int fw = 0, fh = 0, lines = 0;
Layout_Node *lnodes;
@@ -1644,6 +1645,8 @@
return NULL;
}
+/* unused */
+#if 0
static Layout_Node *
evas_object_textblock_layout_node_line_get(Evas_Object *obj, int line)
{
@@ -1667,6 +1670,7 @@
}
return NULL;
}
+#endif
/* private methods for textblock objects */
static void evas_object_textblock_init(Evas_Object *obj);
@@ -2083,7 +2087,6 @@
{
Evas_Object_Textblock *o;
Layout_Node *lnode;
- int ps;
Evas_Object_List *l;
MAGIC_CHECK(obj, Evas_Object, MAGIC_OBJ);
@@ -2853,7 +2856,7 @@
#define CHECK_COL(str, col) \
if (lnode->layout.col.a > 0) \
{ \
- snprintf(tbuf, sizeof(tbuf), "#02x02x02x02x", lnode->layout.col.r,
lnode->layout.col.g, lnode->layout.col.b, lnode->layout.col.a); \
+ snprintf(tbuf, sizeof(tbuf), "#%02x%02x%02x%02x",
lnode->layout.col.r, lnode->layout.col.g, lnode->layout.col.b,
lnode->layout.col.a); \
sz += strlen(str"=") + strlen(tbuf) + 1; \
}
/* FIXME: we dont handle any strings with a space in them */
@@ -2898,7 +2901,7 @@
{ \
if (buf[0] != 0) strcat(buf, " "); \
strcat(buf, str"="); \
- snprintf(tbuf, sizeof(tbuf), "#02x02x02x02x", lnode->layout.col.r,
lnode->layout.col.g, lnode->layout.col.b, lnode->layout.col.a); \
+ snprintf(tbuf, sizeof(tbuf), "#%02x%02x%02x%02x",
lnode->layout.col.r, lnode->layout.col.g, lnode->layout.col.b,
lnode->layout.col.a); \
strcat(buf, tbuf); \
}
@@ -3109,7 +3112,7 @@
{
Evas_Object_Textblock *o;
Evas_Object_List *l;
- int pbackx;
+ int pbackx = 0;
int i, j;
const char vals[5][5] =
{
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
