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
@@ -4,25 +4,25 @@
 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 {
@@ -257,25 +257,25 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
         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;
 
@@ -322,32 +322,32 @@ int ExifData::ReadJpegSections (QFile & infile, ReadMode_t ReadMode)
                         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
@@ -538,32 +538,32 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
             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;
@@ -580,25 +580,25 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                             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;
 
@@ -657,30 +657,30 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
                         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;
@@ -711,53 +711,53 @@ void ExifData::ProcessExifDir(unsigned char * DirStart, unsigned char * OffsetBa
         }
     }
 
     {
         // 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)
 {
@@ -908,25 +908,25 @@ ExifData::ExifData()
 //--------------------------------------------------------------------------
 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();
@@ -1406,24 +1406,32 @@ QString JpegSlave::fullImageInfo( const QString& path) {
     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 );
     }
 }