summaryrefslogtreecommitdiff
path: root/libopie2/opiemm/oimagescrollview.cpp
authoralwin <alwin>2004-11-01 19:52:25 (UTC)
committer alwin <alwin>2004-11-01 19:52:25 (UTC)
commit2dc92f4bfe9e81edc2b0b24ecacf3bc44b344984 (patch) (side-by-side diff)
treeb1d5661ea64931b6eeb2030ceb22532cef699a75 /libopie2/opiemm/oimagescrollview.cpp
parent5a41dcd5901badbd2e258b0a916fb012b6351eeb (diff)
downloadopie-2dc92f4bfe9e81edc2b0b24ecacf3bc44b344984.zip
opie-2dc92f4bfe9e81edc2b0b24ecacf3bc44b344984.tar.gz
opie-2dc92f4bfe9e81edc2b0b24ecacf3bc44b344984.tar.bz2
exif class added (taken from opie-eye_slave and more c++ like reworked)
it is used in oimageview while loading jpegs checking BEFORE loading if the image should be scaled loaded. ToDo: documentation of the interface, remove it from opie-eye_slave (it should use of course the library version)
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
@@ -4,6 +4,7 @@
#include <opie2/odebug.h>
#include <opie2/oapplication.h>
#include <opie2/owait.h>
+#include <opie2/opieexif.h>
#include <qimage.h>
#include <qlayout.h>
@@ -87,6 +88,8 @@ void OImageScrollView::loadJpeg(bool interncall)
bool real_load = false;
if (AutoScale()) {
if (!interncall) {
+ ExifData xf;
+ bool scanned = xf.scan(m_lastName);
int wid, hei;
wid = QApplication::desktop()->width();
hei = QApplication::desktop()->height();
@@ -95,10 +98,13 @@ void OImageScrollView::loadJpeg(bool interncall)
} else {
hei = wid;
}
- 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;
}
} else {