[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=37f89d2

The following commit has been merged in the master branch:
commit 37f89d29c364fdaf34fca0dea0320ae00a1695d6
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 23 15:31:16 2009 +0000

    #663: Reverted change made in r1961.
---
 src/jpgimage.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index c79cba2..b89df7a 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -624,6 +624,7 @@ namespace Exiv2 {
             ++count;
         }
 
+        if (!foundCompletePsData && skipApp13Ps3.size() > 0) throw Error(22);
         search += skipApp13Ps3.size();
 
         if (comPos == 0) {

-- 
exiv2 packaging