diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-09-30 14:00:54 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2018-10-25 17:35:05 +0200 |
| commit | 134447e78f00d7378406d0a3fa5a4c5d3a02032e (patch) | |
| tree | ce9651e90cf291b8be43fd7459f80348a7d9ae1a /vcl/unx/generic/glyphs | |
| parent | 094e7b6a1028620c2b1503de8b51dc6a2482e290 (diff) | |
Move GlyphItem into its own header
Actually GlyphItem should be VCL internal, but this requires a
transparent SalLayoutGlyphs (i.e. via pImpl), which I'm too lazy
to implement currently.
This seperation makes the affected source files more obvious and
later migration of vcl/glyphitem.hxx easier.
While at it apply the coding style and add '_' to member prefix.
Change-Id: I61497af5c628c40f51597ce0ef286c47321acbc2
Reviewed-on: https://gerrit.libreoffice.org/62358
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/unx/generic/glyphs')
| -rw-r--r-- | vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 90a04e904379..74bbd7093411 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -591,12 +591,12 @@ void FreetypeFont::ApplyGlyphTransform(bool bVertical, FT_Glyph pGlyphFT ) const bool FreetypeFont::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect) { assert(mpFontInstance.is()); - if (mpFontInstance.is() && mpFontInstance->GetCachedGlyphBoundRect(rGlyph.maGlyphId, rRect)) + if (mpFontInstance.is() && mpFontInstance->GetCachedGlyphBoundRect(rGlyph.m_aGlyphId, rRect)) return true; FT_Activate_Size( maSizeFT ); - FT_Error rc = FT_Load_Glyph(maFaceFT, rGlyph.maGlyphId, mnLoadFlags); + FT_Error rc = FT_Load_Glyph(maFaceFT, rGlyph.m_aGlyphId, mnLoadFlags); if (rc != FT_Err_Ok) return false; @@ -616,7 +616,7 @@ bool FreetypeFont::GetGlyphBoundRect(const GlyphItem& rGlyph, tools::Rectangle& rRect = tools::Rectangle(aBbox.xMin, -aBbox.yMax, aBbox.xMax, -aBbox.yMin); if (mpFontInstance.is()) - mpFontInstance->CacheGlyphBoundRect(rGlyph.maGlyphId, rRect); + mpFontInstance->CacheGlyphBoundRect(rGlyph.m_aGlyphId, rRect); FT_Done_Glyph( pGlyphFT ); @@ -894,7 +894,7 @@ bool FreetypeFont::GetGlyphOutline(const GlyphItem& rGlyph, nLoadFlags |= FT_LOAD_TARGET_LIGHT; #endif - FT_Error rc = FT_Load_Glyph(maFaceFT, rGlyph.maGlyphId, nLoadFlags); + FT_Error rc = FT_Load_Glyph(maFaceFT, rGlyph.m_aGlyphId, nLoadFlags); if( rc != FT_Err_Ok ) return false; |