[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2bc7b26

The following commit has been merged in the master branch:
commit 2bc7b2666eb2820237e148e21101fbe7ea2a4d92
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 6 06:41:50 2008 +0000

    #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 b6b9092..198f3d5 100644
--- a/msvc/exivsimple/exivsimple.cpp
+++ b/msvc/exivsimple/exivsimple.cpp
@@ -1,6 +1,6 @@
 // ***************************************************************** -*- C++ -*-
 /*
- * Copyright (C) 2004-2007 Andreas Huggel <ahuggel at gmx.net>
+ * Copyright (C) 2004-2008 Andreas Huggel <ahuggel at gmx.net>
  * 
  * 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);
     }

-- 
exiv2 packaging