ooo-build r14972 - in trunk: . patches/dev300

From: kyoshida svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r14972 - in trunk: . patches/dev300
Date: Tue, 30 Dec 2008 19:12:07 +0000 (UTC)
Author: kyoshida
Date: Tue Dec 30 19:12:06 2008
New Revision: 14972
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14972&view=rev

Log:
2008-12-30  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/ooo64508.vcl.honourfontconfighinting.diff: re-enabled 
	and fixed the build breakage.  Instead of calling 
	FontCfgWrapper::getDefConfig() to get FcConfig*, calling
	FontCfgWrapper::FcConfigGetCurrent() seems to get the job done.
	
	* patches/dev300/apply: re-enabled the above patches and two others 
	that were depending on it.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/ooo64508.vcl.honourfontconfighinting.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Dec 30 19:12:06 2008
@@ -2163,8 +2163,7 @@
 ubuntu-mstopdf.diff, ccheney
 
 [ FedoraLinuxOnlyFixes ]
-# FIXME 2008-11-26: doesn't compile
-#ooo64508.vcl.honourfontconfighinting.diff
+ooo64508.vcl.honourfontconfighinting.diff
 
 [ FedoraCommonFixes ]
 ooo67658.sfx2.reloadcrash.diff
@@ -2177,9 +2176,8 @@
 
 [ CairoFonts ]
 # needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
-# FIXME 2008-11-26: doesn't compile without ooo64508.vcl.honourfontconfighinting.diff
-#ooo59127.vcl.honourcairofont.diff
-#psprint-fontconfig-fix.diff, n#407958, thorsten
+ooo59127.vcl.honourcairofont.diff
+psprint-fontconfig-fix.diff, n#407958, thorsten
 
 [ GStreamer ]
 SectionOwner => rodo

Modified: trunk/patches/dev300/ooo64508.vcl.honourfontconfighinting.diff
==============================================================================
--- trunk/patches/dev300/ooo64508.vcl.honourfontconfighinting.diff	(original)
+++ trunk/patches/dev300/ooo64508.vcl.honourfontconfighinting.diff	Tue Dec 30 19:12:06 2008
@@ -1,6 +1,8 @@
---- psprint/inc/psprint/fontmanager.hxx.64508~	2008-04-11 12:09:55.000000000 +0200
-+++ psprint/inc/psprint/fontmanager.hxx	2008-07-07 21:56:18.321847827 +0200
-@@ -142,6 +142,33 @@ enum type { 
+diff --git psprint/inc/psprint/fontmanager.hxx psprint/inc/psprint/fontmanager.hxx
+index bf4e51a..3e9bf61 100644
+--- psprint/inc/psprint/fontmanager.hxx
++++ psprint/inc/psprint/fontmanager.hxx
+@@ -142,6 +142,33 @@ enum type {
  };
  }
  
@@ -72,8 +74,10 @@
  
      rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes, 
          const rtl::OString& rLangAttrib, italic::type eItalic, weight::type eWeight, 
---- psprint/source/fontmanager/fontcache.cxx.64508~	2008-04-11 12:12:37.000000000 +0200
-+++ psprint/source/fontmanager/fontcache.cxx	2008-07-07 21:56:18.323846545 +0200
+diff --git psprint/source/fontmanager/fontcache.cxx psprint/source/fontmanager/fontcache.cxx
+index f9e192f..a245797 100644
+--- psprint/source/fontmanager/fontcache.cxx
++++ psprint/source/fontmanager/fontcache.cxx
 @@ -214,9 +214,9 @@ void FontCache::flush()
                  aLine.Append( ';' );
                  aLine.Append( (*it)->m_bUserOverride ? "1" : "0" );
