From 3a878d3dbfdb11cf2f0cce9dbf28a408c130d556 Mon Sep 17 00:00:00 2001 From: Petr Mladek Date: Tue, 20 Mar 2012 11:35:13 +0100 Subject: vcl: better check in GraphiteLayout::expandOrCondense: Improves the commit d066f7e4afb3c9e395932ba7bf8715ad0770bcdd that fixed crash when printing the bugdoc from i#103958 --- vcl/source/glyphs/graphite_layout.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vcl/source/glyphs') diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx index 1ec9650a3acb..93c1bc559857 100644 --- a/vcl/source/glyphs/graphite_layout.cxx +++ b/vcl/source/glyphs/graphite_layout.cxx @@ -847,7 +847,7 @@ void GraphiteLayout::expandOrCondense(ImplLayoutArgs &rArgs) assert(nCharIndex > -1); mvCharDxs[nCharIndex-mnMinCharPos] += nOffset; // adjust char dxs for rest of characters in cluster - while (++nCharIndex < static_cast(mvChar2BaseGlyph.size())) + while (++nCharIndex - mnMinCharPos < static_cast(mvChar2BaseGlyph.size())) { int nChar2Base = mvChar2BaseGlyph[nCharIndex-mnMinCharPos]; if (nChar2Base == -1 || nChar2Base == static_cast(i)) -- cgit