rpms/libreoffice
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix patch

Browse Source
This commit is contained in:
Caolán McNamara 2011-03-16 16:25:33 +00:00
parent 53e2e18c8e
commit 93ab9f6f28
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
0001-Resolves-rhbz-680460-honour-lcdfilter-subpixeling-et.patch
View File

@ -69,7 +69,7 @@ diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmana
index 92632c7..7b792d3 100644 index 92632c7..7b792d3 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx --- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx
@@ -56,6 +56,9 @@ using namespace psp; @@ -56,6 +56,9 @@
#define FC_HINT_MEDIUM 2 #define FC_HINT_MEDIUM 2
#define FC_HINT_FULL 3 #define FC_HINT_FULL 3
#endif #endif
@ -79,7 +79,7 @@ index 92632c7..7b792d3 100644
#else #else
typedef void FcConfig; typedef void FcConfig;
typedef void FcObjectSet; typedef void FcObjectSet;
@@ -141,6 +144,7 @@ class FontCfgWrapper @@ -136,6 +139,7 @@
FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*); FcBool (*m_pFcPatternAddCharSet)(FcPattern*,const char*,const FcCharSet*);
FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*); FcBool (*m_pFcPatternAddString)(FcPattern*,const char*,const FcChar8*);
FT_UInt (*m_pFcFreeTypeCharIndex)(FT_Face,FcChar32); FT_UInt (*m_pFcFreeTypeCharIndex)(FT_Face,FcChar32);
@ -87,24 +87,21 @@ index 92632c7..7b792d3 100644
oslGenericFunction loadSymbol( const char* ); oslGenericFunction loadSymbol( const char* );
void addFontSet( FcSetName ); void addFontSet( FcSetName );
@@ -257,10 +261,14 @@ public: @@ -250,6 +254,13 @@
{ return m_pFcPatternAddBool( pPattern, pObject, nValue ); }
FcBool FcPatternAddCharSet(FcPattern* pPattern,const char* pObject,const FcCharSet*pCharSet)
{ return m_pFcPatternAddCharSet(pPattern,pObject,pCharSet); }
-
FT_UInt FcFreeTypeCharIndex( FT_Face face, FcChar32 ucs4 ) FT_UInt FcFreeTypeCharIndex( FT_Face face, FcChar32 ucs4 )
{ return m_pFcFreeTypeCharIndex ? m_pFcFreeTypeCharIndex( face, ucs4 ) : 0; } { return m_pFcFreeTypeCharIndex ? m_pFcFreeTypeCharIndex( face, ucs4 ) : 0; }
-
+ FcBool FcPatternAddFTFace( FcPattern* pPattern, const char* pObject, const FT_Face nValue ) + FcBool FcPatternAddFTFace( FcPattern* pPattern, const char* pObject, const FT_Face nValue )
+ { + {
+ return m_pFcPatternAddFTFace + return m_pFcPatternAddFTFace
+ ? m_pFcPatternAddFTFace( pPattern, pObject, nValue ) + ? m_pFcPatternAddFTFace( pPattern, pObject, nValue )
+ : false; + : false;
+ } + }
public: +
FcResult LocalizedElementFromPattern(FcPattern* pPattern, FcChar8 **family, public: // TODO: cleanup
const char *elementtype, const char *elementlangtype); FcResult FamilyFromPattern(FcPattern* pPattern, FcChar8 **family);
@@ -372,6 +380,8 @@ FontCfgWrapper::FontCfgWrapper() std::hash_map< rtl::OString, rtl::OString, rtl::OStringHash > m_aFontNameToLocalized;
@@ -355,6 +366,8 @@
loadSymbol( "FcPatternAddString" ); loadSymbol( "FcPatternAddString" );
m_pFcFreeTypeCharIndex = (FT_UInt(*)(FT_Face,FcChar32)) m_pFcFreeTypeCharIndex = (FT_UInt(*)(FT_Face,FcChar32))
loadSymbol( "FcFreeTypeCharIndex" ); loadSymbol( "FcFreeTypeCharIndex" );
@ -113,7 +110,7 @@ index 92632c7..7b792d3 100644
m_nFcVersion = FcGetVersion(); m_nFcVersion = FcGetVersion();
#if (OSL_DEBUG_LEVEL > 1) #if (OSL_DEBUG_LEVEL > 1)
@@ -1093,6 +1103,26 @@ rtl::OUString PrintFontManager::Substitute(const rtl::OUString& rFontName, @@ -1200,6 +1213,26 @@
return aName; return aName;
} }
@ -140,7 +137,7 @@ index 92632c7..7b792d3 100644
ImplFontOptions* PrintFontManager::getFontOptions( ImplFontOptions* PrintFontManager::getFontOptions(
const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*)) const const FastPrintFontInfo& rInfo, int nSize, void (*subcallback)(void*)) const
{ {
@@ -1103,7 +1133,7 @@ ImplFontOptions* PrintFontManager::getFontOptions( @@ -1210,7 +1243,7 @@
if( ! rWrapper.isValid() ) if( ! rWrapper.isValid() )
return NULL; return NULL;
@ -149,7 +146,7 @@ index 92632c7..7b792d3 100644
FcConfig* pConfig = rWrapper.FcConfigGetCurrent(); FcConfig* pConfig = rWrapper.FcConfigGetCurrent();
FcPattern* pPattern = rWrapper.FcPatternCreate(); FcPattern* pPattern = rWrapper.FcPatternCreate();
@@ -1140,9 +1170,10 @@ ImplFontOptions* PrintFontManager::getFontOptions( @@ -1247,9 +1280,10 @@
FC_HINTING, 0, &hinting); FC_HINTING, 0, &hinting);
/*FcResult eHintStyle =*/ rWrapper.FcPatternGetInteger(pResult, /*FcResult eHintStyle =*/ rWrapper.FcPatternGetInteger(pResult,
FC_HINT_STYLE, 0, &hintstyle); FC_HINT_STYLE, 0, &hintstyle);