rpms/freetype/FC-6 freetype-2.2.1-ttcmap.patch, NONE, 1.1 freetype.spec, 1.50, 1.51

[fedora-cvs-commits at redhat.com]

Author: besfahbo

Update of /cvs/dist/rpms/freetype/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20121

Modified Files:
	freetype.spec 
Added Files:
	freetype-2.2.1-ttcmap.patch 
Log Message:
* Mon Dec 04 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-16
- Backport binary-search fixes from HEAD
- Add freetype-2.2.1-ttcmap.patch
- Resolves: #208734


freetype-2.2.1-ttcmap.patch:
 ttcmap.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE freetype-2.2.1-ttcmap.patch ---
--- freetype-2.2.1/src/sfnt/ttcmap.c.orig	2006-04-21 21:05:29.000000000 -0700
+++ freetype-2.2.1/src/sfnt/ttcmap.c	2006-09-30 22:30:24.000000000 -0700
@@ -1095,13 +1095,17 @@
           for ( i = max ; i > 0; i-- )
           {
             FT_UInt  prev_end;
+	    FT_Byte*  old_p;
 
-
+	    old_p    = p;
             p = cmap->data + 14 + ( i - 1 ) * 2;
             prev_end = TT_PEEK_USHORT( p );
 
             if ( charcode > prev_end )
+	    {
+	      p = old_p;
               break;
+	    }
 
             end    = prev_end;
             p     += 2 + num_segs2;
@@ -2273,7 +2277,7 @@
 
       if ( offset && offset <= face->cmap_size - 2 )
       {
-        FT_Byte*                       cmap   = table + offset;
+        FT_Byte* volatile              cmap   = table + offset;
         volatile FT_UInt               format = TT_PEEK_USHORT( cmap );
         const TT_CMap_Class* volatile  pclazz = tt_cmap_classes;
         TT_CMap_Class volatile         clazz;


Index: freetype.spec
===================================================================
RCS file: /cvs/dist/rpms/freetype/FC-6/freetype.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- freetype.spec	27 Nov 2006 21:52:42 -0000	1.50
+++ freetype.spec	4 Dec 2006 17:54:04 -0000	1.51
@@ -7,7 +7,7 @@
 Summary: A free and portable font rendering engine
 Name: freetype
 Version: 2.2.1
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: BSD/GPL dual license
 Group: System Environment/Libraries
 URL: http://www.freetype.org
@@ -33,6 +33,7 @@
 Patch101: freetype-more-composite.patch
 Patch102: freetype-2.2.1-zero-item-size.patch
 Patch103: freetype-2.2.1-fix-get-orientation.patch
+Patch104: freetype-2.2.1-ttcmap.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 
@@ -93,7 +94,8 @@
 %patch100 -p1 -b .composite
 %patch101 -p1 -b .more-composite
 %patch102 -p1 -b .zero-item-size
-%patch103 -p0 -b .fix-get-orientation.patch
+%patch103 -p0 -b .fix-get-orientation
+%patch104 -p1 -b .ttcmap
 
 %build
 # Work around code generation problem with strict-aliasing
@@ -216,6 +218,11 @@
 %{_libdir}/pkgconfig/
 
 %changelog
+* Mon Dec 04 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-16
+- Backport binary-search fixes from HEAD
+- Add freetype-2.2.1-ttcmap.patch
+- Resolves: #208734
+
 * Mon Nov 27 2006 Behdad Esfahbod <besfahbo at redhat.com> 2.2.1-15
 - Fix rendering issue with some Asian fonts.
 - Add freetype-2.2.1-fix-get-orientation.patch