← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/kdegraphics/intrepid-proposed

« back to all changes in this revision

Viewing changes to gwenview/lib/jpegcontent.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Roderick B. Greening
  • Date: 2008-10-31 02:29:31 UTC
  • mfrom: (1.1.19 upstream)
  • Revision ID: james.westby@ubuntu.com-20081031022931-mklfmmc4ir99tujz
Tags: 4:4.1.3-0ubuntu1~intrepid1
https://launchpad.net/bugs/268058
New upstream release (LP: #268058)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gwenview/lib/jpegcontent.cpp
501
501
QImage JpegContent::thumbnail() const {
502
502
        QImage image;
503
503
        if (!d->mExifData.empty()) {
 
504
#if (EXIV2_TEST_VERSION(0,17,91))
 
505
        Exiv2::ExifThumbC thumb(d->mExifData);
 
506
        Exiv2::DataBuf thumbnail = thumb.copy();
 
507
#else
504
508
                Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail();
 
509
#endif
505
510
                image.loadFromData(thumbnail.pData_, thumbnail.size_);
506
511
        }
507
512
        return image;
521
526
                kError() << "Could not write thumbnail\n";
522
527
                return;
523
528
        }
524
 
        
 
529
#if (EXIV2_TEST_VERSION(0,17,91))
 
530
    Exiv2::ExifThumb thumb(d->mExifData);
 
531
    thumb.setJpegThumbnail((unsigned char*)array.data(), array.size());
 
532
#else
525
533
        d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size());
 
534
#endif
526
535
}
527
536
 
528
537