Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/canvas
Modified Files:
evas_font_dir.c evas_object_textblock.c
Log Message:
- make sure we have a name before trying to look it up
- strip off an + or - in _format_fill so we don't end up with things like
+font=fonts/Vera which then won't match when we try to recognize it as a
keyword
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_font_dir.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_font_dir.c 18 Jun 2005 01:00:29 -0000 1.9
+++ evas_font_dir.c 15 Oct 2005 22:02:59 -0000 1.10
@@ -159,6 +159,8 @@
Evas_List *fonts, *l;
Fndat *fd;
+ if (!name) return NULL;
+
for (l = fonts_cache; l; l = l->next)
{
fd = l->data;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/canvas/evas_object_textblock.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -3 -r1.113 -r1.114
--- evas_object_textblock.c 15 Oct 2005 06:54:42 -0000 1.113
+++ evas_object_textblock.c 15 Oct 2005 22:02:59 -0000 1.114
@@ -747,7 +747,7 @@
slen = strlen(str);
*r = *g = *b = *a = 0;
-
+
if (slen == 7) /* #RRGGBB */
{
*r = (_hex_string_get(str[1]) << 4) | (_hex_string_get(str[2]));
@@ -1128,6 +1128,10 @@
char *item;
s = str;
+
+ /* get rid of anything +'s or -'s off the start of the string */
+ while ((*s == ' ') || (*s == '+') || (*s == '-')) s++;
+
while ((item = _format_parse(&s)))
{
if (_format_is_param(item))
-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
