diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-08 04:39:16 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-11 00:21:15 +0000 |
| commit | 57d248bcec3c6ae3fa1a943a9fd92c566239787f (patch) | |
| tree | 1bcd3c6e4a4f4799bfb0442f2877a3e06d61cee6 /vcl/quartz | |
| parent | 9fb706f9fe216f6157b9052bc42a0601d8ae52d5 (diff) | |
Don’t encode the vertical flag in the glyph id
Change-Id: I00485dd4d42004e4eaa163a9e6ad0a43cf98a30a
Reviewed-on: https://gerrit.libreoffice.org/31816
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/ctfonts.cxx | 4 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/quartz/ctfonts.cxx b/vcl/quartz/ctfonts.cxx index 300ee4dafe3d..52062eb86e21 100644 --- a/vcl/quartz/ctfonts.cxx +++ b/vcl/quartz/ctfonts.cxx @@ -162,8 +162,8 @@ bool CoreTextStyle::GetGlyphBoundRect(const GlyphItem& rGlyph, Rectangle& rRect SAL_WNODEPRECATED_DECLARATIONS_POP CGRect aCGRect = CTFontGetBoundingRectsForGlyphs(aCTFontRef, aFontOrientation, &nCGGlyph, nullptr, 1); - // Apply font rotation to non-upright glyphs. - if (mfFontRotation && !(rGlyph.maGlyphId & GF_ROTMASK)) + // Apply font rotation to non-vertical glyphs. + if (mfFontRotation && !rGlyph.IsVertical()) aCGRect = CGRectApplyAffineTransform(aCGRect, CGAffineTransformMakeRotation(mfFontRotation)); rRect.Left() = lrint( aCGRect.origin.x ); diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index c593b8887de0..c8f9c75b52f8 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -429,7 +429,7 @@ void AquaSalGraphics::DrawTextLayout(const CommonSalLayout& rLayout) if (rStyle.mfFontRotation) { - if ((pGlyph->maGlyphId & GF_ROTMASK) == GF_ROTL) + if (pGlyph->IsVertical()) { bUprightGlyph = true; // Adjust the position of upright (vertical) glyphs. |