diff -Nru libkexiv2-4.12.3/debian/changelog libkexiv2-4.12.90/debian/changelog --- libkexiv2-4.12.3/debian/changelog 2014-03-04 20:09:53.000000000 +0000 +++ libkexiv2-4.12.90/debian/changelog 2014-03-19 11:54:30.000000000 +0000 @@ -1,3 +1,9 @@ +libkexiv2 (4:4.12.90-0ubuntu1) trusty; urgency=medium + + * New upstream beta release + + -- Jonathan Riddell Wed, 19 Mar 2014 11:54:29 +0000 + libkexiv2 (4:4.12.3-0ubuntu1) trusty; urgency=medium * New upstream bugfix release diff -Nru libkexiv2-4.12.3/debian/control libkexiv2-4.12.90/debian/control --- libkexiv2-4.12.3/debian/control 2014-03-04 20:09:53.000000000 +0000 +++ libkexiv2-4.12.90/debian/control 2014-03-19 11:54:30.000000000 +0000 @@ -6,7 +6,7 @@ Uploaders: Pino Toscano , Sune Vuorela Build-Depends: kde-sc-dev-latest (>= 4:4.10), cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.12.3), libexiv2-dev (>= 0.20) + kdelibs5-dev (>= 4:4.12.90), libexiv2-dev (>= 0.20) Standards-Version: 3.9.2 Homepage: http://www.kde.org/ Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/libkexiv2 diff -Nru libkexiv2-4.12.3/libkexiv2/kexiv2.cpp libkexiv2-4.12.90/libkexiv2/kexiv2.cpp --- libkexiv2-4.12.3/libkexiv2/kexiv2.cpp 2013-10-31 16:58:43.000000000 +0000 +++ libkexiv2-4.12.90/libkexiv2/kexiv2.cpp 2013-12-02 16:25:10.000000000 +0000 @@ -7,9 +7,9 @@ * @date 2006-09-15 * @brief Exiv2 library interface for KDE * - * @author Copyright (C) 2006-2012 by Gilles Caulier + * @author Copyright (C) 2006-2013 by Gilles Caulier * caulier dot gilles at gmail dot com - * @author Copyright (C) 2006-2012 by Marcel Wiesweg + * @author Copyright (C) 2006-2013 by Marcel Wiesweg * marcel dot wiesweg at gmx dot de * * This program is free software; you can redistribute it @@ -395,7 +395,7 @@ return false; } - bool writeToFile = false; + bool writeToFile = false; bool writeToSidecar = false; bool writeToSidecarIfFileNotPossible = false; bool writtenToFile = false; diff -Nru libkexiv2-4.12.3/libkexiv2/kexiv2exif.cpp libkexiv2-4.12.90/libkexiv2/kexiv2exif.cpp --- libkexiv2-4.12.3/libkexiv2/kexiv2exif.cpp 2013-10-31 16:58:43.000000000 +0000 +++ libkexiv2-4.12.90/libkexiv2/kexiv2exif.cpp 2013-12-02 16:25:10.000000000 +0000 @@ -179,16 +179,23 @@ // We apply a filter to get only the Exif tags that we need. - if (!invertSelection) + if (!exifKeysFilter.isEmpty()) { - if (exifKeysFilter.contains(key.section('.', 1, 1))) - metaDataMap.insert(key, tagValue); + if (!invertSelection) + { + if (exifKeysFilter.contains(key.section('.', 1, 1))) + metaDataMap.insert(key, tagValue); + } + else + { + if (!exifKeysFilter.contains(key.section('.', 1, 1))) + metaDataMap.insert(key, tagValue); + } } - else + else // else no filter at all. { - if (!exifKeysFilter.contains(key.section('.', 1, 1))) - metaDataMap.insert(key, tagValue); - } + metaDataMap.insert(key, tagValue); + } } return metaDataMap; diff -Nru libkexiv2-4.12.3/libkexiv2/kexiv2.h libkexiv2-4.12.90/libkexiv2/kexiv2.h --- libkexiv2-4.12.3/libkexiv2/kexiv2.h 2013-10-31 16:58:43.000000000 +0000 +++ libkexiv2-4.12.90/libkexiv2/kexiv2.h 2013-12-02 16:25:10.000000000 +0000 @@ -13,9 +13,9 @@ * @brief http://www.iptc.org/std/Iptc4xmpCore/1.0/specification/Iptc4xmpCore_1.0-spec-XMPSchema_8.pdf * @brief Paper: http://www.metadataworkinggroup.com/pdf/mwg_guidance.pdf * - * @author Copyright (C) 2006-2012 by Gilles Caulier + * @author Copyright (C) 2006-2013 by Gilles Caulier * caulier dot gilles at gmail dot com - * @author Copyright (C) 2006-2012 by Marcel Wiesweg + * @author Copyright (C) 2006-2013 by Marcel Wiesweg * marcel dot wiesweg at gmx dot de * * This program is free software; you can redistribute it @@ -590,6 +590,8 @@ "Image" "Photo" + List can be empty to not filter output. + ... this method will return a map of all Exif tags witch : - include "Iop", or "Thumbnail", or "Image", or "Photo" in the Exif tag keys @@ -597,7 +599,7 @@ - not include "Iop", or "Thumbnail", or "Image", or "Photo" in the Exif tag keys if 'inverSelection' is true. */ - KExiv2::MetaDataMap getExifTagsDataList(const QStringList& exifKeysFilter, bool invertSelection=false) const; + KExiv2::MetaDataMap getExifTagsDataList(const QStringList& exifKeysFilter=QStringList(), bool invertSelection=false) const; //@} @@ -688,6 +690,8 @@ "Envelope" "Application2" + List can be empty to not filter output. + ... this method will return a map of all Iptc tags witch : - include "Envelope", or "Application2" in the Iptc tag keys @@ -695,7 +699,7 @@ - not include "Envelope", or "Application2" in the Iptc tag keys if 'inverSelection' is true. */ - KExiv2::MetaDataMap getIptcTagsDataList(const QStringList& iptcKeysFilter, bool invertSelection=false) const; + KExiv2::MetaDataMap getIptcTagsDataList(const QStringList& iptcKeysFilter=QStringList(), bool invertSelection=false) const; /** Return a strings list of Iptc keywords from image. Return an empty list if no keyword are set. */ @@ -800,6 +804,8 @@ "dc" // Dubling Core schema. "xmp" // Standard Xmp schema. + List can be empty to not filter output. + ... this method will return a map of all Xmp tags witch : - include "dc", or "xmp" in the Xmp tag keys @@ -807,7 +813,7 @@ - not include "dc", or "xmp" in the Xmp tag keys if 'inverSelection' is true. */ - KExiv2::MetaDataMap getXmpTagsDataList(const QStringList& xmpKeysFilter, bool invertSelection=false) const; + KExiv2::MetaDataMap getXmpTagsDataList(const QStringList& xmpKeysFilter=QStringList(), bool invertSelection=false) const; /** Get all redondant Alternative Language Xmp tags content like a map. See AltLangMap class description for details. diff -Nru libkexiv2-4.12.3/libkexiv2/kexiv2iptc.cpp libkexiv2-4.12.90/libkexiv2/kexiv2iptc.cpp --- libkexiv2-4.12.3/libkexiv2/kexiv2iptc.cpp 2013-10-31 16:58:43.000000000 +0000 +++ libkexiv2-4.12.90/libkexiv2/kexiv2iptc.cpp 2013-12-02 16:25:10.000000000 +0000 @@ -7,7 +7,7 @@ * @date 2006-09-15 * @brief Iptc manipulation methods * - * @author Copyright (C) 2006-2012 by Gilles Caulier + * @author Copyright (C) 2006-2013 by Gilles Caulier * caulier dot gilles at gmail dot com * @author Copyright (C) 2006-2012 by Marcel Wiesweg * marcel dot wiesweg at gmx dot de @@ -155,36 +155,58 @@ // We apply a filter to get only the Iptc tags that we need. - if (!invertSelection) + if (!iptcKeysFilter.isEmpty()) { - if (iptcKeysFilter.contains(key.section('.', 1, 1))) + if (!invertSelection) { - if (it == metaDataMap.end()) - metaDataMap.insert(key, value); - else + if (iptcKeysFilter.contains(key.section('.', 1, 1))) { - QString v = *it; - v.append(", "); - v.append(value); - metaDataMap.insert(key, v); + if (it == metaDataMap.end()) + { + metaDataMap.insert(key, value); + } + else + { + QString v = *it; + v.append(", "); + v.append(value); + metaDataMap.insert(key, v); + } } } - } - else - { - if (!iptcKeysFilter.contains(key.section('.', 1, 1))) + else { - if (it == metaDataMap.end()) - metaDataMap.insert(key, value); - else + if (!iptcKeysFilter.contains(key.section('.', 1, 1))) { - QString v = *it; - v.append(", "); - v.append(value); - metaDataMap.insert(key, v); + if (it == metaDataMap.end()) + { + metaDataMap.insert(key, value); + } + else + { + QString v = *it; + v.append(", "); + v.append(value); + metaDataMap.insert(key, v); + } } } } + else // else no filter at all. + { + if (it == metaDataMap.end()) + { + metaDataMap.insert(key, value); + } + else + { + QString v = *it; + v.append(", "); + v.append(value); + metaDataMap.insert(key, v); + } + } + } return metaDataMap; diff -Nru libkexiv2-4.12.3/libkexiv2/kexiv2xmp.cpp libkexiv2-4.12.90/libkexiv2/kexiv2xmp.cpp --- libkexiv2-4.12.3/libkexiv2/kexiv2xmp.cpp 2013-10-31 16:58:43.000000000 +0000 +++ libkexiv2-4.12.90/libkexiv2/kexiv2xmp.cpp 2013-12-02 16:25:10.000000000 +0000 @@ -7,7 +7,7 @@ * @date 2006-09-15 * @brief Xmp manipulation methods * - * @author Copyright (C) 2006-2012 by Gilles Caulier + * @author Copyright (C) 2006-2013 by Gilles Caulier * caulier dot gilles at gmail dot com * @author Copyright (C) 2006-2012 by Marcel Wiesweg * marcel dot wiesweg at gmx dot de @@ -195,36 +195,57 @@ // We apply a filter to get only the XMP tags that we need. - if (!invertSelection) + if (!xmpKeysFilter.isEmpty()) { - if (xmpKeysFilter.contains(key.section('.', 1, 1))) + if (!invertSelection) { - if (it == metaDataMap.end()) - metaDataMap.insert(key, value); - else + if (xmpKeysFilter.contains(key.section('.', 1, 1))) { - QString v = *it; - v.append(", "); - v.append(value); - metaDataMap.insert(key, v); + if (it == metaDataMap.end()) + { + metaDataMap.insert(key, value); + } + else + { + QString v = *it; + v.append(", "); + v.append(value); + metaDataMap.insert(key, v); + } } } - } - else - { - if (!xmpKeysFilter.contains(key.section('.', 1, 1))) + else { - if (it == metaDataMap.end()) - metaDataMap.insert(key, value); - else + if (!xmpKeysFilter.contains(key.section('.', 1, 1))) { - QString v = *it; - v.append(", "); - v.append(value); - metaDataMap.insert(key, v); + if (it == metaDataMap.end()) + { + metaDataMap.insert(key, value); + } + else + { + QString v = *it; + v.append(", "); + v.append(value); + metaDataMap.insert(key, v); + } } } } + else // else no filter at all. + { + if (it == metaDataMap.end()) + { + metaDataMap.insert(key, value); + } + else + { + QString v = *it; + v.append(", "); + v.append(value); + metaDataMap.insert(key, v); + } + } } return metaDataMap;