summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleks Kissinger <aleks0@gmail.com>2019-01-03 14:09:21 +0100
committerAleks Kissinger <aleks0@gmail.com>2019-01-03 14:09:21 +0100
commitaf55e1aac22126f72f738a666db01c8a146d99dc (patch)
tree13e1df68b86a3a6371a75b5e8c5db267a9c07ba9
parent99bc4eedae99fc813db3a852139758bca75bddd7 (diff)
removed dep on fmin()
-rw-r--r--src/data/pdfdocument.cpp6
-rw-r--r--src/util.cpp1
2 files changed, 5 insertions, 2 deletions
diff --git a/src/data/pdfdocument.cpp b/src/data/pdfdocument.cpp
index 9b213b2..c9574b8 100644
--- a/src/data/pdfdocument.cpp
+++ b/src/data/pdfdocument.cpp
@@ -39,9 +39,11 @@ void PdfDocument::renderTo(QLabel *label, QRect rect)
//QRect rect = ui->scrollArea->visibleRegion().boundingRect();
int w = static_cast<int>(ratio * (rect.width() - 20));
int h = static_cast<int>(ratio * (rect.height() - 20));
- qreal scale = fmin(static_cast<qreal>(w) / pageSize.width(),
- static_cast<qreal>(h) / pageSize.height());
+ // not all platforms have fmin, compute the min by hand
+ qreal hscale = static_cast<qreal>(w) / pageSize.width();
+ qreal vscale = static_cast<qreal>(h) / pageSize.height();
+ qreal scale = (hscale < vscale) ? hscale : vscale;
int dpi = static_cast<int>(scale * 72.0);
int w1 = static_cast<int>(scale * pageSize.width());
diff --git a/src/util.cpp b/src/util.cpp
index 72b94eb..304f9e7 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -79,3 +79,4 @@ QString floatToString(qreal f) {
if (almostZero(f)) return "0";
else return QString::number(f);
}
+