From 2bc7b2666eb2820237e148e21101fbe7ea2a4d92 Mon Sep 17 00:00:00 2001 From: Andreas Huggel Date: Sat, 6 Sep 2008 06:41:50 +0000 Subject: [PATCH] #567: Fixed exivsimple. --- msvc/exivsimple/exivsimple.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/msvc/exivsimple/exivsimple.cpp b/msvc/exivsimple/exivsimple.cpp index b6b90928..198f3d50 100644 --- a/msvc/exivsimple/exivsimple.cpp +++ b/msvc/exivsimple/exivsimple.cpp @@ -1,6 +1,6 @@ // ***************************************************************** -*- C++ -*- /* - * Copyright (C) 2004-2007 Andreas Huggel + * Copyright (C) 2004-2008 Andreas Huggel * * This program is part of the Exiv2 distribution. * @@ -155,20 +155,20 @@ EXIVSIMPLE_API int ImageData(HIMAGE img, BYTE *buffer, unsigned int size) EXIVSIMPLE_API void SetThumbnail(HIMAGE img, const BYTE *buffer, unsigned int size) { ImageWrapper *imgWrap = (ImageWrapper*)img; - Exiv2::ExifData &exifData = imgWrap->image->exifData(); - exifData.setJpegThumbnail(buffer, size); + Exiv2::ExifData& exifData = imgWrap->image->exifData(); + Exiv2::ExifThumb exifThumb(exifData); + exifThumb.setJpegThumbnail(buffer, size); } EXIVSIMPLE_API unsigned int GetThumbnail(HIMAGE img, BYTE *buffer, unsigned int size) { ImageWrapper *imgWrap = (ImageWrapper*)img; - Exiv2::ExifData &exifData = imgWrap->image->exifData(); - Exiv2::Thumbnail::AutoPtr thumbnail; - thumbnail = exifData.getThumbnail(); - if (thumbnail.get() == 0) { + Exiv2::ExifData& exifData = imgWrap->image->exifData(); + Exiv2::ExifThumb exifThumb(exifData); + Exiv2::DataBuf buf = exifThumb.copy(); + if (buf.size_ == 0) { return 0; } - Exiv2::DataBuf buf = thumbnail->copy(exifData); if (buf.size_ > (long)size) { return unsigned int(-1); }