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

The following commit has been merged in the master branch:
commit f5eb9b50a4416952d0e88cbd89725c2e55de576d
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Oct 10 07:19:34 2015 +0000

    #1116: Register missing namespaces (audio, video), changed xapG to xmpG in accordance with the XMP specs.
---
 src/properties.cpp | 4 ++--
 src/xmp.cpp        | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/properties.cpp b/src/properties.cpp
index f057f7c..66d93fa 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -147,10 +147,10 @@ namespace Exiv2 {
 
 
         // Structures
-        { "http://ns.adobe.com/xap/1.0/g/",                   "xapG",    0, N_("Colorant structure")           },
+        { "http://ns.adobe.com/xap/1.0/g/",                   "xmpG",    0, N_("Colorant structure")           },
+        { "http://ns.adobe.com/xap/1.0/g/img/",               "xmpGImg", 0, N_("Thumbnail structure")          },
         { "http://ns.adobe.com/xap/1.0/sType/Dimensions#",    "stDim",   0, N_("Dimensions structure")         },
         { "http://ns.adobe.com/xap/1.0/sType/Font#",          "stFnt",   0, N_("Font structure")               },
-        { "http://ns.adobe.com/xap/1.0/g/img/",               "xmpGImg", 0, N_("Thumbnail structure")          },
         { "http://ns.adobe.com/xap/1.0/sType/ResourceEvent#", "stEvt",   0, N_("Resource Event structure")     },
         { "http://ns.adobe.com/xap/1.0/sType/ResourceRef#",   "stRef",   0, N_("ResourceRef structure")        },
         { "http://ns.adobe.com/xap/1.0/sType/Version#",       "stVer",   0, N_("Version structure")            },
diff --git a/src/xmp.cpp b/src/xmp.cpp
index 10d5fbe..1b8dcb5 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -419,8 +419,9 @@ namespace Exiv2 {
             SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs");
             SXMPMeta::RegisterNamespace("http://www.metadataworkinggroup.com/schemas/keywords/", "mwg-kw");
             SXMPMeta::RegisterNamespace("http://ns.adobe.com/xmp/sType/Area#", "stArea");
-        SXMPMeta::RegisterNamespace("http://cipa.jp/exif/1.0/", "exifEX");
-
+            SXMPMeta::RegisterNamespace("http://cipa.jp/exif/1.0/", "exifEX");
+            SXMPMeta::RegisterNamespace("http://www.audio/", "audio");
+            SXMPMeta::RegisterNamespace("http://www.video/", "video");
 #else
             initialized_ = true;
 #endif

-- 
exiv2 packaging