diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-08 05:57:40 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-11 00:22:05 +0000 |
| commit | a597dc833966aba23d4b677e5bcd6f74b979fc9d (patch) | |
| tree | 1d726a37763038278a9117628388dc55c1c969d1 /vcl/unx/generic/glyphs/glyphcache.cxx | |
| parent | 0fb0a564bf9cb0f721e812ac4bfa70e951827bdd (diff) | |
sal_GlyphId is a simple glyph id now
No more cleverness.
Change-Id: I760c602802961b37728c6987c4ade14fb02ca034
Reviewed-on: https://gerrit.libreoffice.org/31819
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/unx/generic/glyphs/glyphcache.cxx')
| -rw-r--r-- | vcl/unx/generic/glyphs/glyphcache.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/unx/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx index b41f7c08c376..103fc5468793 100644 --- a/vcl/unx/generic/glyphs/glyphcache.cxx +++ b/vcl/unx/generic/glyphs/glyphcache.cxx @@ -307,7 +307,7 @@ long FreetypeFont::Release() const const GlyphMetric& FreetypeFont::GetGlyphMetric(const GlyphItem& rGlyph) { // usually the GlyphData is cached - GlyphList::iterator it = maGlyphList.find(rGlyph.maGlyphId & GF_IDXMASK); + GlyphList::iterator it = maGlyphList.find(rGlyph.maGlyphId); if( it != maGlyphList.end() ) { GlyphData& rGlyphData = it->second; GlyphCache::GetInstance().UsingGlyph( *this, rGlyphData ); @@ -315,7 +315,7 @@ const GlyphMetric& FreetypeFont::GetGlyphMetric(const GlyphItem& rGlyph) } // sometimes not => we need to create and initialize it ourselves - GlyphData& rGlyphData = maGlyphList[rGlyph.maGlyphId & GF_IDXMASK]; + GlyphData& rGlyphData = maGlyphList[rGlyph.maGlyphId]; mnBytesUsed += sizeof( GlyphData ); InitGlyphData(rGlyph, rGlyphData); GlyphCache::GetInstance().AddedGlyph( *this, rGlyphData ); |