From 9636b0851f236742090c06660dc6e3b372208c63 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@gnome.org>
Date: Mon, 22 May 2006 19:04:00 +0000
Subject: =?UTF-8?q?Bug=20339730=20=E2=80=93=20Pango=20needlessly=20falls?=
 =?UTF-8?q?=20back=20away=20from=20a=20Type=201=20font=20into=20a?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2006-05-22  Behdad Esfahbod  <behdad@gnome.org>

        Bug 339730 – Pango needlessly falls back away from a Type 1 font into
        a TTF font

        * pango/fonts.c (find_field): Fix strncmp usage.
---
 ChangeLog     | 7 +++++++
 pango/fonts.c | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 82a73a76..3278f61d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-22  Behdad Esfahbod  <behdad@gnome.org>
+
+	Bug 339730 – Pango needlessly falls back away from a Type 1 font into
+	a TTF font
+
+	* pango/fonts.c (find_field): Fix strncmp usage.
+
 2006-05-22  Behdad Esfahbod  <behdad@gnome.org>
 
 	Bug 341922 – pango should handle more characters as zero width
diff --git a/pango/fonts.c b/pango/fonts.c
index e89335e7..87c1498c 100644
--- a/pango/fonts.c
+++ b/pango/fonts.c
@@ -800,7 +800,8 @@ find_field (const FieldMap *map, int n_elements, const char *str, int len, int *
   
   for (i=0; i<n_elements; i++)
     {
-      if (map[i].str && g_ascii_strncasecmp (map[i].str, str, len) == 0)
+      if (map[i].str[0] && g_ascii_strncasecmp (map[i].str, str, len) == 0 &&
+	  map[i].str[len] == '\0')
 	{
 	  if (val)
 	    *val = map[i].value;
-- 
cgit v1.2.1