summaryrefslogtreecommitdiff
path: root/libopie2/opiemm/oimagescrollview.cpp
Side-by-side diff
Diffstat (limited to 'libopie2/opiemm/oimagescrollview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiemm/oimagescrollview.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/libopie2/opiemm/oimagescrollview.cpp b/libopie2/opiemm/oimagescrollview.cpp
index 56be10b..37a1ad5 100644
--- a/libopie2/opiemm/oimagescrollview.cpp
+++ b/libopie2/opiemm/oimagescrollview.cpp
@@ -6,2 +6,3 @@
#include <opie2/owait.h>
+#include <opie2/opieexif.h>
@@ -89,2 +90,4 @@ void OImageScrollView::loadJpeg(bool interncall)
if (!interncall) {
+ ExifData xf;
+ bool scanned = xf.scan(m_lastName);
int wid, hei;
@@ -97,6 +100,9 @@ void OImageScrollView::loadJpeg(bool interncall)
}
- param = QString( "Fast Shrink( 3 ) Scale( %1, %2, ScaleMin)" ).arg( wid ).arg( hei );
- odebug << "Load jpeg scaled \"" << param << "\"" << oendl;
- iio.setParameters(param.latin1());
- setImageScaledLoaded(true);
+ if ( (scanned && (wid<xf.getWidth()||hei<xf.getHeight()))||!scanned ) {
+ param = QString( "Fast Shrink( 3 ) Scale( %1, %2, ScaleMin)" ).arg( wid ).arg( hei );
+ odebug << "Load jpeg scaled \"" << param << "\"" << oendl;
+ iio.setParameters(param.latin1());
+ setImageScaledLoaded(true);
+ }
+
real_load = true;