diff options
| -rw-r--r-- | src/imageutils/jpegcontent.cpp | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/imageutils/jpegcontent.cpp b/src/imageutils/jpegcontent.cpp index 7619146..7efca9a 100644 --- a/src/imageutils/jpegcontent.cpp +++ b/src/imageutils/jpegcontent.cpp @@ -54,17 +54,6 @@ extern "C" { #include "imageutils/jpegcontent.h" #include "imageutils/jpegerrormanager.h" -// Make sure an EXIV2_TEST_VERSION macro exists: - -#ifdef EXIV2_VERSION -# ifndef EXIV2_TEST_VERSION -# define EXIV2_TEST_VERSION(major,minor,patch) \ - ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) ) -# endif -#else -# define EXIV2_TEST_VERSION(major,minor,patch) (false) -#endif - namespace ImageUtils { const int INMEM_DST_DELTA=4096; @@ -613,12 +602,8 @@ void JPEGContent::applyPendingTransformation() { TQImage JPEGContent::thumbnail() const { TQImage image; if (!d->mExifData.empty()) { -#if (EXIV2_TEST_VERSION(0,17,91)) Exiv2::ExifThumbC thumb(d->mExifData); Exiv2::DataBuf const thumbnail = thumb.copy(); -#else - Exiv2::DataBuf thumbnail = d->mExifData.copyThumbnail(); -#endif image.loadFromData(thumbnail.pData_, thumbnail.size_); } return image; @@ -640,12 +625,8 @@ void JPEGContent::setThumbnail(const TQImage& thumbnail) { return; } -#if (EXIV2_TEST_VERSION(0,17,91)) Exiv2::ExifThumb thumb(d->mExifData); thumb.setJpegThumbnail((unsigned char*)array.data(), array.size()); -#else - d->mExifData.setJpegThumbnail((unsigned char*)array.data(), array.size()); -#endif } |