diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:45:44 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-02 16:54:18 +0300 |
commit | 50bf123ddbeb457b89636621a99c971834adf3ab (patch) | |
tree | b7782261998ca0b6bece98543e2c66e3c96f4d3c /vcl/generic/glyphs/gcach_ftyp.cxx | |
parent | db1c9e4dadc90c5afe3190776a60cc5dcbbce3ac (diff) |
Kill superfluous vertical whitespace
Change-Id: I81ce8fd7022bf283db668705efdfb0666f87bde9
Diffstat (limited to 'vcl/generic/glyphs/gcach_ftyp.cxx')
-rw-r--r-- | vcl/generic/glyphs/gcach_ftyp.cxx | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx b/vcl/generic/glyphs/gcach_ftyp.cxx index 92da831181eb..ab5ddd8afa7b 100644 --- a/vcl/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/generic/glyphs/gcach_ftyp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "gcach_ftyp.hxx" #include "vcl/svapp.hxx" @@ -89,8 +88,6 @@ static void InitGammaTable() } } - - static FT_Library aLibFT = 0; // enable linking with old FT versions @@ -100,8 +97,6 @@ typedef ::boost::unordered_map<const char*, boost::shared_ptr<FtFontFile>, rtl:: namespace { struct vclFontFileList : public rtl::Static< FontFileList, vclFontFileList > {}; } - - // TODO: remove when the priorities are selected by UI // if (AH==0) => disable autohinting // if (AA==0) => disable antialiasing @@ -113,10 +108,8 @@ static int nDefaultPrioEmbedded = 2; static int nDefaultPrioAutoHint = 1; static int nDefaultPrioAntiAlias = 1; - // FreetypeManager - FtFontFile::FtFontFile( const OString& rNativeFileName ) : maNativeFileName( rNativeFileName ), mpFileMap( NULL ), @@ -143,8 +136,6 @@ FtFontFile::FtFontFile( const OString& rNativeFileName ) } } - - FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) { // font file already known? (e.g. for ttc, synthetic, aliased fonts) @@ -161,8 +152,6 @@ FtFontFile* FtFontFile::FindFontFile( const OString& rNativeFileName ) return pFontFile; } - - bool FtFontFile::Map() { if( mnRefCount++ <= 0 ) @@ -190,8 +179,6 @@ bool FtFontFile::Map() return (mpFileMap != NULL); } - - void FtFontFile::Unmap() { if( (--mnRefCount > 0) || (mpFileMap == NULL) ) @@ -228,8 +215,6 @@ const void * graphiteFontTable(const void* appFaceHandle, unsigned int name, siz } #endif - - FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, const OString& rNativeFileName, int nFaceNum, sal_IntPtr nFontId, int nSynthetic) : @@ -254,8 +239,6 @@ FtFontInfo::FtFontInfo( const ImplDevFontAttributes& rDevFontAttributes, maDevFontAttributes.mnQuality += mpFontFile->GetLangBoost(); } - - FtFontInfo::~FtFontInfo() { if( mpFontCharMap ) @@ -274,8 +257,6 @@ void FtFontInfo::InitHashes() const mpGlyph2Char = new Int2IntMap(); } - - FT_FaceRec_* FtFontInfo::GetFaceFT() { if (!maFaceFT && mpFontFile->Map()) @@ -314,8 +295,6 @@ GraphiteFaceWrapper * FtFontInfo::GetGraphiteFace() } #endif - - void FtFontInfo::ReleaseFaceFT() { if (--mnRefCount <= 0) @@ -326,8 +305,6 @@ void FtFontInfo::ReleaseFaceFT() } } - - static unsigned GetUInt( const unsigned char* p ) { return((p[0]<<24)+(p[1]<<16)+(p[2]<<8)+p[3]);} static unsigned GetUShort( const unsigned char* p ){ return((p[0]<<8)+p[1]);} //static signed GetSShort( const unsigned char* p ){ return((short)((p[0]<<8)+p[1]));} @@ -372,16 +349,12 @@ const unsigned char* FtFontInfo::GetTable( const char* pTag, sal_uLong* pLength return NULL; } - - void FtFontInfo::AnnounceFont( PhysicalFontCollection* pFontCollection ) { ImplFTSFontData* pFD = new ImplFTSFontData( this, maDevFontAttributes ); pFontCollection->Add( pFD ); } - - FreetypeManager::FreetypeManager() : mnMaxFontId( 0 ) { @@ -407,8 +380,6 @@ FreetypeManager::FreetypeManager() vclFontFileList::get(); } - - FT_Face ServerFont::GetFtFace() const { FT_Activate_Size( maSizeFT ); @@ -416,15 +387,11 @@ FT_Face ServerFont::GetFtFace() const return maFaceFT; } - - FreetypeManager::~FreetypeManager() { ClearFontList(); } - - void FreetypeManager::AddFontFile( const OString& rNormalizedName, int nFaceNum, sal_IntPtr nFontId, const ImplDevFontAttributes& rDevFontAttr) { @@ -441,8 +408,6 @@ void FreetypeManager::AddFontFile( const OString& rNormalizedName, mnMaxFontId = nFontId; } - - void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const { for( FontList::const_iterator it = maFontList.begin(); it != maFontList.end(); ++it ) @@ -452,8 +417,6 @@ void FreetypeManager::AnnounceFonts( PhysicalFontCollection* pToAdd ) const } } - - void FreetypeManager::ClearFontList( ) { for( FontList::iterator it = maFontList.begin(); it != maFontList.end(); ++it ) @@ -464,8 +427,6 @@ void FreetypeManager::ClearFontList( ) maFontList.clear(); } - - ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) { FtFontInfo* pFontInfo = NULL; @@ -484,8 +445,6 @@ ServerFont* FreetypeManager::CreateFont( const FontSelectPattern& rFSD ) return pNew; } - - ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& rDFA ) : PhysicalFontFace( rDFA, IFTSFONT_MAGIC ), mpFtFontInfo( pFI ) @@ -494,18 +453,14 @@ ImplFTSFontData::ImplFTSFontData( FtFontInfo* pFI, const ImplDevFontAttributes& mbOrientation = true; } - - ImplFontEntry* ImplFTSFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { ImplServerFontEntry* pEntry = new ImplServerFontEntry( rFSD ); return pEntry; } - // ServerFont - ServerFont::ServerFont( const FontSelectPattern& rFSD, FtFontInfo* pFI ) : maGlyphList( 0), maFontSelData(rFSD), @@ -668,8 +623,6 @@ bool ServerFont::TestFont() const return mbFaceOk; } - - ServerFont::~ServerFont() { if( mpLayoutEngine ) @@ -683,15 +636,11 @@ ServerFont::~ServerFont() ReleaseFromGarbageCollect(); } - - int ServerFont::GetEmUnits() const { return maFaceFT->units_per_EM; } - - void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const { static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes(); @@ -814,8 +763,6 @@ void ServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const } } - - static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyphId, int& nGlyphFlags ) { nGlyphFlags = rGlyphId & GF_FLAGMASK; @@ -825,8 +772,6 @@ static inline void SplitGlyphFlags( const ServerFont& rFont, sal_GlyphId& rGlyph rGlyphId = rFont.GetRawGlyphIndex( rGlyphId ); } - - int ServerFont::ApplyGlyphTransform( int nGlyphFlags, FT_Glyph pGlyphFT, bool bForBitmapProcessing ) const { @@ -900,8 +845,6 @@ int ServerFont::ApplyGlyphTransform( int nGlyphFlags, return nAngle; } - - sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const { if( mpFontInfo->IsSymbolFont() ) @@ -945,8 +888,6 @@ sal_GlyphId ServerFont::GetRawGlyphIndex(sal_UCS4 aChar, sal_UCS4 aVS) const return sal_GlyphId( nGlyphIndex); } - - sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) const { int nGlyphFlags = GF_NONE; @@ -981,9 +922,6 @@ sal_GlyphId ServerFont::FixupGlyphIndex( sal_GlyphId aGlyphId, sal_UCS4 aChar ) return aGlyphId; } - - - sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const { sal_GlyphId aGlyphId = GetRawGlyphIndex( aChar ); @@ -991,8 +929,6 @@ sal_GlyphId ServerFont::GetGlyphIndex( sal_UCS4 aChar ) const return aGlyphId; } - - static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags ) { int nCharWidth = pFaceFT->glyph->metrics.horiAdvance; @@ -1006,8 +942,6 @@ static int lcl_GetCharWidth( FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFl return (nCharWidth + 32) >> 6; } - - void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const { FT_Activate_Size( maSizeFT ); @@ -1058,8 +992,6 @@ void ServerFont::InitGlyphData( sal_GlyphId aGlyphId, GlyphData& rGD ) const FT_Done_Glyph( pGlyphFT ); } - - bool ServerFont::GetAntialiasAdvice( void ) const { if( GetFontSelData().mbNonAntialiased || (mnPrioAntiAlias<=0) ) @@ -1069,8 +1001,6 @@ bool ServerFont::GetAntialiasAdvice( void ) const return bAdviseAA; } - - bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const { FT_Activate_Size( maSizeFT ); @@ -1210,8 +1140,6 @@ bool ServerFont::GetGlyphBitmap1( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) return true; } - - bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) const { FT_Activate_Size( maSizeFT ); @@ -1342,10 +1270,8 @@ bool ServerFont::GetGlyphBitmap8( sal_GlyphId aGlyphId, RawBitmap& rRawBitmap ) return true; } - // determine unicode ranges in font - const ImplFontCharMap* ServerFont::GetImplFontCharMap( void ) const { const ImplFontCharMap* pIFCMap = mpFontInfo->GetImplFontCharMap(); @@ -1442,10 +1368,8 @@ bool ServerFont::GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) c return bRet; } - // outline stuff - class PolyArgs { public: @@ -1471,8 +1395,6 @@ private: bool bHasOffline; }; - - PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) : mrPolyPoly(rPolyPoly), mnMaxPoints(nMaxPoints), @@ -1485,17 +1407,12 @@ PolyArgs::PolyArgs( PolyPolygon& rPolyPoly, sal_uInt16 nMaxPoints ) maPosition.x = maPosition.y = 0; } - - - PolyArgs::~PolyArgs() { delete[] mpFlagAry; delete[] mpPointAry; } - - void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag ) { DBG_ASSERT( (mnPoints < mnMaxPoints), "FTGlyphOutline: AddPoint overflow!" ); @@ -1509,8 +1426,6 @@ void PolyArgs::AddPoint( long nX, long nY, PolyFlags aFlag ) bHasOffline |= (aFlag != POLY_NORMAL); } - - void PolyArgs::ClosePolygon() { if( !mnPoly++ ) @@ -1555,8 +1470,6 @@ void PolyArgs::ClosePolygon() bHasOffline = false; } - - extern "C" { // TODO: wait till all compilers accept that calling conventions @@ -1608,8 +1521,6 @@ static int FT_cubic_to( FT_Vector_CPtr p1, FT_Vector_CPtr p2, FT_Vector_CPtr p3, } // extern "C" - - bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, ::basegfx::B2DPolyPolygon& rB2DPolyPoly ) const { @@ -1686,8 +1597,6 @@ bool ServerFont::GetGlyphOutline( sal_GlyphId aGlyphId, return true; } - - bool ServerFont::ApplyGSUB( const FontSelectPattern& rFSD ) { #define MKTAG(s) ((((((s[0]<<8)+s[1])<<8)+s[2])<<8)+s[3]) @@ -1943,6 +1852,4 @@ GraphiteFaceWrapper* ServerFont::GetGraphiteFace() const } #endif - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |