[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=d428a3f

The following commit has been merged in the master branch:
commit d428a3f10e8c2e3b619a8c0fd95fe01d131d7242
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 3 11:50:59 2011 +0000

    Another tweak to make older MSVCs happy.
---
 src/epsimage.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 7e2f3e9..e29d566 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -76,7 +76,12 @@ namespace {
                                         "%%BoundingBox: 0 0 0 0
";
 
     // list of all valid XMP headers
-    const struct { std::string header; std::string charset; } xmpHeadersDef[] = {
+    struct XmpHeaderDef {
+        std::string header;
+        std::string charset;
+    };
+
+    const XmpHeaderDef xmpHeadersDef[] = {
 
         // We do not enforce the trailing "?>" here, because the XMP specification
         // permits additional attributes after begin="..." and id="...".
@@ -111,7 +116,12 @@ namespace {
     };
 
     // list of all valid XMP trailers
-    const struct { std::string trailer; bool readOnly; } xmpTrailersDef[] = {
+    struct XmpTrailerDef {
+        std::string trailer;
+        bool readOnly;
+    };
+
+    const XmpTrailerDef xmpTrailersDef[] = {
 
         // We do not enforce the trailing "?>" here, because the XMP specification
         // permits additional attributes after end="...".

-- 
exiv2 packaging