[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=83fa056

The following commit has been merged in the master branch:
commit 83fa056b57b62eb92edb83576fb7f0fdd836119c
Author: asp <alan.pater at gmail.com>
Date:   Tue Apr 21 18:50:58 2015 +0000

    #1059 Add ACDSee namespace and XMP properties
---
 src/properties.cpp | 14 ++++++++++++++
 src/xmp.cpp        |  1 +
 2 files changed, 15 insertions(+)

diff --git a/src/properties.cpp b/src/properties.cpp
index d6ed511..2e0ed1b 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -102,6 +102,7 @@ namespace Exiv2 {
     extern const XmpPropertyInfo xmpDwCInfo[];
     extern const XmpPropertyInfo xmpDctermsInfo[];
     extern const XmpPropertyInfo xmpLrInfo[];
+    extern const XmpPropertyInfo xmpAcdseeInfo[];  
 
     extern const XmpNsInfo xmpNsInfo[] = {
         // Schemas   -   NOTE: Schemas which the XMP-SDK doesn't know must be registered in XmpParser::initialize - Todo: Automate this
@@ -138,6 +139,7 @@ namespace Exiv2 {
         { "http://www.audio",                                  "audio",          xmpAudioInfo,     N_("XMP Extended Audio schema")            },
         { "http://rs.tdwg.org/dwc/index.htm",                     "dwc",            xmpDwCInfo,       N_("XMP Darwin Core schema")     		  },
         { "http://purl.org/dc/terms/",                      "dcterms",       xmpDctermsInfo,   N_("Qualified Dublin Core schema")             }, // Note: used as properties under dwc:record
+        { "http://ns.acdsee.com/iptc/1.0/",                 "acdsee",       xmpAcdseeInfo,      N_("ACDSee XMP schema")                       },
 
 
         // Structures
@@ -2066,6 +2068,18 @@ namespace Exiv2 {
         { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
     };
 
+    extern const XmpPropertyInfo xmpAcdseeInfo[] = {
+        { "caption",       N_("Caption"),     "Text",                 xmpText, xmpExternal,   N_("A brief description of the file")   },
+        { "datetime",      N_("DateTime"),    "Text",                 xmpText, xmpExternal,   N_("Date and Time")   },
+        { "author",        N_("Author"),      "Text",                 xmpText, xmpExternal,   N_("The name of the author or photographer")   },
+        { "rating",        N_("Rating"),      "Text",                 xmpText, xmpExternal,   N_("Numerical rating from 1 to 5")   },
+        { "notes",         N_("Notes"),       "Text",                 xmpText, xmpExternal,   N_("Any descriptive or additional free-form text up to 4,095 characters")   },
+        { "tagged",        N_("Tagged"),      "Text",                 xmpText, xmpExternal,   N_("True or False")   },
+        { "categories",    N_("Categories"),  "Text",                 xmpText, xmpExternal,   N_("Catalog of hierarchical keywords and groups")   },
+
+        // End of list marker
+        { 0, 0, 0, invalidTypeId, xmpInternal, 0 }
+    };
 
     extern const XmpPrintInfo xmpPrintInfo[] = {
         {"Xmp.crs.CropUnits",                 EXV_PRINT_TAG(crsCropUnits)   },
diff --git a/src/xmp.cpp b/src/xmp.cpp
index 9467452..4ecc303 100644
--- a/src/xmp.cpp
+++ b/src/xmp.cpp
@@ -407,6 +407,7 @@ namespace Exiv2 {
             SXMPMeta::RegisterNamespace("http://www.digikam.org/ns/1.0/", "digiKam");
             SXMPMeta::RegisterNamespace("http://www.digikam.org/ns/kipi/1.0/", "kipi");
             SXMPMeta::RegisterNamespace("http://ns.microsoft.com/photo/1.0/", "MicrosoftPhoto");
+            SXMPMeta::RegisterNamespace("http://ns.acdsee.com/iptc/1.0/", "acdsee");            
             SXMPMeta::RegisterNamespace("http://iptc.org/std/Iptc4xmpExt/2008-02-29/", "iptcExt");
             SXMPMeta::RegisterNamespace("http://ns.useplus.org/ldf/xmp/1.0/", "plus");
             SXMPMeta::RegisterNamespace("http://ns.iview-multimedia.com/mediapro/1.0/", "mediapro");

-- 
exiv2 packaging