summaryrefslogtreecommitdiffstats
path: root/helper.cpp
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2015-10-11 08:16:28 +0200
committerArno <arno@disconnect.de>2015-10-11 08:16:28 +0200
commit55d48519c9132c6d213f2e733bcd806e3b1f05fb (patch)
treeccaec3219ebfb05ea9a742398ee5e4c47713eae5 /helper.cpp
parentb8c44e336b596aa45f4fd4054353912b73b71e66 (diff)
downloadSheMov-55d48519c9132c6d213f2e733bcd806e3b1f05fb.tar.gz
SheMov-55d48519c9132c6d213f2e733bcd806e3b1f05fb.tar.bz2
SheMov-55d48519c9132c6d213f2e733bcd806e3b1f05fb.zip
Change image size calculation
Use ImageMagick::Image::ping to determine the size of an image, but only if the file size is < 400kb to prevent the impression of a deadlock.
Diffstat (limited to 'helper.cpp')
-rw-r--r--helper.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/helper.cpp b/helper.cpp
index ed1d31a..dd6bedf 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -308,12 +308,10 @@ namespace Helper {
}
QVariant picSize(const QString &path){
- QImage img(path);
- if(!img.isNull()){
- QString retval = QString("%1x%2").arg(QString::number(img.width())).arg(QString::number(img.height()));
- return retval;
- }
- return QVariant();
+ Magick::Image img;
+ img.ping(qPrintable(path));
+ QString retval = QString("%1x%2").arg(QString::number(img.columns())).arg(QString::number(img.rows()));
+ return retval;
}
PicData convertToPng(PicData data){