[Libreoffice-commits] core.git: filter/source
Caolán McNamara
caolanm at redhat.com
Mon Jan 16 17:01:24 UTC 2017
filter/source/graphicfilter/ios2met/ios2met.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dd70861fd7123c826feefa86f8af1da1f4877c97
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Jan 16 17:00:06 2017 +0000
ofz: ensure nOldSize is > 0
Change-Id: Iaf385c9cd4fd37d56879908c00c7483762d66a0b
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx
index 6d6067c..7a9d624 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -556,7 +556,7 @@ void OS2METReader::AddPointsToArea(const tools::Polygon & rPoly)
else {
tools::Polygon aLastPoly(pPP->GetObject(pPP->Count()-1));
nOldSize=aLastPoly.GetSize();
- if (aLastPoly.GetPoint(nOldSize-1)==rPoly.GetPoint(0)) nOldSize--;
+ if (nOldSize && aLastPoly.GetPoint(nOldSize-1)==rPoly.GetPoint(0)) nOldSize--;
nNewSize=nOldSize+rPoly.GetSize();
aLastPoly.SetSize(nNewSize);
for (i=nOldSize; i<nNewSize; i++) {
@@ -577,7 +577,7 @@ void OS2METReader::AddPointsToPath(const tools::Polygon & rPoly)
else {
tools::Polygon aLastPoly(pPP->GetObject(pPP->Count()-1));
nOldSize=aLastPoly.GetSize();
- if (aLastPoly.GetPoint(nOldSize-1)!=rPoly.GetPoint(0)) pPP->Insert(rPoly);
+ if (nOldSize && aLastPoly.GetPoint(nOldSize-1)!=rPoly.GetPoint(0)) pPP->Insert(rPoly);
else {
nOldSize--;
nNewSize=nOldSize+rPoly.GetSize();
More information about the Libreoffice-commits
mailing list