mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fold GetGlyphMetric and GetGlyphData together

Browse Source 
Change-Id: I12ea240bab223fb62a58a14fecc821e9075fa59e
Reviewed-on: https://gerrit.libreoffice.org/31114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2016-11-23 11:56:10 +00:00
parent 6f1ae11761
commit 944f8f8adf
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/inc/unx/glyphcache.hxx
View File

@@ -168,8 +168,7 @@ public:
const FontCharMapRef GetFontCharMap() const;
bool GetFontCapabilities(vcl::FontCapabilities &) const;
const GlyphMetric& GetGlyphMetric( sal_GlyphId aGlyphId )
{ return GetGlyphData( aGlyphId ).GetMetric(); }
const GlyphMetric& GetGlyphMetric(sal_GlyphId aGlyphId);
#if ENABLE_GRAPHITE
GraphiteFaceWrapper* GetGraphiteFace() const;
@@ -201,7 +200,6 @@ private:
void ApplyGlyphTransform( int nGlyphFlags, FT_GlyphRec_* ) const;
void ApplyGSUB( const FontSelectPattern& );
GlyphData& GetGlyphData( sal_GlyphId );
ServerFontLayoutEngine* GetLayoutEngine();

6
vcl/unx/generic/glyphs/glyphcache.cxx
View File

@@ -304,14 +304,14 @@ long FreetypeFont::Release() const
return --mnRefCount;
}
GlyphData& FreetypeFont::GetGlyphData( sal_GlyphId aGlyphId )
const GlyphMetric& FreetypeFont::GetGlyphMetric(sal_GlyphId aGlyphId)
{
// usually the GlyphData is cached
GlyphList::iterator it = maGlyphList.find( aGlyphId );
if( it != maGlyphList.end() ) {
GlyphData& rGlyphData = it->second;
GlyphCache::GetInstance().UsingGlyph( *this, rGlyphData );
return rGlyphData;
return rGlyphData.GetMetric();
}
// sometimes not => we need to create and initialize it ourselves
@@ -319,7 +319,7 @@ GlyphData& FreetypeFont::GetGlyphData( sal_GlyphId aGlyphId )
mnBytesUsed += sizeof( GlyphData );
InitGlyphData( aGlyphId, rGlyphData );
GlyphCache::GetInstance().AddedGlyph( *this, rGlyphData );
return rGlyphData;
return rGlyphData.GetMetric();
}
void FreetypeFont::GarbageCollect( long nMinLruIndex )