rpms/openoffice.org/F-9 openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch, 1.1, 1.2 openoffice.org.spec, 1.1493, 1.1494
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Jun 12 08:59:50 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29082
Modified Files:
openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
openoffice.org.spec
Log Message:
fix vertical glyphs
openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch:
Index: openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch 3 Jun 2008 12:09:13 -0000 1.1
+++ openoffice.org-3.0.0.ooo90037.vcl.cairotransforms.patch 12 Jun 2008 08:59:01 -0000 1.2
@@ -1,99 +1,12 @@
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 );
-+ }
-
+@@ -2172,7 +2242,7 @@
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();
+- FT_Int nLoadFlags = FT_LOAD_DEFAULT;
++ FT_Int nLoadFlags = FT_LOAD_DEFAULT | FT_LOAD_IGNORE_TRANSFORM;
+ #ifdef FT_LOAD_TARGET_LIGHT
+ // enable "light hinting" if available
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-9/openoffice.org.spec,v
retrieving revision 1.1493
retrieving revision 1.1494
diff -u -r1.1493 -r1.1494
--- openoffice.org.spec 6 Jun 2008 09:53:14 -0000 1.1493
+++ openoffice.org.spec 12 Jun 2008 08:59:01 -0000 1.1494
@@ -1,6 +1,6 @@
%define oootag OOH680
%define ooomilestone 17
-%define rh_rpm_release 3
+%define rh_rpm_release 4
# undef to get english only and no-langpacks for a faster smoketest build
%define langpacks 1
@@ -2918,6 +2918,9 @@
%changelog
+* Thu Jun 12 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.4-UNRELEASED
+- fix vertical glyphs
+
* Fri Jun 06 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.1-17.3
- remove pointless "register" dialog request
- Resolves: rhbz#450212 openoffice.org-3.0.0.ooo82545.np_sdk.x86_64.patch
More information about the scm-commits
mailing list