ooo-build r12902 - in branches/ooo-build-2-4-1: . patches/src680

[thorstenb svn gnome org]

Author: thorstenb
Date: Mon Jun 16 19:11:58 2008
New Revision: 12902
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12902&view=rev

Log:
	* patches/src680/ooocmcfixes46.diff: updated from cws



Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/ooocmcfixes46.diff

Modified: branches/ooo-build-2-4-1/patches/src680/ooocmcfixes46.diff
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/ooocmcfixes46.diff	(original)
+++ branches/ooo-build-2-4-1/patches/src680/ooocmcfixes46.diff	Mon Jun 16 19:11:58 2008
@@ -1,109 +1,22 @@
---- vcl/source/glyphs/gcach_ftyp.cxx	11 Apr 2008 08:57:28 -0000	1.149
-+++ vcl/source/glyphs/gcach_ftyp.cxx	4 Jun 2008 08:18:01 -0000	1.149.48.2
-@@ -517,7 +517,10 @@ FreetypeManager::FreetypeManager()
- void* FreetypeServerFont::GetFtFace() const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     return maFaceFT;
- }
-@@ -736,6 +739,7 @@ FreetypeServerFont::FreetypeServerFont( 
-     {
-         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 )
-@@ -976,7 +976,10 @@
-     }
- 
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     rFactor = 0x100;
- 
-@@ -1234,7 +1251,10 @@ int FreetypeServerFont::GetGlyphIndex( s
- void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
+--- vcl/source/glyphs/gcach_ftyp.cxx~	2008-06-16 21:00:08.000000000 +0200
++++ vcl/source/glyphs/gcach_ftyp.cxx	2008-06-16 21:01:50.000000000 +0200
+@@ -2235,7 +2235,7 @@
      int nGlyphFlags;
      SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-@@ -1322,7 +1342,10 @@ bool FreetypeServerFont::GetAntialiasAdv
- bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     int nGlyphFlags;
-     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-@@ -1482,7 +1505,10 @@ bool FreetypeServerFont::GetGlyphBitmap1
- bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap ) const
- {
-     if( maSizeFT )
-+    {
-         pFTActivateSize( maSizeFT );
-+        FT_Set_Transform( maFaceFT, NULL, NULL );
-+    }
- 
-     int nGlyphFlags;
-     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
-@@ -1736,7 +1762,10 @@ int FreetypeServerFont::GetGlyphKernValu
-     // 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;
-@@ -1771,7 +1800,10 @@ ULONG FreetypeServerFont::GetKernPairs( 
-     // 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;
-@@ -2171,7 +2203,10 @@ bool FreetypeServerFont::GetGlyphOutline
-     ::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;
  
---- vcl/unx/source/gdi/salgdi3.cxx	11 Apr 2008 09:55:12 -0000	1.154
-+++ vcl/unx/source/gdi/salgdi3.cxx	4 Jun 2008 08:20:31 -0000	1.154.46.1
-@@ -944,7 +944,7 @@ void X11SalGraphics::DrawCairoAAFontStri
+ #ifdef FT_LOAD_TARGET_LIGHT
+     // enable "light hinting" if available
+--- vcl/unx/source/gdi/salgdi3.cxx~	2008-06-16 20:59:00.000000000 +0200
++++ vcl/unx/source/gdi/salgdi3.cxx	2008-06-16 21:02:59.000000000 +0200
+@@ -998,7 +998,7 @@
      Display* pDisplay = GetXDisplay();
  
      cairo_surface_t *surface = rCairo.xlib_surface_create_with_xrender_format (pDisplay,
 -        hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, 1, 1);
-+        hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
++         hDrawable_, DefaultScreenOfDisplay(pDisplay), pVisualFormat, SAL_MAX_INT16, SAL_MAX_INT16);
  
      /*
       * It might be ideal to cache surface and cairo context between calls and