summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürgen Schmidt <jsc@apache.org>2014-03-28 10:52:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-03-28 16:35:49 +0000
commitcc8aea9e644aa6e750e6521d8a4bffd0e623fb71 (patch)
tree89e99ed1796301d6f3b4bff52e51de14f3c68b77
parentc4b1a736c2c5378f5f7c62e1e350377bcef8832b (diff)
Resolves: #i124453# check if the resulting polygon...
has already exceeded the number of points (2^16) that can be handled by a tools polygon (cherry picked from commit 804e547d70552fd64e1344d538427f8898824b43) Change-Id: I437a84493e264f7b650561599170e831da20c9aa (cherry picked from commit a9582c05f854cad02710178ab7fa79498573269e) (cherry picked from commit ab71a4512557b7290cd7b1b4923463052acf164e)
-rw-r--r--tools/source/generic/poly.cxx13
1 files changed, 13 insertions, 0 deletions
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 9ea5fe4bd429..c83282ceb33d 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -911,6 +911,19 @@ void Polygon::AdaptiveSubdivide( Polygon& rResult, const double d ) const
}
*aPointIter++ = mpImplPolygon->mpPointAry[ i++ ];
+
+ if (aPoints.size() >= SAL_MAX_UINT16)
+ {
+ OSL_ENSURE(aPoints.size() < SAL_MAX_UINT16,
+ "Polygon::AdapativeSubdivision created polygon too many points;"
+ " using original polygon instead");
+
+ // The resulting polygon can not hold all the points
+ // that we have created so far. Stop the subdivision
+ // and return a copy of the unmodified polygon.
+ rResult = *this;
+ return;
+ }
}
// fill result polygon