summaryrefslogtreecommitdiff
authoralwin <alwin>2004-11-01 13:33:51 (UTC)
committer alwin <alwin>2004-11-01 13:33:51 (UTC)
commit915af02212ea80e43da5bcc24415e3e48778bea9 (patch) (side-by-side diff)
treeeff6dbcc2f1e62dfbb8f6ababe183306fe2077e1
parentb3153506a1be76a386f23a3af44f84042d148111 (diff)
downloadopie-915af02212ea80e43da5bcc24415e3e48778bea9.zip
opie-915af02212ea80e43da5bcc24415e3e48778bea9.tar.gz
opie-915af02212ea80e43da5bcc24415e3e48778bea9.tar.bz2
when jpeg image is smaller than requested thumbsize it will not use
scaled loading
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/opie-eye/slave/jpeg_slave.cpp52
1 files changed, 30 insertions, 22 deletions
diff --git a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
index fb7d5de..1bb81d9 100644
--- a/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
+++ b/noncore/graphics/opie-eye/slave/jpeg_slave.cpp
@@ -12,9 +12,9 @@ using namespace Opie::Core;
#include <qobject.h>
#include <qimage.h>
/**
- exif.h
+ exif.h
*/
#include <stdio.h>
#include <stdlib.h>
@@ -265,9 +265,9 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
if (marker != 0xff) break;
if (a >= 6){
- owarn << "too many padding bytes" << oendl;
+ owarn << "too many padding bytes" << oendl;
return false;
}
}
@@ -330,16 +330,16 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
}
return true;
case M_EOI: // in case it's a tables-only JPEG stream
- owarn << "No image in jpeg!" << oendl;
+ owarn << "No image in jpeg!" << oendl;
return false;
case M_COM: // Comment section
- // pieczy 2002-02-12
- // now the User comment goes to UserComment
- // so we can store a Comment section also in READ_EXIF mode
- process_COM(Data, itemlen);
+ // pieczy 2002-02-12
+ // now the User comment goes to UserComment
+ // so we can store a Comment section also in READ_EXIF mode
+ process_COM(Data, itemlen);
break;
case M_JFIF:
// Regular jpegs always have this tag, exif images have the exif
@@ -546,16 +546,16 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
break;
case TAG_MODEL:
ExifData::CameraModel = QString((char*)ValuePtr);
- break;
+ break;
case TAG_ORIENTATION:
Orientation = (int)ConvertAnyFormat(ValuePtr, Format);
break;
case TAG_DATETIME_ORIGINAL:
- DateTime = QString((char*)ValuePtr);
+ DateTime = QString((char*)ValuePtr);
break;
case TAG_USERCOMMENT:
// Olympus has this padded with trailing spaces. Remove these first.
@@ -588,9 +588,9 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
case TAG_FNUMBER:
// Simplest way of expressing aperture, so I trust it the most.
// (overwrite previously computd value if there is one)
- ExifData::ApertureFNumber = (float)ConvertAnyFormat(ValuePtr, Format);
+ ExifData::ApertureFNumber = (float)ConvertAnyFormat(ValuePtr, Format);
break;
case TAG_APERTURE:
case TAG_MAXAPERTURE:
@@ -665,14 +665,14 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
// Remaining cases contributed by: Volker C. Schoech (schoech@gmx.de)
case TAG_EXPOSURE_BIAS:
- ExifData::ExposureBias = (float)ConvertAnyFormat(ValuePtr, Format);
- break;
+ ExifData::ExposureBias = (float)ConvertAnyFormat(ValuePtr, Format);
+ break;
case TAG_WHITEBALANCE:
ExifData::Whitebalance = (int)ConvertAnyFormat(ValuePtr, Format);
- break;
+ break;
case TAG_METERING_MODE:
ExifData::MeteringMode = (int)ConvertAnyFormat(ValuePtr, Format);
break;
@@ -719,19 +719,19 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
unsigned Offset;
if (DIR_ENTRY_ADDR(DirStart, NumDirEntries) + 4 <= OffsetBase+ExifLength){
Offset = Get32u(DIR_ENTRY_ADDR(DirStart, NumDirEntries));
- // There is at least one jpeg from an HP camera having an Offset of almost MAXUINT.
- // Adding OffsetBase to it produces an overflow, so compare with ExifLength here.
- // See http://bugs.kde.org/show_bug.cgi?id=54542
- if (Offset && Offset < ExifLength){
+ // There is at least one jpeg from an HP camera having an Offset of almost MAXUINT.
+ // Adding OffsetBase to it produces an overflow, so compare with ExifLength here.
+ // See http://bugs.kde.org/show_bug.cgi?id=54542
+ if (Offset && Offset < ExifLength){
SubdirStart = OffsetBase + Offset;
if (SubdirStart > OffsetBase+ExifLength){
if (SubdirStart < OffsetBase+ExifLength+20){
// Jhead 1.3 or earlier would crop the whole directory!
// As Jhead produces this form of format incorrectness,
// I'll just let it pass silently
- owarn << "Thumbnail removed with Jhead 1.3 or earlier" << oendl;
+ owarn << "Thumbnail removed with Jhead 1.3 or earlier" << oendl;
}else{
return;
}
}else{
@@ -747,9 +747,9 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
if (ThumbnailSize && ThumbnailOffset){
if (ThumbnailSize + ThumbnailOffset <= ExifLength){
// The thumbnail pointer appears to be valid. Store it.
- Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG");
+ Thumbnail.loadFromData(OffsetBase + ThumbnailOffset, ThumbnailSize, "JPEG");
}
}
}
@@ -916,9 +916,9 @@ bool ExifData::scan(const QString & path)
// Scan the JPEG headers.
ret = ReadJpegSections(f, READ_EXIF);
if (ret == false){
- owarn << "Not JPEG file!" << oendl;
+ owarn << "Not JPEG file!" << oendl;
DiscardData();
f.close();
return false;
}
@@ -1414,13 +1414,21 @@ QString JpegSlave::fullImageInfo( const QString& path) {
}
QPixmap JpegSlave::pixmap( const QString& path, int wid, int hei) {
ExifData ImageInfo;
+ /*
+ */
if ( !ImageInfo.scan( path ) || ImageInfo.isNullThumbnail() ) {
QImage img;
QImageIO iio( path, 0l );
- QString str = QString( "Fast Shrink( 4 ) Scale( %1, %2, ScaleFree)" ).arg( wid ).arg( hei );
- iio.setParameters( str.latin1() );// will be strdupped anyway
+ if (wid < ImageInfo.getWidth() || hei<ImageInfo.getHeight()) {
+ odebug << "Scaling "<<ImageInfo.getWidth()<<"x"<<ImageInfo.getHeight()
+ << " to "<<wid<<"x"<<hei<< " ("<<path<<")"<<oendl;
+ QString str = QString( "Fast Shrink( 4 ) Scale( %1, %2, ScaleFree)" ).arg( wid ).arg( hei );
+ iio.setParameters( str.latin1() );// will be strdupped anyway
+ } else {
+ odebug << "Not scaling "<<ImageInfo.getWidth()<<"x"<<ImageInfo.getHeight()<< " ("<<path<<")"<<oendl;
+ }
img = iio.read() ? iio.image() : QImage();
return ThumbNailTool::scaleImage( img, wid,hei );
}else{
QImage img = ImageInfo.getThumbnail();