Enlightenment CVS committal

Author  : shorne
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/canvas


Modified Files:
        evas_font_dir.c 


Log Message:
Fix problem with fonts that cant load completely
 * fix reference counting for font_int(s)
 * properly backout if face doesnt load correctly, this way we dont end up
   using the face again
 * put some comments about fudged font cache

===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/canvas/evas_font_dir.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- evas_font_dir.c     1 May 2007 13:05:24 -0000       1.26
+++ evas_font_dir.c     5 May 2007 10:30:11 -0000       1.27
@@ -158,6 +158,7 @@
               }
          }
      }
+
    for (l = fonts_zero; l; l = l->next)
      {
        fd = l->data;
@@ -330,8 +331,8 @@
             FcPatternGet(set->fonts[i], FC_FILE, 0, &filename);
 
             if (font)
-              evas->engine.func->font_add(evas->engine.data.output, font, 
(char *)filename.u.s, size);
-            else
+              evas->engine.func->font_add(evas->engine.data.output, font, 
(char *)filename.u.s, size);           
+            else         
               font = evas->engine.func->font_load(evas->engine.data.output, 
(char *)filename.u.s, size);
          }
 
@@ -350,6 +351,7 @@
        fd->ref = 1;
        fonts_cache = evas_list_prepend(fonts_cache, fd);
      }
+
    if (font)
      evas->engine.func->font_hinting_set(evas->engine.data.output, font,
                                         evas->hinting);



-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to