rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch, NONE, 1.1 openoffice.org.spec, 1.1489, 1.1490

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20928

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch 
Log Message:
Resolves: rhbz#448553 openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch

openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch:

--- NEW FILE openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch ---
diff -ru vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	2008-05-26 15:17:03.000000000 +0100
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	2008-06-03 13:01:17.000000000 +0100
@@ -522,7 +522,10 @@
 void* FreetypeServerFont::GetFtFace() const
 {
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     return maFaceFT;
 }
@@ -742,6 +745,7 @@
     {
         pFTNewSize( maFaceFT, &maSizeFT );
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
     }
     FT_Error rc = FT_Set_Pixel_Sizes( maFaceFT, mnWidth, rFSD.mnHeight );
     if( rc != FT_Err_Ok )
@@ -975,7 +979,10 @@
     }
 
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     rFactor = 0x100;
 
@@ -1294,7 +1304,10 @@
 void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
 {
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
@@ -1382,7 +1395,10 @@
 bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap ) const
 {
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
@@ -1542,7 +1558,10 @@
 bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const
 {
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
@@ -1796,7 +1815,10 @@
     // when font faces of different sizes share the same maFaceFT
     // then we have to make sure that it uses the correct maSizeFT
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     // use Freetype's kerning info
     FT_Vector aKernVal;
@@ -1831,7 +1853,10 @@
     // when font faces of different sizes share the same maFaceFT
     // then we have to make sure that it uses the correct maSizeFT
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+        FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     // first figure out which glyph pairs are involved in kerning
     ULONG nKernLength = 0;
@@ -2231,7 +2257,10 @@
     ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const
 {
     if( maSizeFT )
+    {
         pFTActivateSize( maSizeFT );
+	FT_Set_Transform( maFaceFT, NULL, NULL );
+    }
 
     rB2DPolyPoly.clear();
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1489
retrieving revision 1.1490
diff -u -r1.1489 -r1.1490
--- openoffice.org.spec	3 Jun 2008 08:43:27 -0000	1.1489
+++ openoffice.org.spec	3 Jun 2008 12:09:13 -0000	1.1490
@@ -156,6 +156,7 @@
 Patch83: workspace.impress138.patch
 Patch84: openoffice.org-2.4.0.gcc36187.noaliasingbusted.patch
 Patch85: openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch
+Patch86: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1126,6 +1127,7 @@
 %patch83 -p1 -b .workspace.impress138.patch
 %patch84 -p1 -b .gcc36187.noaliasingbusted.patch
 %patch85 -p1 -b .ooo87970.vcl.samenamesubs.patch
+%patch86 -p1 -b .ooo90037.vcl.cairotransforms.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2915,6 +2917,7 @@
 * Tue Jun 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.2
 - filter out -fasynchronous-unwind-tables because it doesn't work with -Os
   on i386
+- Resolves: rhbz#448553 openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
 
 * Sun Jun 01 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.1
 - Resolves: rhbz#445588 add openoffice.org-3.0.0.ooo87970.vcl.samenamesubs.patch