rpms/freetype-freeworld/devel freetype-2.4.4-auto-autohint-fix.patch, NONE, 1.1 freetype-freeworld.spec, 1.14, 1.15

[Kevin Kofler]

Author: kkofler

Update of /cvs/free/rpms/freetype-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19568/devel

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.4-3
- 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/devel/freetype-freeworld.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freetype-freeworld.spec	20 Feb 2011 14:35:30 -0000	1.14
+++ freetype-freeworld.spec	8 Mar 2011 22:45:11 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype-freeworld
 Version: 2.4.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: FTL or GPLv2+
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -21,6 +21,9 @@
 # committed by Werner Lemberg.
 # Should be in the next upstream release.
 Patch90:  freetype-2.4.4-auto-autohint.patch
+# Fix the above autohinting fallback: Ignore CFF-based OTFs.
+# Should be in the next upstream release.
+Patch91:  freetype-2.4.4-auto-autohint-fix.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 
@@ -51,6 +54,7 @@
 
 %patch89 -p1 -b .CVE-2010-3311
 %patch90 -p1 -b .auto-autohint
+%patch91 -p1 -b .auto-autohint-fix
 
 %build
 
@@ -95,6 +99,9 @@
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
 
 %changelog
+* Tue Mar 08 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.4-3
+- Fix autohinting fallback (rh#547532): Ignore CFF-based OTFs.
+
 * Sun Feb 20 2011 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.4.4-2
 - Update the description to reflect that the bytecode interpreter was reenabled
   in the stock Fedora freetype, hopefully this time for good (see rh#612395).