rpms/freetype-freeworld/F-13 freetype-2.3.11-auto-autohint.patch, NONE, 1.1 freetype-freeworld.spec, 1.14, 1.15 freetype-2.4.4-auto-autohint.patch, 1.1, NONE

[Kevin Kofler]

Author: kkofler

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

Modified Files:
	freetype-freeworld.spec 
Added Files:
	freetype-2.3.11-auto-autohint.patch 
Removed Files:
	freetype-2.4.4-auto-autohint.patch 
Log Message:
Rediff the patch against 2.3.11 (remove another whitespace hunk, fix copyright hunk).

freetype-2.3.11-auto-autohint.patch:
 ftobjs.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE freetype-2.3.11-auto-autohint.patch ---
diff -ur freetype-2.3.11/src/base/ftobjs.c freetype-2.3.11-auto-autohint/src/base/ftobjs.c
--- freetype-2.3.11/src/base/ftobjs.c	2009-09-02 08:42:41.000000000 +0200
+++ freetype-2.3.11-auto-autohint/src/base/ftobjs.c	2011-03-06 09:06:20.000000000 +0100
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    The FreeType private base classes (body).                            */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 by */
+/*  Copyright 1996-2011 by                                                 */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -559,6 +559,7 @@
     FT_Library    library;
     FT_Bool       autohint = FALSE;
     FT_Module     hinter;
+    TT_Face       ttface = (TT_Face)face;
 
 
     if ( !face || !face->size || !face->glyph )
@@ -599,7 +600,8 @@
      * - Then, auto-hint if FT_LOAD_FORCE_AUTOHINT is set or if we don't
      *   have a native font hinter.
      *
-     * - Otherwise, auto-hint for LIGHT hinting mode.
+     * - Otherwise, auto-hint for LIGHT hinting mode or if there isn't
+     *   any hinting bytecode in the TrueType/OpenType font.
      *
      * - Exception: The font is `tricky' and requires the native hinter to
      *   load properly.
@@ -624,8 +626,10 @@
         FT_Render_Mode  mode = FT_LOAD_TARGET_MODE( load_flags );
 
 
-        if ( mode == FT_RENDER_MODE_LIGHT             ||
-             face->internal->ignore_unpatented_hinter )
+        if ( mode == FT_RENDER_MODE_LIGHT                       ||
+             face->internal->ignore_unpatented_hinter           ||
+             ( FT_IS_SFNT( face )                             &&
+               ttface->max_profile.maxSizeOfInstructions == 0 ) )
           autohint = TRUE;
       }
     }


Index: freetype-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/freetype-freeworld/F-13/freetype-freeworld.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- freetype-freeworld.spec	6 Mar 2011 07:57:01 -0000	1.14
+++ freetype-freeworld.spec	6 Mar 2011 08:08:47 -0000	1.15
@@ -23,7 +23,7 @@
 # Submitted by Kevin Kofler based on a patch from infinality.net, edited and
 # committed by Werner Lemberg.
 # Should be in the next upstream release.
-Patch50:  freetype-2.4.4-auto-autohint.patch
+Patch50:  freetype-2.3.11-auto-autohint.patch
 
 # Security patches
 Patch89:  freetype-2.3.11-CVE-2010-2498.patch


--- freetype-2.4.4-auto-autohint.patch DELETED ---