[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=9e85453

The following commit has been merged in the master branch:
commit 9e854535a90e81973b4795e1f24cfb7169f092f9
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Sep 12 15:03:34 2006 +0000

    Simplified parser logic with regards to quotes around values of modify commands. Fixes bug #485.
---
 src/exiv2.1   | 4 ++--
 src/exiv2.cpp | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/exiv2.1 b/src/exiv2.1
index 3a21fad..f36e140 100644
--- a/src/exiv2.1
+++ b/src/exiv2.1
@@ -3,7 +3,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH EXIV2 1 "August 26th, 2006"
+.TH EXIV2 1 "September 12th, 2006"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -255,7 +255,7 @@ is determined based on 
Ikey
P.
 .TP
 .I value
 The remaining text on the line is the value. It can optionally be
-enclosed in double quotes ("
Ivalue
P").
+enclosed in single quotes ('
Ivalue
P') or double quotes ("
Ivalue
P").
 .sp 1
 The format of Exif 
BComment
P values includes an optional charset
 specification at the beginning:
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 7152b47..26482a3 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -903,12 +903,8 @@ namespace {
 
             value = line.substr(valStart, valEnd+1-valStart);
             std::string::size_type last = value.length()-1;
-            if (  (value[0] == '"' || value[last] == '"')
-                && value[0] != value[last]) {
-                throw Exiv2::Error(1, Exiv2::toString(num)
-                                    + ": Unbalanced quotes");
-            }
-            if (value[0] == '"') {
+            if (   (value[0] == '"' && value[last] == '"')
+                || (value[0] == '\'' && value[last] == '\'')) {
                 value = value.substr(1, value.length()-2);
             }
         }

-- 
exiv2 packaging