when jpeg image is smaller than requested thumbsize it will not use

scaled loading

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
@@ -1,48 +1,48 @@
 #include  "jpeg_slave.h"
 #include "thumbnailtool.h"
 
 PHUNK_VIEW_INTERFACE( "JPEG", JpegSlave )
 
 /* OPIE */
 #include <opie2/odebug.h>
 #include <qpe/timestring.h>
 using namespace Opie::Core;
 
 /* QT */
 #include <qobject.h>
 #include <qimage.h>
 
 /**
-	exif.h
+    exif.h
 */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
 #include <time.h>
 
 #include <qstring.h>
 #include <qfile.h>
 #include <qimage.h>
 
 typedef enum {
     READ_EXIF = 1,
     READ_IMAGE = 2,
     READ_ALL = 3
 }ReadMode_t;
 
 //--------------------------------------------------------------------------
 // This structure is used to store jpeg file sections in memory.
 typedef struct {
     uchar *  Data;
     int      Type;
     unsigned Size;
 }Section_t;
 
 typedef unsigned char uchar;
 
 typedef struct {
     unsigned short Tag;
     const char*const Desc;
 }TagTable_t;
 
@@ -237,137 +237,137 @@ static int BytesPerFormat[] = {0,1,1,2,4,8,1,1,2,4,8,4,8};
 #define TAG_THUMBNAIL_OFFSET  0x0201
 #define TAG_THUMBNAIL_LENGTH  0x0202
 
 
 
 
 //--------------------------------------------------------------------------
 // Parse the marker stream until SOS or EOI is seen;
 //--------------------------------------------------------------------------
 int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
 {
     int a;
 
     a = infile.getch();
 
     if (a != 0xff || infile.getch() != M_SOI) {
         SectionsRead = 0;
         return false;
     }
     for(SectionsRead = 0; SectionsRead < MAX_SECTIONS-1; ){
         int marker = 0;
         int got;
         unsigned int ll,lh;
         unsigned int itemlen;
         uchar * Data;
 
         for (a=0;a<7;a++){
             marker = infile.getch();
             if (marker != 0xff) break;
 
             if (a >= 6){
 
-                owarn << "too many padding bytes" << oendl; 
+                owarn << "too many padding bytes" << oendl;
                 return false;
 
             }
         }
 
         if (marker == 0xff){
             // 0xff is legal padding, but if we get that many, something's wrong.
             return false;
         }
 
         Sections[SectionsRead].Type = marker;
 
         // Read the length of the section.
         lh = (uchar) infile.getch();
         ll = (uchar) infile.getch();
 
         itemlen = (lh << 8) | ll;
 
         if (itemlen < 2) {
             return false;;
         }
 
         Sections[SectionsRead].Size = itemlen;
 
         Data = (uchar *)malloc(itemlen+1); // Add 1 to allow sticking a 0 at the end.
         Sections[SectionsRead].Data = Data;
 
         // Store first two pre-read bytes.
         Data[0] = (uchar)lh;
         Data[1] = (uchar)ll;
 
         got = infile.readBlock((char*)Data+2, itemlen-2); // Read the whole section.
         if (( unsigned ) got != itemlen-2){
             return false;
         }
         SectionsRead++;
 
         switch(marker){
 
             case M_SOS:   // stop before hitting compressed data
                 // If reading entire image is requested, read the rest of the data.
                 if (ReadMode & READ_IMAGE){
                     unsigned long size;
 
                     size = QMAX( 0ul, infile.size()-infile.at() );
                     Data = (uchar *)malloc(size);
                     if (Data == NULL){
                         return false;
                     }
 
                     got = infile.readBlock((char*)Data,  size);
                     if (( unsigned ) got != size){
                         return false;
                     }
 
                     Sections[SectionsRead].Data = Data;
                     Sections[SectionsRead].Size = size;
                     Sections[SectionsRead].Type = PSEUDO_IMAGE_MARKER;
                     SectionsRead ++;
                     //HaveAll = 1;
                 }
                 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
                 // marker instead, althogh ACDsee will write images with both markers.
                 // this program will re-create this marker on absence of exif marker.
                 // hence no need to keep the copy from the file.
                 free(Sections[--SectionsRead].Data);
                 break;
 
             case M_EXIF:
                 // Seen files from some 'U-lead' software with Vivitar scanner
                 // that uses marker 31 for non exif stuff.  Thus make sure
                 // it says 'Exif' in the section before treating it as exif.
                 if ((ReadMode & READ_EXIF) && memcmp(Data+2, "Exif", 4) == 0){
                     process_EXIF((uchar *)Data, itemlen);
                 }else{
                     // Discard this section.
                     free(Sections[--SectionsRead].Data);
                 }
                 break;
 
             case M_SOF0:
             case M_SOF1:
             case M_SOF2:
             case M_SOF3:
             case M_SOF5:
             case M_SOF6:
             case M_SOF7:
             case M_SOF9:
             case M_SOF10:
             case M_SOF11:
@@ -518,107 +518,107 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
 
         if (ByteCount > 4){
             unsigned OffsetVal;
             OffsetVal = Get32u(DirEntry+8);
             // If its bigger than 4 bytes, the dir entry contains an offset.
             if (OffsetVal+ByteCount > ExifLength){
                 // Bogus pointer offset and / or bytecount value
                 //printf("Offset %d bytes %d ExifLen %d\n",OffsetVal, ByteCount, ExifLength);
 
                 return;
             }
             ValuePtr = OffsetBase+OffsetVal;
         }else{
             // 4 bytes or less and value is in the dir entry itself
             ValuePtr = (unsigned char *)DirEntry+8;
         }
 
         if (LastExifRefd < ValuePtr+ByteCount){
             // Keep track of last byte in the exif header that was actually referenced.
             // That way, we know where the discardable thumbnail data begins.
             LastExifRefd = ValuePtr+ByteCount;
         }
 
         // Extract useful components of tag
         switch(Tag){
 
             case TAG_MAKE:
                 ExifData::CameraMake = QString((char*)ValuePtr);
                 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.
                 for (a=ByteCount;;){
                     a--;
                     if ((ValuePtr)[a] == ' '){
                         (ValuePtr)[a] = '\0';
                     }else{
                         break;
                     }
                     if (a == 0) break;
                 }
 
                 // Copy the comment
                 if (memcmp(ValuePtr, "ASCII",5) == 0){
                     for (a=5;a<10;a++){
                         int c;
                         c = (ValuePtr)[a];
                         if (c != '\0' && c != ' '){
                             //strncpy(ImageInfo.Comments, (const char*)(a+ValuePtr), 199);
                             UserComment.sprintf("%s", (const char*)(a+ValuePtr));
                             break;
                         }
                     }
                 }else{
                     //strncpy(ImageInfo.Comments, (const char*)ValuePtr, 199);
                     UserComment.sprintf("%s", (const char*)ValuePtr);
                 }
                 break;
 
             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:
                 // More relevant info always comes earlier, so only use this field if we don't
                 // have appropriate aperture information yet.
                 if (ExifData::ApertureFNumber == 0){
                     ExifData::ApertureFNumber
                         = (float)exp(ConvertAnyFormat(ValuePtr, Format)*log(2)*0.5);
                 }
                 break;
 
             case TAG_FOCALLENGTH:
                 // Nice digital cameras actually save the focal length as a function
                 // of how farthey are zoomed in.
                 ExifData::FocalLength = (float)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_SUBJECT_DISTANCE:
                 // Inidcates the distacne the autofocus camera is focused to.
                 // Tends to be less accurate as distance increases.
                 ExifData::Distance = (float)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_EXPOSURETIME:
                 // Simplest way of expressing exposure time, so I trust it most.
                 // (overwrite previously computd value if there is one)
                 ExifData::ExposureTime = (float)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_SHUTTERSPEED:
                 // More complicated way of expressing exposure time, so only use
@@ -637,147 +637,147 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
 
             case TAG_EXIF_IMAGELENGTH:
                 ExifImageLength = (int)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_EXIF_IMAGEWIDTH:
                 ExifImageWidth = (int)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_FOCALPLANEXRES:
                 FocalplaneXRes = ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_FOCALPLANEUNITS:
                 switch((int)ConvertAnyFormat(ValuePtr, Format)){
                     case 1: FocalplaneUnits = 25.4; break; // inch
                     case 2:
                         // According to the information I was using, 2 means meters.
                         // But looking at the Cannon powershot's files, inches is the only
                         // sensible value.
                         FocalplaneUnits = 25.4;
                         break;
 
                     case 3: FocalplaneUnits = 10;   break;  // centimeter
                     case 4: FocalplaneUnits = 1;    break;  // milimeter
                     case 5: FocalplaneUnits = .001; break;  // micrometer
                 }
                 break;
 
                 // 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;
 
             case TAG_EXPOSURE_PROGRAM:
                 ExifData::ExposureProgram = (int)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_ISO_EQUIVALENT:
                 ExifData::ISOequivalent = (int)ConvertAnyFormat(ValuePtr, Format);
                 if ( ExifData::ISOequivalent < 50 ) ExifData::ISOequivalent *= 200;
                 break;
 
             case TAG_COMPRESSION_LEVEL:
                 ExifData::CompressionLevel = (int)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_THUMBNAIL_OFFSET:
                 ThumbnailOffset = (unsigned)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
             case TAG_THUMBNAIL_LENGTH:
                 ThumbnailSize = (unsigned)ConvertAnyFormat(ValuePtr, Format);
                 break;
 
         }
 
         if (Tag == TAG_EXIF_OFFSET || Tag == TAG_INTEROP_OFFSET){
             unsigned char * SubdirStart;
             SubdirStart = OffsetBase + Get32u(ValuePtr);
             if (SubdirStart < OffsetBase || SubdirStart > OffsetBase+ExifLength){
                 return;
             }
             ProcessExifDir(SubdirStart, OffsetBase, ExifLength);
             continue;
         }
     }
 
     {
         // In addition to linking to subdirectories via exif tags,
         // there's also a potential link to another directory at the end of each
         // directory.  this has got to be the result of a comitee!
         unsigned char * SubdirStart;
         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{
                     if (SubdirStart <= OffsetBase+ExifLength){
                         ProcessExifDir(SubdirStart, OffsetBase, ExifLength);
                     }
                 }
             }
         }else{
             // The exif header ends before the last next directory pointer.
         }
     }
 
     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");
         }
     }
 }
 
 //--------------------------------------------------------------------------
 // Process a COM marker.  We want to leave the bytes unchanged.  The
 // progam that displays this text may decide to remove blanks, convert
 // newlines, or otherwise modify the text.  In particular we want to be
 // safe for passing utf-8 text.
 //--------------------------------------------------------------------------
 void ExifData::process_COM (const uchar * Data, int length)
 {
     QChar ch;
     int a;
 
     for (a=2;a<length;a++){
         ch = Data[a];
         if (ch == '\000') continue;                     // Remove nulls
         Comment.append(ch);
     }
 }
 
 
 //--------------------------------------------------------------------------
 // Process a SOFn marker.  This is useful for the image dimensions
 //--------------------------------------------------------------------------
 void ExifData::process_SOFn (const uchar * Data, int marker)
 {
     int data_precision, num_components;
 
     data_precision = Data[2];
     ExifData::Height = Get16m(Data+3);
@@ -888,65 +888,65 @@ ExifData::ExifData()
     ExifData::MeteringMode = -1;
     ExifData::FlashUsed = -1;
     Orientation = 0;
     Height = 0;
     Width = 0;
     IsColor = 0;
     Process = 0;
     FocalLength = 0;
     ExposureTime = 0;
     ApertureFNumber = 0;
     Distance = 0;
     CCDWidth = 0;
     ExposureBias = 0;
     ExposureProgram = 0;
     ISOequivalent = 0;
     CompressionLevel = 0;
 }
 
 //--------------------------------------------------------------------------
 // process a EXIF jpeg file
 //--------------------------------------------------------------------------
 bool ExifData::scan(const QString & path)
 {
     int ret;
 
     QFile f(path);
     f.open(IO_ReadOnly);
 
     // 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;
     }
     f.close();
     DiscardData();
 
     //now make the strings clean,
     // for exmaple my Casio is a "QV-4000   "
     CameraMake = CameraMake.stripWhiteSpace();
     CameraModel = CameraModel.stripWhiteSpace();
     UserComment = UserComment.stripWhiteSpace();
     Comment = Comment.stripWhiteSpace();
     return true;
 }
 
 //--------------------------------------------------------------------------
 // Does the embedded thumbnail match the jpeg image?
 //--------------------------------------------------------------------------
 #ifndef JPEG_TOL
 #define JPEG_TOL 0.02
 #endif
 bool ExifData::isThumbnailSane() {
   if (Thumbnail.isNull()) return false;
 
   // check whether thumbnail dimensions match the image
   // not foolproof, but catches some altered images (jpegtran -rotate)
   if (ExifImageLength != 0 && ExifImageLength != Height) return false;
   if (ExifImageWidth != 0 && ExifImageWidth != Width) return false;
   if (Thumbnail.width() == 0 || Thumbnail.height() == 0) return false;
   if (Height == 0 || Width == 0) return false;
   double d = (double)Height/Width*Thumbnail.width()/Thumbnail.height();
@@ -1386,44 +1386,52 @@ QString JpegSlave::fullImageInfo( const QString& path) {
             tag += QObject::tr( "Distance: %1\n" ).arg( QString().sprintf( "%5.2fm", (double)ImageInfo.getDistance() ) );
     }
 
     if ( ImageInfo.getExposureBias() ) {
         tag += QObject::tr( "Exposure bias: %1\n", QString().sprintf("%4.2f", (double)ImageInfo.getExposureBias() ) );
     }
 
     if ( ImageInfo.getWhitebalance() != -1 )
         tag += white_balance_string( ImageInfo.getWhitebalance() );
 
 
     if( ImageInfo.getMeteringMode() != -1 )
         tag += metering_mode( ImageInfo.getMeteringMode() );
 
     if ( ImageInfo.getExposureProgram() )
         tag += exposure_program( ImageInfo.getExposureProgram() );
     if ( ImageInfo.getISOequivalent() )
         tag += QObject::tr( "ISO equivalent: %1\n" ).arg( QString().sprintf("%2d", ImageInfo.getISOequivalent() ) );
 
     tmp = ImageInfo.getUserComment();
     if ( tmp.length() )
         tag += QObject::tr( "EXIF comment: %1" ).arg( tmp );
 
     tag += QObject::tr( "</qt>" );
 
 
 
     return tag;
 }
 
 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();
         return ThumbNailTool::scaleImage(  img, wid,hei );
     }
 }