@@ -96,7 +100,7 @@
                  int nStyleTokenNr = 18;
                  switch( eType )
                  {
-@@ -560,8 +557,6 @@ void FontCache::copyPrintFont( const Pri
+@@ -560,8 +557,6 @@ void FontCache::copyPrintFont( const PrintFontManager::PrintFont* pFrom, PrintFo
      pTo->m_nYMax			= pFrom->m_nYMax;
      pTo->m_bHaveVerticalSubstitutedGlyphs = pFrom->m_bHaveVerticalSubstitutedGlyphs;
      pTo->m_bUserOverride    = pFrom->m_bUserOverride;
@@ -105,7 +109,7 @@
  }
  
  /*
-@@ -623,9 +618,7 @@ bool FontCache::equalsPrintFont( const P
+@@ -623,9 +618,7 @@ bool FontCache::equalsPrintFont( const PrintFontManager::PrintFont* pLeft, Print
          pRight->m_nXMax				!= pLeft->m_nXMax			||
          pRight->m_nYMax				!= pLeft->m_nYMax			||
          pRight->m_bHaveVerticalSubstitutedGlyphs != pLeft->m_bHaveVerticalSubstitutedGlyphs ||
@@ -116,9 +120,11 @@
          )
          return false;
      std::list< int >::const_iterator lit, rit;
---- psprint/source/fontmanager/fontconfig.cxx.64508~	2008-04-11 12:12:55.000000000 +0200
-+++ psprint/source/fontmanager/fontconfig.cxx	2008-07-07 21:56:18.326845878 +0200
-@@ -122,6 +122,7 @@ class FontCfgWrapper
+diff --git psprint/source/fontmanager/fontconfig.cxx psprint/source/fontmanager/fontconfig.cxx
+index 409b9ab..718b3f9 100644
+--- psprint/source/fontmanager/fontconfig.cxx
++++ psprint/source/fontmanager/fontconfig.cxx
+@@ -121,6 +121,7 @@ class FontCfgWrapper
      FcBool			(*m_pFcConfigAppFontAddDir)(FcConfig*, const FcChar8*);
      FcBool			(*m_pFcConfigSubstitute)(FcConfig*,FcPattern*,FcMatchKind);
      FcBool			(*m_pFcPatternAddInteger)(FcPattern*,const char*,int);
@@ -126,7 +132,7 @@
      FcBool                    (*m_pFcPatternAddBool)(FcPattern*,const char*,FcBool);
      FcBool                    (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
      FcBool			(*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
-@@ -226,6 +227,8 @@ public:
+@@ -224,6 +225,8 @@ public:
      { return m_pFcConfigSubstitute( pConfig, pPattern, eKind ); }
      FcBool FcPatternAddInteger( FcPattern* pPattern, const char* pObject, int nValue )
      { return m_pFcPatternAddInteger( pPattern, pObject, nValue ); }
@@ -135,7 +141,7 @@
      FcBool FcPatternAddString( FcPattern* pPattern, const char* pObject, const FcChar8* pString )
      { return m_pFcPatternAddString( pPattern, pObject, pString ); }
      FcBool FcPatternAddBool( FcPattern* pPattern, const char* pObject, bool nValue )
-@@ -327,6 +330,8 @@ FontCfgWrapper::FontCfgWrapper()
+@@ -324,6 +327,8 @@ FontCfgWrapper::FontCfgWrapper()
          loadSymbol( "FcConfigSubstitute" );
      m_pFcPatternAddInteger = (FcBool(*)(FcPattern*,const char*,int))
          loadSymbol( "FcPatternAddInteger" );
@@ -144,7 +150,7 @@
      m_pFcPatternAddBool = (FcBool(*)(FcPattern*,const char*,FcBool))
          loadSymbol( "FcPatternAddBool" );
      m_pFcPatternAddCharSet = (FcBool(*)(FcPattern*,const char*,const FcCharSet *))
-@@ -364,6 +369,7 @@ FontCfgWrapper::FontCfgWrapper()
+@@ -361,6 +366,7 @@ FontCfgWrapper::FontCfgWrapper()
              m_pFcDefaultSubstitute			&&
              m_pFcConfigSubstitute			&&
              m_pFcPatternAddInteger			&&
@@ -152,7 +158,7 @@
              m_pFcPatternAddCharSet			&&
              m_pFcPatternAddBool 			&&
              m_pFcPatternAddString
-@@ -580,7 +586,7 @@ int PrintFontManager::countFontconfigFon
+@@ -576,7 +582,7 @@ int PrintFontManager::countFontconfigFonts()
              int weight = 0;
              int spacing = 0;
              int nCollectionEntry = -1;
@@ -161,7 +167,7 @@
              
              FcResult eFileRes	      = rWrapper.FcPatternGetString( pFSet->fonts[i], FC_FILE, 0, &file );
              FcResult eFamilyRes       = lcl_FamilyFromPattern(rWrapper, pFSet->fonts[i], &family, rWrapper.m_aFontconfigNameToLocalized );
-@@ -590,8 +596,6 @@ int PrintFontManager::countFontconfigFon
+@@ -586,8 +592,6 @@ int PrintFontManager::countFontconfigFonts()
              FcResult eSpacRes	      = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_SPACING, 0, &spacing );
              FcResult eOutRes	      = rWrapper.FcPatternGetBool( pFSet->fonts[i], FC_OUTLINE, 0, &outline );
              FcResult eIndexRes        = rWrapper.FcPatternGetInteger( pFSet->fonts[i], FC_INDEX, 0, &nCollectionEntry );
@@ -170,7 +176,7 @@
              
              if( eFileRes != FcResultMatch || eFamilyRes != FcResultMatch || eOutRes != FcResultMatch )
                  continue;
-@@ -731,15 +735,6 @@ int PrintFontManager::countFontconfigFon
+@@ -727,15 +731,6 @@ int PrintFontManager::countFontconfigFonts()
                  {
                      pUpdate->m_aStyleName = OStringToOUString( OString( (sal_Char*)style ), RTL_TEXTENCODING_UTF8 );
                  }
@@ -186,7 +192,7 @@
                  
                  // update font cache
                  m_pFontCache->updateFontCacheEntry( pUpdate, false );
-@@ -975,6 +970,78 @@ rtl::OUString PrintFontManager::Substitu
+@@ -972,6 +967,78 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName,
      return aName;
  }
  
@@ -211,7 +217,7 @@
 +    if( ! rWrapper.isValid() )
 +        return aHints;
 +
-+    FcConfig* pConfig = rWrapper.getDefConfig();
++    FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
 +    FcPattern* pPattern = rWrapper.FcPatternCreate();
 +
 +    lcl_InfoToPattern( rInfo, rWrapper, pPattern );
@@ -265,7 +271,7 @@
  bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale )
  {
      FontCfgWrapper& rWrapper = FontCfgWrapper::get();
-@@ -1000,11 +1067,7 @@ bool PrintFontManager::matchFont( FastPr
+@@ -997,11 +1064,7 @@ bool PrintFontManager::matchFont( FastPrintFontInfo& rInfo, const com::sun::star
      if( aLangAttrib.getLength() )
          rWrapper.FcPatternAddString( pPattern, FC_LANG, (FcChar8*)aLangAttrib.getStr() );
  
@@ -278,9 +284,11 @@
  
      rWrapper.FcConfigSubstitute( pConfig, pPattern, FcMatchPattern );
      rWrapper.FcDefaultSubstitute( pPattern );
---- psprint/source/fontmanager/fontmanager.cxx.64508~	2008-04-11 12:13:15.000000000 +0200
-+++ psprint/source/fontmanager/fontmanager.cxx	2008-07-07 21:56:18.333845720 +0200
-@@ -355,9 +355,7 @@ PrintFontManager::PrintFont::PrintFont( 
+diff --git psprint/source/fontmanager/fontmanager.cxx psprint/source/fontmanager/fontmanager.cxx
+index 4ba510f..2b1c911 100644
+--- psprint/source/fontmanager/fontmanager.cxx
++++ psprint/source/fontmanager/fontmanager.cxx
+@@ -355,9 +355,7 @@ PrintFontManager::PrintFont::PrintFont( fonttype::type eType ) :
          m_nXMax( 0 ),
          m_nYMax( 0 ),
          m_bHaveVerticalSubstitutedGlyphs( false ),
@@ -291,7 +299,7 @@
  {
  }
  
-@@ -2731,8 +2729,6 @@ void PrintFontManager::fillPrintFontInfo
+@@ -2751,8 +2749,6 @@ void PrintFontManager::fillPrintFontInfo( PrintFont* pFont, FastPrintFontInfo& r
      rInfo.m_eWeight         = pFont->m_eWeight;
      rInfo.m_ePitch          = pFont->m_ePitch;
      rInfo.m_aEncoding       = pFont->m_aEncoding;
@@ -300,7 +308,7 @@
      rInfo.m_aAliases.clear();
      for( ::std::list< int >::iterator it = pFont->m_aAliases.begin(); it != pFont->m_aAliases.end(); ++it )
          rInfo.m_aAliases.push_back( m_pAtoms->getString( ATOM_FAMILYNAME, *it ) );
-@@ -3976,8 +3972,6 @@ bool PrintFontManager::readOverrideMetri
+@@ -3996,8 +3992,6 @@ bool PrintFontManager::readOverrideMetrics()
          BuiltinFont* pFont = new BuiltinFont();
          pFont->m_nDirectory = 0;
          pFont->m_bUserOverride = false;
@@ -309,8 +317,10 @@
          pFont->m_pMetrics = new PrintFontMetrics;
          memset( pFont->m_pMetrics->m_aPages, 0xff, sizeof( pFont->m_pMetrics->m_aPages ) );
          pFont->m_pMetrics->m_bKernPairsQueried = true;
---- vcl/inc/vcl/impfont.hxx.64508~	2008-04-11 09:39:29.000000000 +0200
-+++ vcl/inc/vcl/impfont.hxx	2008-07-07 21:56:18.192846377 +0200
+diff --git vcl/inc/vcl/impfont.hxx vcl/inc/vcl/impfont.hxx
+index 7e0d289..bb620ff 100644
+--- vcl/inc/vcl/impfont.hxx
++++ vcl/inc/vcl/impfont.hxx
 @@ -135,6 +135,42 @@ public:
      bool    operator==( const ImplFontMetric& ) const;
  };
@@ -354,8 +364,10 @@
  // -------------------
  // - ImplFontCharMap -
  // -------------------
---- vcl/inc/vcl/outdev.hxx.64508~	2008-06-24 13:38:45.000000000 +0200
-+++ vcl/inc/vcl/outdev.hxx	2008-07-07 21:56:18.195847177 +0200
+diff --git vcl/inc/vcl/outdev.hxx vcl/inc/vcl/outdev.hxx
+index 2922de6..49828e2 100644
+--- vcl/inc/vcl/outdev.hxx
++++ vcl/inc/vcl/outdev.hxx
 @@ -77,6 +77,8 @@ class AlphaMask;
  class FontCharMap;
  class SalLayout;
@@ -370,12 +382,14 @@
      SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont );
      SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& );
 +    SAL_DLLPRIVATE void ImplGetFontHints( const ImplFontAttributes& rFontAttributes, int nSize, ImplFontHints& rFontHints) const;
- //#endif
- 
- protected:
---- vcl/inc/vcl/outfont.hxx.64508~	2008-04-11 09:48:01.000000000 +0200
-+++ vcl/inc/vcl/outfont.hxx	2008-07-07 21:56:18.252846251 +0200
-@@ -101,8 +101,6 @@ public: // TODO: create matching interfa
+     
+     
+     // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI
+diff --git vcl/inc/vcl/outfont.hxx vcl/inc/vcl/outfont.hxx
+index e6e5eab..abc3df6 100644
+--- vcl/inc/vcl/outfont.hxx
++++ vcl/inc/vcl/outfont.hxx
+@@ -101,8 +101,6 @@ public: // TODO: create matching interface class
      bool               IsDeviceFont() const      { return mbDevice; }
      bool               IsEmbeddable() const      { return mbEmbeddable; }
      bool               IsSubsettable() const     { return mbSubsettable; }
@@ -384,7 +398,7 @@
  
  public: // TODO: hide members behind accessor methods
      String             maMapNames;       // List of family name aliass separated with ';'
-@@ -111,8 +109,6 @@ public: // TODO: hide members behind acc
+@@ -111,8 +109,6 @@ public: // TODO: hide members behind accessor methods
      bool               mbDevice;         // true: built in font
      bool               mbSubsettable;    // true: a subset of the font can be created
      bool               mbEmbeddable;     // true: the font can be embedded
@@ -393,9 +407,11 @@
  };
  
  // ----------------
---- vcl/inc/vcl/salgdi.hxx.64508~	2008-06-24 13:39:01.000000000 +0200
-+++ vcl/inc/vcl/salgdi.hxx	2008-07-07 21:56:18.253846518 +0200
-@@ -230,6 +230,8 @@ public:
+diff --git vcl/inc/vcl/salgdi.hxx vcl/inc/vcl/salgdi.hxx
+index 68e7745..2da80a1 100644
+--- vcl/inc/vcl/salgdi.hxx
++++ vcl/inc/vcl/salgdi.hxx
+@@ -227,6 +227,8 @@ public:
      void                   ReleaseFonts() { SetFont( NULL, 0 ); }
      // get the current font's metrics
      virtual void			GetFontMetric( ImplFontMetricData* ) = 0;
@@ -404,9 +420,11 @@
      // get kernign pairs of the current font
      // return only PairCount if (pKernPairs == NULL)
      virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ) = 0;
---- vcl/inc/vcl/vclenum.hxx.64508~	2008-05-30 12:05:37.000000000 +0200
-+++ vcl/inc/vcl/vclenum.hxx	2008-07-07 21:56:18.255846492 +0200
-@@ -284,6 +284,27 @@ enum FontAntiAlias { ANTIALIAS_DONTKNOW,
+diff --git vcl/inc/vcl/vclenum.hxx vcl/inc/vcl/vclenum.hxx
+index ac76f8a..db6927d 100644
+--- vcl/inc/vcl/vclenum.hxx
++++ vcl/inc/vcl/vclenum.hxx
+@@ -284,6 +284,27 @@ enum FontAntiAlias { ANTIALIAS_DONTKNOW, ANTIALIAS_FALSE, ANTIALIAS_TRUE };
  
  #endif
  
@@ -434,9 +452,11 @@
  // ------------------------------------------------------------
  
  #ifndef ENUM_KEYFUNCTYPE_DECLARED
---- vcl/source/gdi/outdev3.cxx.64508~	2008-04-11 10:49:58.000000000 +0200
-+++ vcl/source/gdi/outdev3.cxx	2008-07-07 21:56:18.262847312 +0200
-@@ -7332,6 +7332,14 @@ BOOL OutputDevice::IsFontAvailable( cons
+diff --git vcl/source/gdi/outdev3.cxx vcl/source/gdi/outdev3.cxx
+index a000d8f..43a38c0 100644
+--- vcl/source/gdi/outdev3.cxx
++++ vcl/source/gdi/outdev3.cxx
+@@ -7483,6 +7483,14 @@ BOOL OutputDevice::IsFontAvailable( const String& rFontName ) const
  
  // -----------------------------------------------------------------------
  
@@ -451,8 +471,10 @@
  FontMetric OutputDevice::GetFontMetric() const
  {
      DBG_TRACE( "OutputDevice::GetFontMetric()" );
---- vcl/source/glyphs/gcach_ftyp.cxx.64508~	2008-04-11 10:57:28.000000000 +0200
-+++ vcl/source/glyphs/gcach_ftyp.cxx	2008-07-07 21:56:18.337846718 +0200
+diff --git vcl/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
+index 45ebf39..274b1bc 100644
+--- vcl/source/glyphs/gcach_ftyp.cxx
++++ vcl/source/glyphs/gcach_ftyp.cxx
 @@ -43,6 +43,7 @@
  #include <vcl/impfont.hxx>
  #include <vcl/bitmap.hxx>
@@ -461,7 +483,7 @@
  
  #include <tools/poly.hxx>
  #include <basegfx/matrix/b2dhommatrix.hxx>
-@@ -623,9 +624,6 @@ long FreetypeManager::AddFontDir( const 
+@@ -623,9 +624,6 @@ long FreetypeManager::AddFontDir( const String& rUrlName )
              aDFA.mbSubsettable= false;
              aDFA.mbEmbeddable = false;
  
@@ -471,7 +493,7 @@
              FT_Done_Face( aFaceFT );
              AddFontFile( aCFileName, nFaceNum, ++mnNextFontId, aDFA, NULL );
              ++nCount;
-@@ -705,6 +703,7 @@ FreetypeServerFont::FreetypeServerFont( 
+@@ -705,6 +703,7 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn
  :   ServerFont( rFSD ),
      mnPrioEmbedded(nDefaultPrioEmbedded),
      mnPrioAntiAlias(nDefaultPrioAntiAlias),
@@ -479,7 +501,7 @@
      mpFontInfo( pFI ),
      maFaceFT( NULL ),
      maSizeFT( NULL ),
-@@ -834,42 +833,69 @@ FreetypeServerFont::FreetypeServerFont( 
+@@ -834,42 +833,69 @@ FreetypeServerFont::FreetypeServerFont( const ImplFontSelectData& rFSD, FtFontIn
  
      mbArtItalic = (rFSD.meItalic != ITALIC_NONE && pFI->GetFontAttributes().GetSlant() == ITALIC_NONE);
      mbArtBold = (rFSD.meWeight > WEIGHT_MEDIUM && pFI->GetFontAttributes().GetWeight() <= WEIGHT_MEDIUM);
@@ -498,14 +520,6 @@
 +		&& rFSD.mnHeight < 20)
 +		mbUseGamma = true;
 +    }
-+
-+    ImplFontHints aHints;
-+    VirtualDevice vdev( 1 );
-+    vdev.ImplGetFontHints( pFI->GetFontAttributes(), mnWidth, aHints );
-+
-+    FontAutoHint eHint = aHints.GetUseAutoHint();
-+    if (eHint == AUTOHINT_DONTKNOW)
-+        eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE;
  
 -    //static const int TT_CODEPAGE_RANGE_874  = (1L << 16); // Thai
 -    //static const int TT_CODEPAGE_RANGE_932  = (1L << 17); // JIS/Japan
@@ -520,8 +534,15 @@
 -        mbUseGamma = true;
 -    else
 -        mbUseGamma = false;
--
++    ImplFontHints aHints;
++    VirtualDevice vdev( 1 );
++    vdev.ImplGetFontHints( pFI->GetFontAttributes(), mnWidth, aHints );
+ 
 -    if (mbUseGamma)
++    FontAutoHint eHint = aHints.GetUseAutoHint();
++    if (eHint == AUTOHINT_DONTKNOW)
++        eHint = mbUseGamma ? AUTOHINT_TRUE : AUTOHINT_FALSE;
++
 +    if (eHint == AUTOHINT_TRUE)
          mnLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
  
@@ -572,7 +593,7 @@
  #endif
  
      if( ((mnCos != 0) && (mnSin != 0)) || (mnPrioEmbedded <= 0) )
-@@ -1341,11 +1367,11 @@ bool FreetypeServerFont::GetGlyphBitmap1
+@@ -1353,11 +1379,11 @@ bool FreetypeServerFont::GetGlyphBitmap1( int nGlyphIndex, RawBitmap& rRawBitmap
  #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
@@ -586,7 +607,7 @@
          nLoadFlags |= FT_LOAD_NO_BITMAP;
  
      FT_Error rc = -1;
-@@ -1496,7 +1522,7 @@ bool FreetypeServerFont::GetGlyphBitmap8
+@@ -1508,7 +1534,7 @@ bool FreetypeServerFont::GetGlyphBitmap8( int nGlyphIndex, RawBitmap& rRawBitmap
      // autohinting in FT<=2.0.4 makes antialiased glyphs look worse
      nLoadFlags |= FT_LOAD_NO_HINTING;
  #else
@@ -595,8 +616,10 @@
          nLoadFlags |= FT_LOAD_NO_HINTING;
  #endif
  
---- vcl/source/glyphs/gcach_ftyp.hxx.64508~	2008-04-11 10:57:45.000000000 +0200
-+++ vcl/source/glyphs/gcach_ftyp.hxx	2008-07-07 21:56:18.264846728 +0200
+diff --git vcl/source/glyphs/gcach_ftyp.hxx vcl/source/glyphs/gcach_ftyp.hxx
+index a7f96bf..9353a1e 100644
+--- vcl/source/glyphs/gcach_ftyp.hxx
++++ vcl/source/glyphs/gcach_ftyp.hxx
 @@ -88,10 +88,6 @@ public:
      int                   GetFaceNum() const        { return mnFaceNum; }
      int                   GetSynthetic() const      { return mnSynthetic; }
@@ -616,9 +639,11 @@
      FtFontInfo*                 mpFontInfo;
      FT_Int                      mnLoadFlags;
      double                      mfStretch;
---- vcl/unx/headless/svpgdi.cxx.64508~	2008-06-24 13:43:16.000000000 +0200
-+++ vcl/unx/headless/svpgdi.cxx	2008-07-07 21:56:18.347846802 +0200
-@@ -576,3 +576,7 @@ bool SvpSalGraphics::supportsOperation( 
+diff --git vcl/unx/headless/svpgdi.cxx vcl/unx/headless/svpgdi.cxx
+index 8c2c605..c54055d 100644
+--- vcl/unx/headless/svpgdi.cxx
++++ vcl/unx/headless/svpgdi.cxx
+@@ -571,3 +571,7 @@ bool SvpSalGraphics::supportsOperation( OutDevSupportType ) const
  {
      return false;
  }
@@ -626,8 +651,10 @@
 +void SvpSalGraphics::GetFontHints( const ImplFontAttributes& , int , ImplFontHints& ) const
 +{
 +}
---- vcl/unx/headless/svpgdi.hxx.64508~	2008-06-24 13:43:31.000000000 +0200
-+++ vcl/unx/headless/svpgdi.hxx	2008-07-07 21:57:29.801845635 +0200
+diff --git vcl/unx/headless/svpgdi.hxx vcl/unx/headless/svpgdi.hxx
+index f10ac54..5ee8cbd 100644
+--- vcl/unx/headless/svpgdi.hxx
++++ vcl/unx/headless/svpgdi.hxx
 @@ -168,6 +168,8 @@ public:
  
      virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
@@ -637,9 +664,11 @@
      virtual SystemGraphicsData GetGraphicsData() const;
  };
  
---- vcl/unx/headless/svppspgraphics.cxx.64508~	2008-06-25 16:35:27.000000000 +0200
-+++ vcl/unx/headless/svppspgraphics.cxx	2008-07-07 21:58:28.536095519 +0200
-@@ -1194,32 +1194,6 @@ ImplDevFontAttributes PspGraphics::Info2
+diff --git vcl/unx/headless/svppspgraphics.cxx vcl/unx/headless/svppspgraphics.cxx
+index a0e5aa5..ea98cf5 100644
+--- vcl/unx/headless/svppspgraphics.cxx
++++ vcl/unx/headless/svppspgraphics.cxx
+@@ -1189,32 +1189,6 @@ ImplDevFontAttributes PspGraphics::Info2DevFontAttributes( const psp::FastPrintF
      aDFA.mePitch        = ToFontPitch (rInfo.m_ePitch);
      aDFA.mbSymbolFlag   = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
  
@@ -672,7 +701,7 @@
      switch( rInfo.m_eType )
      {
          case psp::fonttype::Builtin:
-@@ -1410,3 +1384,7 @@ SystemGraphicsData PspGraphics::GetGraph
+@@ -1405,3 +1379,7 @@ SystemGraphicsData PspGraphics::GetGraphicsData() const
      return aRes;
  }
  
@@ -680,8 +709,10 @@
 +{
 +}
 +
---- vcl/unx/headless/svppspgraphics.hxx.64508~	2008-06-24 13:44:04.000000000 +0200
-+++ vcl/unx/headless/svppspgraphics.hxx	2008-07-07 21:59:02.507846188 +0200
+diff --git vcl/unx/headless/svppspgraphics.hxx vcl/unx/headless/svppspgraphics.hxx
+index f689523..05b43d1 100644
+--- vcl/unx/headless/svppspgraphics.hxx
++++ vcl/unx/headless/svppspgraphics.hxx
 @@ -196,6 +196,7 @@ public:
  
      virtual BOOL			drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize );
@@ -690,9 +721,11 @@
      virtual SystemGraphicsData 		GetGraphicsData() const;
  };
  
---- vcl/unx/inc/pspgraphics.h.64508~	2008-06-24 13:44:18.000000000 +0200
-+++ vcl/unx/inc/pspgraphics.h	2008-07-07 21:56:18.265847554 +0200
-@@ -118,6 +118,7 @@ public:
+diff --git vcl/unx/inc/pspgraphics.h vcl/unx/inc/pspgraphics.h
+index ccd7f27..12614aa 100644
+--- vcl/unx/inc/pspgraphics.h
++++ vcl/unx/inc/pspgraphics.h
+@@ -117,6 +117,7 @@ public:
      virtual void			SetTextColor( SalColor nSalColor );
      virtual USHORT          SetFont( ImplFontSelectData*, int nFallbackLevel );
      virtual void			GetFontMetric( ImplFontMetricData* );
@@ -700,9 +733,11 @@
      virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
      virtual ImplFontCharMap* GetImplFontCharMap() const;
      virtual void			GetDevFontList( ImplDevFontList* );
---- vcl/unx/inc/salgdi.h.64508~	2008-06-24 13:44:34.000000000 +0200
-+++ vcl/unx/inc/salgdi.h	2008-07-07 21:56:18.267846761 +0200
-@@ -248,6 +248,7 @@ public:
+diff --git vcl/unx/inc/salgdi.h vcl/unx/inc/salgdi.h
+index 2950f6f..62bc5b8 100644
+--- vcl/unx/inc/salgdi.h
++++ vcl/unx/inc/salgdi.h
+@@ -250,6 +250,7 @@ public:
      virtual void			SetTextColor( SalColor nSalColor );
      virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
      virtual void			GetFontMetric( ImplFontMetricData* );
@@ -710,9 +745,11 @@
      virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
      virtual ImplFontCharMap* GetImplFontCharMap() const;
      virtual void			GetDevFontList( ImplDevFontList* );
---- vcl/unx/source/gdi/pspgraphics.cxx.64508~	2008-06-25 16:37:04.000000000 +0200
-+++ vcl/unx/source/gdi/pspgraphics.cxx	2008-07-07 21:59:59.777097098 +0200
-@@ -866,6 +866,10 @@ void PspGraphics::GetDevFontSubstList( O
+diff --git vcl/unx/source/gdi/pspgraphics.cxx vcl/unx/source/gdi/pspgraphics.cxx
+index 1290764..11f8382 100644
+--- vcl/unx/source/gdi/pspgraphics.cxx
++++ vcl/unx/source/gdi/pspgraphics.cxx
+@@ -858,6 +858,10 @@ void PspGraphics::GetDevFontSubstList( OutputDevice* pOutDev )
      }
  }
  
@@ -723,7 +760,7 @@
  void PspGraphics::GetFontMetric( ImplFontMetricData *pMetric )
  {
      const psp::PrintFontManager& rMgr = psp::PrintFontManager::get();
-@@ -1278,32 +1282,6 @@ ImplDevFontAttributes PspGraphics::Info2
+@@ -1270,32 +1274,6 @@ ImplDevFontAttributes PspGraphics::Info2DevFontAttributes( const psp::FastPrintF
      aDFA.mePitch        = ToFontPitch (rInfo.m_ePitch);
      aDFA.mbSymbolFlag   = (rInfo.m_aEncoding == RTL_TEXTENCODING_SYMBOL);
  
@@ -756,9 +793,11 @@
      switch( rInfo.m_eType )
      {
          case psp::fonttype::Builtin:
---- vcl/unx/source/gdi/salgdi3.cxx.64508~	2008-04-11 11:55:12.000000000 +0200
-+++ vcl/unx/source/gdi/salgdi3.cxx	2008-07-07 21:56:18.272847047 +0200
-@@ -1612,6 +1612,174 @@ void X11SalGraphics::GetDevFontSubstList
+diff --git vcl/unx/source/gdi/salgdi3.cxx vcl/unx/source/gdi/salgdi3.cxx
+index a40fc78..c247e78 100644
+--- vcl/unx/source/gdi/salgdi3.cxx
++++ vcl/unx/source/gdi/salgdi3.cxx
+@@ -1613,6 +1613,174 @@ void X11SalGraphics::GetDevFontSubstList( OutputDevice* )
  
  // ----------------------------------------------------------------------------
  
@@ -933,9 +972,11 @@
  void
  X11SalGraphics::GetFontMetric( ImplFontMetricData *pMetric )
  {
---- vcl/unx/source/gdi/xlfd_extd.cxx.64508~	2008-06-25 16:37:42.000000000 +0200
-+++ vcl/unx/source/gdi/xlfd_extd.cxx	2008-07-07 21:56:18.273847942 +0200
-@@ -105,9 +105,6 @@ ExtendedXlfd::ExtendedXlfd( bool bScalab
+diff --git vcl/unx/source/gdi/xlfd_extd.cxx vcl/unx/source/gdi/xlfd_extd.cxx
+index 2e51e9d..834123e 100644
+--- vcl/unx/source/gdi/xlfd_extd.cxx
++++ vcl/unx/source/gdi/xlfd_extd.cxx
+@@ -105,9 +105,6 @@ ExtendedXlfd::ExtendedXlfd( bool bScalable )
      mbSubsettable  = false;
      mbEmbeddable   = false;
  
@@ -945,9 +986,11 @@
      mnQuality      = -1;
  }
  
---- vcl/win/inc/salgdi.h.64508~	2008-06-24 13:46:21.000000000 +0200
-+++ vcl/win/inc/salgdi.h	2008-07-07 21:56:18.274847581 +0200
-@@ -277,6 +277,7 @@ public:
+diff --git vcl/win/inc/salgdi.h vcl/win/inc/salgdi.h
+index f2c4926..d090462 100644
+--- vcl/win/inc/salgdi.h
++++ vcl/win/inc/salgdi.h
+@@ -274,6 +274,7 @@ public:
      virtual USHORT         SetFont( ImplFontSelectData*, int nFallbackLevel );
      // get the current font's etrics
      virtual void			GetFontMetric( ImplFontMetricData* );
@@ -955,9 +998,11 @@
      // get kernign pairs of the current font
      // return only PairCount if (pKernPairs == NULL)
      virtual ULONG			GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs );
---- vcl/win/source/gdi/salgdi3.cxx.64508~	2008-04-11 12:48:39.000000000 +0200
-+++ vcl/win/source/gdi/salgdi3.cxx	2008-07-07 21:56:18.277846635 +0200
-@@ -1388,6 +1388,12 @@ USHORT WinSalGraphics::SetFont( ImplFont
+diff --git vcl/win/source/gdi/salgdi3.cxx vcl/win/source/gdi/salgdi3.cxx
+index 9be0cc0..ccb4aba 100644
+--- vcl/win/source/gdi/salgdi3.cxx
++++ vcl/win/source/gdi/salgdi3.cxx
+@@ -1442,6 +1442,12 @@ USHORT WinSalGraphics::SetFont( ImplFontSelectData* pFont, int nFallbackLevel )
  
  // -----------------------------------------------------------------------
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]