summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-09-07 17:10:16 +0200
committerMichael Meeks <michael.meeks@collabora.com>2015-09-11 07:42:36 +0000
commit7ea01e865114e9f46945b1d721f1360b516df7c9 (patch)
treedd46fb5358fa5a43b189a152eaa985a3064dc93b
parent11100e4c61c1c233025bfe96b8b69d161ef750f3 (diff)
windows opengl: fix CppunitTest_writerperfect_writer
(cherry picked from commit b5df051cc5d734ef9fd77a5336d2bb8d1d4557c9) Reviewed-by: Andras Timar <andras.timar@collabora.com> (cherry picked from commit 315a112f28b480e8e90d42a8ab45d1b448490939) Change-Id: I4a7199633d0d940ae009ac144989da7d6c9262ec Reviewed-on: https://gerrit.libreoffice.org/18463 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--vcl/win/source/gdi/winlayout.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index 139d9af9862c..da72f110cf1c 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -1763,6 +1763,10 @@ bool UniscribeLayout::DrawCachedGlyphs(SalGraphics& rGraphics) const
for (int i = nMinGlyphPos; i < nEndGlyphPos; i++)
{
+ // Ignore dropped glyphs.
+ if (mpOutGlyphs[i] == DROPPED_OUTGLYPH)
+ continue;
+
assert(mrWinFontEntry.GlyphIsCached(mpOutGlyphs[i]));
const OpenGLGlyphCacheChunk& rChunk = mrWinFontEntry.GetCachedGlyphChunkFor(mpOutGlyphs[i]);