[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:45:43 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=6767878

The following commit has been merged in the master branch:
commit 6767878fb8ce02168955a85367f0a74219aa3258
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 8 22:17:45 2015 +0000

    #1116.  Fix submitted.
---
 include/exiv2/basicio.hpp | 2 +-
 src/basicio.cpp           | 6 ++++++
 src/properties.cpp        | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/exiv2/basicio.hpp b/include/exiv2/basicio.hpp
index a118770..551f778 100644
--- a/include/exiv2/basicio.hpp
+++ b/include/exiv2/basicio.hpp
@@ -273,7 +273,7 @@ namespace Exiv2 {
         //! @name Creators
         //@{
         //! Default Constructor
-        BasicIo() {}
+        BasicIo();
         //@}
     }; // class BasicIo
 
diff --git a/src/basicio.cpp b/src/basicio.cpp
index 958a822..3dd7d16 100644
--- a/src/basicio.cpp
+++ b/src/basicio.cpp
@@ -36,6 +36,7 @@ EXIV2_RCSID("@(#) $Id$")
 #include "types.hpp"
 #include "error.hpp"
 #include "http.hpp"
+#include "properties.hpp"
 
 // + standard includes
 #include <string>
@@ -82,6 +83,11 @@ typedef short nlink_t;
 // class member definitions
 namespace Exiv2 {
 
+	BasicIo::BasicIo() {
+		Exiv2::Dictionary nsDict;
+		Exiv2::XmpProperties::registeredNamespaces(nsDict);
+	}
+
     BasicIo::~BasicIo()
     {
     }
diff --git a/src/properties.cpp b/src/properties.cpp
index 6a361ee..40b6663 100644
--- a/src/properties.cpp
+++ b/src/properties.cpp
@@ -138,8 +138,8 @@ namespace Exiv2 {
         { "http://ns.microsoft.com/photo/1.2/t/Region#",     "MPReg",       xmpMicrosoftPhotoRegionInfo,     N_("Microsoft Photo Region schema")     },
         { "http://www.metadataworkinggroup.com/schemas/regions/", "mwg-rs", xmpMWGRegionsInfo, N_("Metadata Working Group Regions schema")      },
         { "http://www.metadataworkinggroup.com/schemas/keywords/","mwg-kw", xmpMWGKeywordInfo, N_("Metadata Working Group Keywords schema")     },
-        { "http://www.video",                             "video",          xmpVideoInfo,     N_("XMP Extended Video schema")                   },
-        { "http://www.audio",                             "audio",          xmpAudioInfo,     N_("XMP Extended Audio schema")                   },
+        { "http://www.video/",                             "video",          xmpVideoInfo,     N_("XMP Extended Video schema")                   },
+        { "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")                           },

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list