[Patch Rollback] Rollbacked below patch.

commit 4ae7717c2a93ef3511f0ad16b1410fe1bb5eebc3
Author: Daniel Juyung Seo <juyung.seo@samsung.com>
Date:   Wed Oct 6 19:14:06 2010 +0900
[SVN 53093 Merge]
Changeset 53093
Timestamp: 10/06/10 01:53:06 (73 minutes ago)
Author: raster
Message: i think i foundsed me a fontconfig bug..
this i think is a workartound.. it depends what fc's intent was tho.
Files: 1 modified
trunk/evas/src/lib/canvas/evas_font_dir.c (3 diffs)

diff --git a/src/lib/canvas/evas_font_dir.c b/src/lib/canvas/evas_font_dir.c
index 3a9b0f5..a8a560b 100644 (file)
--- a/src/lib/canvas/evas_font_dir.c
+++ b/src/lib/canvas/evas_font_dir.c
@@ -252,6 +252,7 @@ evas_load_fontconfig(Evas *evas, FcFontSet *set, int size)
 }
 #endif
 
+/* Rollback
 // [SVN 53093 Merge] Please delete this comment when you merge 53093.
 struct _FcPattern {   
    int             num;
@@ -259,6 +260,7 @@ struct _FcPattern {
    intptr_t        elts_offset;
    int             ref;
 };
+*/
 
 void *
 evas_font_load(Evas *evas, const char *name, const char *source, int size)
@@ -476,11 +478,13 @@ evas_font_load(Evas *evas, const char *name, const char *source, int size)
        else
                         // [SVN 53093 Merge] Please delete this comment when you merge 53093.
           {
+                // Rollback
+             font = evas_load_fontconfig(evas, set, size);
              // FIXME: this i think is a bugfix for a rare bug... but i'm
              // not sure 100%. it seems that way from fc. if trim is set
              // to FcTrue...
-             FcPatternReference(p_nm); /* we have to reference count the pat */
-             font = evas_load_fontconfig(evas, set, size);
+             //FcPatternReference(p_nm); /* we have to reference count the pat */
+             //font = evas_load_fontconfig(evas, set, size);
           }
      }
 #endif