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/win/gdi | |
| 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/win/gdi')
| -rw-r--r-- | vcl/win/gdi/winlayout.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index f78e71f13cdf..8b218630d531 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -295,7 +295,7 @@ bool ExTextOutRenderer::operator ()(SalLayout const &rLayout, HDC hDC, { bGlyphs = true; WORD glyphWStr[] = { pGlyph->maGlyphId & GF_IDXMASK }; - if ((pGlyph->maGlyphId & GF_ROTMASK) == GF_ROTL) + if (pGlyph->IsVertical()) glyphWStr[0] |= GF_VERT; ExtTextOutW(hDC, pPos->X(), pPos->Y(), ETO_GLYPH_INDEX, nullptr, LPCWSTR(&glyphWStr), 1, nullptr); } @@ -401,7 +401,7 @@ bool D2DWriteTextOutRenderer::operator ()(SalLayout const &rLayout, HDC hDC, 0 }; - if (bVertical && (pGlyph->maGlyphId & GF_ROTMASK) != GF_ROTL) + if (bVertical && !pGlyph->IsVertical()) { D2D1MakeRotateMatrix(90.0f, baseline, &aRotTrans); mpRT->SetTransform(aOrigTrans * aRotTrans); @@ -546,7 +546,7 @@ bool D2DWriteTextOutRenderer::GetDWriteInkBox(SalLayout const &rLayout, Rectangl { positions.push_back(aPos); indices.push_back(pGlyph->maGlyphId & GF_IDXMASK); - vertical.push_back((pGlyph->maGlyphId & GF_ROTMASK) == GF_ROTL); + vertical.push_back(pGlyph->IsVertical()); } auto aBoxes = GetGlyphInkBoxes(indices.data(), indices.data() + indices.size()); |