rpms/freetype-freeworld/F-14 freetype-2.4.4-auto-autohint-fix.patch, NONE, 1.1 freetype-freeworld.spec, 1.12, 1.13

[Kevin Kofler]

Author: kkofler

Update of /cvs/free/rpms/freetype-freeworld/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20478/F-14

Modified Files:
	freetype-freeworld.spec 
Added Files:
	freetype-2.4.4-auto-autohint-fix.patch 
Log Message:
* Tue Mar 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.2-5
- Fix autohinting fallback (rh#547532): Ignore CFF-based OTFs.

freetype-2.4.4-auto-autohint-fix.patch:
 ftobjs.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE freetype-2.4.4-auto-autohint-fix.patch ---
>From c9bdfa7e658f42f3faed2b426e3b1251a04938e4 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl at gnu.org>
Date: Sun, 6 Mar 2011 18:35:37 +0100
Subject: Fix autohinting fallback.

* src/base/ftobjs.c (FT_Load_Glyph): Assure that we only check TTFs,
ignoring CFF-based OTFs.
---
 src/base/ftobjs.c |    3 +++
 1 file changed, 3 insertions(+), 0 deletions(-)

diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 708055f..219ece4 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -627,9 +627,12 @@
         FT_Render_Mode  mode = FT_LOAD_TARGET_MODE( load_flags );
 
 
+        /* the check for `num_locations' assures that we actually    */
+        /* test for instructions in a TTF and not in a CFF-based OTF */
         if ( mode == FT_RENDER_MODE_LIGHT                       ||
              face->internal->ignore_unpatented_hinter           ||
              ( FT_IS_SFNT( face )                             &&
+               ttface->num_locations                          &&
                ttface->max_profile.maxSizeOfInstructions == 0 ) )
           autohint = TRUE;
       }


Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-14/freetype-freeworld.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- freetype-freeworld.spec	6 Mar 2011 07:44:57 -0000	1.12
+++ freetype-freeworld.spec	8 Mar 2011 22:54:30 -0000	1.13
@@ -6,7 +6,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype-freeworld
 Version: 2.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -24,6 +24,9 @@
 # committed by Werner Lemberg.
 # Should be in the next upstream release.
 Patch50:  freetype-2.4.4-auto-autohint.patch
+# Fix the above autohinting fallback: Ignore CFF-based OTFs.
+# Should be in the next upstream release.
+Patch51:  freetype-2.4.4-auto-autohint-fix.patch
 
 # Security patches
 Patch89:  freetype-2.4.2-CVE-2010-3311.patch
@@ -68,6 +71,7 @@
 
 %patch46  -p1 -b .enable-valid
 %patch50 -p1 -b .auto-autohint
+%patch51 -p1 -b .auto-autohint-fix
 
 %patch89 -p1 -b .CVE-2010-3311
 %patch90 -p1 -b .CVE-2010-3855
@@ -115,9 +119,12 @@
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %changelog
+* Tue Mar 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.2-5
+- Fix autohinting fallback (rh#547532): Ignore CFF-based OTFs.
+
 * Sun Mar 06 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.2-4
 - Fall back to autohinting if a TTF/OTF doesn't contain any bytecode (rh#547532,
-  patch backported from upstream git, also in Fedora freetype)
+  patch backported from upstream git, also in Fedora 15 freetype)
 
 * Mon Nov 15 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.2-3
 - Add freetype-2.4.2-CVE-2010-3855.patch