[wordcache] Fixed wordcache bug with gl.

diff --git a/debian/changelog b/debian/changelog
index 7d57fbe..f7e94a6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+evas (0.9.9.060+svn.49540slp2+3build15) unstable; urgency=low
+
+  * Fixed word cache & gl bug (from Brett Nash)
+  * Git: 165.213.180.234:/git/slp/pkgs/evas
+  * Tag: evas_0.9.9.060+svn.49540slp2+3build15
+
+ -- Juyung Seo <juyung.seo@samsung.com>  Fri, 30 Jul 2010 14:16:57 +0900
+
 evas (0.9.9.060+svn.49540slp2+3build14) unstable; urgency=low
 
   * Disabled word cache 

diff --git a/debian/rules b/debian/rules
index 6ec3058..923dba9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ else
        arch_flags += --enable-winkcodec=no
 endif
 
-#arch_flags += --enable-word-cache #--enable-metric-cache
+arch_flags += --enable-word-cache #--enable-metric-cache
 
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-image-loader-svg \
        --enable-simple-x11 \

diff --git a/src/lib/engines/common/evas_font_draw.c b/src/lib/engines/common/evas_font_draw.c
index e177cac..8d6b233 100644 (file)
--- a/src/lib/engines/common/evas_font_draw.c
+++ b/src/lib/engines/common/evas_font_draw.c
@@ -795,6 +795,10 @@ evas_font_word_prerender(RGBA_Draw_Context *dc, const char *in_text, int len, RG
    struct prword *w;
    int gl;
 
+#ifndef METRIC_CACHE
+   gl = dc->font_ext.func.gl_new ? 1: 0;
+   if (gl) return NULL;
+#endif
 
    LKL(lock_words);
    EINA_INLIST_FOREACH(words,w){