[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=65351c1

The following commit has been merged in the master branch:
commit 65351c15cfff8fdf18cf031236039fe0674d8357
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Dec 11 13:25:15 2008 +0000

    Workaround for a MSVC problem.
---
 src/jpgimage.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index a2c449b..05a2a3f 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -616,8 +616,9 @@ namespace Exiv2 {
                     const byte* pExifData = rawExif.pData_;
                     uint32_t exifSize = rawExif.size_;
                     if (wm == wmIntrusive) {
-                        pExifData = &blob[0];
                         exifSize = static_cast<uint32_t>(blob.size());
+                        // Extra check to prevent MSVC debug assertion
+                        if (exifSize > 0) pExifData = &blob[0];
                     }
                     if (exifSize > 0) {
                         // Write APP1 marker, size of APP1 field, Exif id and Exif data

-- 
exiv2 packaging