aboutsummaryrefslogtreecommitdiffstats
path: root/libqpdf/QPDFObjectHandle.cc
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2019-09-20 03:03:58 +0200
committerJay Berkenbilt <ejb@ql.org>2019-09-20 03:25:34 +0200
commit685250d7d6cc285be86e2c9e628449b51e08d489 (patch)
tree5fcdc4568088dbd8d85664008b44b634e4b7dc36 /libqpdf/QPDFObjectHandle.cc
parent48b7de2cc3c48bfb30da0bba60e070eac7c8f6fb (diff)
downloadqpdf-685250d7d6cc285be86e2c9e628449b51e08d489.tar.zst
Correct reversed Rectangle coordinates (fixes #363)
Diffstat (limited to 'libqpdf/QPDFObjectHandle.cc')
-rw-r--r--libqpdf/QPDFObjectHandle.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/libqpdf/QPDFObjectHandle.cc b/libqpdf/QPDFObjectHandle.cc
index 4ee25bc7..e36a7a2a 100644
--- a/libqpdf/QPDFObjectHandle.cc
+++ b/libqpdf/QPDFObjectHandle.cc
@@ -30,6 +30,7 @@
#include <ctype.h>
#include <limits.h>
#include <cstring>
+#include <algorithm>
class TerminateParsing
{
@@ -717,10 +718,17 @@ QPDFObjectHandle::getArrayAsRectangle()
Rectangle result;
if (isRectangle())
{
- result = Rectangle(getArrayItem(0).getNumericValue(),
- getArrayItem(1).getNumericValue(),
- getArrayItem(2).getNumericValue(),
- getArrayItem(3).getNumericValue());
+ // Rectangle coordinates are always supposed to be llx, lly,
+ // urx, ury, but files have been found in the wild where
+ // llx > urx or lly > ury.
+ double i0 = getArrayItem(0).getNumericValue();
+ double i1 = getArrayItem(1).getNumericValue();
+ double i2 = getArrayItem(2).getNumericValue();
+ double i3 = getArrayItem(3).getNumericValue();
+ result = Rectangle(std::min(i0, i2),
+ std::min(i1, i3),
+ std::max(i0, i2),
+ std::max(i1, i3));
}
return result;
}