rpms/openoffice.org/devel openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25104

Modified Files:
	openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch 
Log Message:
tweak a bit

openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch:
 inc/outfont.hxx                            |    0 
 inc/psprint/fontmanager.hxx                |    0 
 inc/vclenum.hxx                            |    0 
 psprint/inc/psprint/fontmanager.hxx        |   22 ++++++
 psprint/source/fontmanager/fontconfig.cxx  |   98 +++++++++++++++++++----------
 psprint/source/fontmanager/fontmanager.cxx |    8 ++
 source/fontmanager/fontconfig.cxx          |    0 
 source/fontmanager/fontmanager.cxx         |    0 
 source/glyphs/gcach_ftyp.cxx               |    0 
 source/glyphs/gcach_ftyp.hxx               |    0 
 unx/source/gdi/xlfd_extd.cxx               |    0 
 vcl/inc/outfont.hxx                        |    6 +
 vcl/inc/vclenum.hxx                        |   22 ++++++
 vcl/source/glyphs/gcach_ftyp.cxx           |   71 ++++++++++++++-------
 vcl/source/glyphs/gcach_ftyp.hxx           |    6 +
 vcl/unx/source/gdi/xlfd_extd.cxx           |    4 +
 vcl/win/source/gdi/salgdi3.cxx             |    9 ++
 win/source/gdi/salgdi3.cxx                 |    0 
 18 files changed, 191 insertions(+), 55 deletions(-)

Index: openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:05:44 -0000	1.1
+++ openoffice.org-2.0.2.ooo64508.vcl.honourfontconfighinting.patch	20 Apr 2006 11:28:50 -0000	1.2
@@ -304,7 +304,7 @@
  // -----------------------------------------------------------------------
  
  static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);}
-@@ -684,6 +691,7 @@
+@@ -691,6 +698,7 @@
  FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontInfo* pFI )
  :   ServerFont( rFSD ),
      mnPrioEmbedded(nDefaultPrioEmbedded), mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -312,10 +312,10 @@
      mpFontInfo( pFI ),
      maFaceFT( NULL ),
      maSizeFT( NULL ),
-@@ -806,42 +814,64 @@
+@@ -813,22 +821,27 @@
  
-     mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
-     mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
+     mbArtItalic = (rFSD.meItalic != ITALIC_NONE && rFSD.mpFontData->GetSlant() == ITALIC_NONE);
+     mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && rFSD.mpFontData->GetWeight() <= WEIGHT_MEDIUM);
 +    mbUseGamma = false;
 +    if (mbArtBold)
 +    {
@@ -355,11 +355,7 @@
  	mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
  
      if( (mnSin != 0) && (mnCos != 0) ) // hinting for 0/90/180/270 degrees only
-         mnLoadFlags |= FT_LOAD_NO_HINTING;
-+
-     mnLoadFlags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; //#88334#
- 
-     if (mpFontInfo->DontUseAntiAlias())
+@@ -839,16 +852,32 @@
          mnPrioAntiAlias = 0;
      if (mpFontInfo->DontUseEmbeddedBitmaps())
          mnPrioEmbedded = 0;
@@ -378,24 +374,24 @@
      if( !(mnLoadFlags & FT_LOAD_NO_HINTING) && (nFTVERSION >= 2103))
 -        mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
 +    {
-+	switch (mpFontInfo->GetHintStyle())
-+	{
-+	    default:
-+	    case HINT_SLIGHT:
-+	    case HINT_MEDIUM:
++      switch (mpFontInfo->GetHintStyle())
++      {
++          default:
++          case HINT_SLIGHT:
++          case HINT_MEDIUM:
 +                mnLoadFlags |= FT_LOAD_TARGET_LIGHT;
 +                break;
-+	    case HINT_FULL:
++          case HINT_FULL:
 +                mnLoadFlags |= FT_LOAD_TARGET_NORMAL;
 +                break;
-+	    case HINT_NONE:
++          case HINT_NONE:
 +                break;
-+	}
++      }
 +    }
  #endif
  
      if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1300,11 +1330,11 @@
+@@ -1307,11 +1336,11 @@
  #if (FTVERSION >= 2002)
      // for 0/90/180/270 degree fonts enable autohinting even if not advisable
      // non-hinted and non-antialiased bitmaps just look too ugly
@@ -409,7 +405,7 @@
          nLoadFlags |= FT_LOAD_NO_BITMAP;
  
      FT_Error rc = -1;
-@@ -1451,7 +1481,7 @@
+@@ -1458,7 +1487,7 @@
      // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
      nLoadFlags |= FT_LOAD_NO_HINTING;
  #else