summaryrefslogtreecommitdiff
path: root/vcl/source/gdi/sallayout.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-05 23:34:10 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-06 08:10:06 +0100
commitaa2758e133a74cc5d76cdb42478604fcb0fe3f6e (patch)
tree99d1defc61adf4a89b49c61dc8a0c73c5a384362 /vcl/source/gdi/sallayout.cxx
parent7fd432e6f2d7d30228c705bd8db5046387d65866 (diff)
Revert "Does aPos need proper initialization here?"
This reverts commit 55212835b5eba797a14430a0268b3bea773e0852. For one, I'd intended to add the initialization in SalLayout::GetBoundRect, not SalLayout::GetOutline. And for another, if you look closer, the overrides of GetNextGlyphs will always set rPos (ignoring any old value) upon returning non- zero. I'd seen calls to WinSalGraphics::DrawTextLayout -> D2DWriteTextOutRenderer::operator () -> GetBoundRect fail (thus returning false from operator () and causing the assert in DrawTextLayout to fire) after 7453cb58df4ce434a1252567f961cfe497064aca "pPos and pGetNextGlypInfo always have the same value", but maybe that's even normal: Prior to that commit, that call chain would trivially return false: If none of the early returns from operator () hit, the final return (succeeded && bGlyphs && pRectToErase); would always return false as pRectToErase would be passed null from DrawTextLayout, and the assert there was assert(!result);
Diffstat (limited to 'vcl/source/gdi/sallayout.cxx')
-rw-r--r--vcl/source/gdi/sallayout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 2179b63f1983..88f02d66f6fa 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -668,7 +668,7 @@ bool SalLayout::GetOutline( SalGraphics& rSalGraphics,
basegfx::B2DPolyPolygon aGlyphOutline;
- Point aPos(0, 0);
+ Point aPos;
const GlyphItem* pGlyph;
int nStart = 0;
while (GetNextGlyphs(1, &pGlyph, aPos, nStart))