[arch-commits] Commit in nepomuk-core/repos (6 files)
Andrea Scarpino
andrea at archlinux.org
Sat Jan 5 06:47:11 UTC 2013
Date: Saturday, January 5, 2013 @ 01:47:11
Author: andrea
Revision: 174464
archrelease: copy kde-unstable to kde-unstable-i686, kde-unstable-x86_64
Added:
nepomuk-core/repos/kde-unstable-i686/PKGBUILD
(from rev 174463, nepomuk-core/kde-unstable/PKGBUILD)
nepomuk-core/repos/kde-unstable-x86_64/PKGBUILD
(from rev 174463, nepomuk-core/kde-unstable/PKGBUILD)
Deleted:
nepomuk-core/repos/kde-unstable-i686/PKGBUILD
nepomuk-core/repos/kde-unstable-i686/fix-segfault.patch
nepomuk-core/repos/kde-unstable-x86_64/PKGBUILD
nepomuk-core/repos/kde-unstable-x86_64/fix-segfault.patch
----------------------------------------+
kde-unstable-i686/PKGBUILD | 74 +++++-------
kde-unstable-i686/fix-segfault.patch | 188 -------------------------------
kde-unstable-x86_64/PKGBUILD | 74 +++++-------
kde-unstable-x86_64/fix-segfault.patch | 188 -------------------------------
4 files changed, 66 insertions(+), 458 deletions(-)
Deleted: kde-unstable-i686/PKGBUILD
===================================================================
--- kde-unstable-i686/PKGBUILD 2013-01-05 06:46:06 UTC (rev 174463)
+++ kde-unstable-i686/PKGBUILD 2013-01-05 06:47:11 UTC (rev 174464)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.9.95
-pkgrel=2
-pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
-url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
- 'fix-segfault.patch')
-sha1sums=('98bee83019e469e28772da24cbec05d7744e6e44'
- 'de0588164a4ae3ea89278675564a55e7e78ae4aa')
-
-build() {
- cd ${pkgname}-${pkgver}
- # KDEBUG#312148
- patch -p1 -i "${srcdir}"/fix-segfault.patch
- cd ../
-
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Fix the python shebang
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
-sha1sums=('98bee83019e469e28772da24cbec05d7744e6e44'
- 'cfb1420dee81922e13952f81c0dde3450e99cf02')
Copied: nepomuk-core/repos/kde-unstable-i686/PKGBUILD (from rev 174463, nepomuk-core/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-i686/PKGBUILD (rev 0)
+++ kde-unstable-i686/PKGBUILD 2013-01-05 06:47:11 UTC (rev 174464)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=nepomuk-core
+pkgver=4.9.97
+pkgrel=1
+pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
+url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
+makedepends=('cmake' 'automoc4' 'doxygen')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('769e91df42af2456b0143718739738fd69101b79')
+
+build() {
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # Fix the python shebang
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+ "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
+}
+sha1sums=('769e91df42af2456b0143718739738fd69101b79')
Deleted: kde-unstable-i686/fix-segfault.patch
===================================================================
--- kde-unstable-i686/fix-segfault.patch 2013-01-05 06:46:06 UTC (rev 174463)
+++ kde-unstable-i686/fix-segfault.patch 2013-01-05 06:47:11 UTC (rev 174464)
@@ -1,188 +0,0 @@
---- a/services/fileindexer/indexer/exiv2extractor.cpp
-+++ b/services/fileindexer/indexer/exiv2extractor.cpp
-@@ -63,19 +63,45 @@
- }
-
- namespace {
-+ QString toString(const Exiv2::Value& value) {
-+ std::string str = value.toString();
-+ return QString::fromUtf8( str.c_str(), str.length() );
-+ }
-+
- QVariant toVariantLong(const Exiv2::Value& value) {
-- qlonglong l = value.toLong();
-- return QVariant(l);
-+ if( value.typeId() == Exiv2::unsignedLong || value.typeId() == Exiv2::signedLong ) {
-+ qlonglong val = value.toLong();
-+ return QVariant( val );
-+ }
-+
-+ QString str( toString(value) );
-+ bool ok = false;
-+ int val = str.toInt(&ok);
-+ if( ok )
-+ return QVariant( val );
-+
-+ return QVariant();
- }
-
- QVariant toVariantFloat(const Exiv2::Value& value) {
-- double f = value.toFloat();
-- return QVariant(f);
-+ if( value.typeId() == Exiv2::tiffFloat || value.typeId() == Exiv2::tiffDouble )
-+ return QVariant( value.toFloat() );
-+
-+ QString str( toString(value) );
-+ bool ok = false;
-+ float val = str.toFloat(&ok);
-+ if( ok )
-+ return QVariant( val );
-+
-+ return QVariant();
- }
-
- QVariant toVariantString(const Exiv2::Value& value) {
-- std::string str = value.toString();
-- return QVariant( QString::fromUtf8( str.c_str(), str.length() ) );
-+ QString str = toString(value);
-+ if( !str.isEmpty() )
-+ return QVariant( str );
-+
-+ return QVariant();
- }
- }
-
-@@ -122,27 +148,37 @@
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.Flash") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::flash(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::flash(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.PixelXDimension") );
- if( it != data.end() ) {
-- fileRes.setProperty( NFO::width(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NFO::width(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.PixelYDimension") );
- if( it != data.end() ) {
-- fileRes.setProperty( NFO::height(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NFO::height(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.Make") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::make(), toVariantString( it->value() ) );
-+ QVariant value = toVariantString( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::make(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.Model") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::model(), toVariantString( it->value() ) );
-+ QVariant value = toVariantString( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::model(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.DateTime") );
-@@ -153,57 +189,79 @@
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.Orientation") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::orientation(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::orientation(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.FocalLength") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::focalLength(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::focalLength(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.FocalLengthIn35mmFilm") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::focalLengthIn35mmFilm(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::focalLengthIn35mmFilm(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ExposureTime") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::exposureTime(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::exposureTime(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ApertureValue") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::apertureValue(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::apertureValue(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ExposureBiasValue") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::exposureBiasValue(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::exposureBiasValue(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.WhiteBalance") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::whiteBalance(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::whiteBalance(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.MeteringMode") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::meteringMode(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::meteringMode(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ISOSpeedRatings") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::isoSpeedRatings(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::isoSpeedRatings(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.Saturation") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::saturation(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::saturation(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.Sharpness") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::sharpness(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::sharpness(), value );
- }
-
- fileRes.addType( NEXIF::Photo() );
Deleted: kde-unstable-x86_64/PKGBUILD
===================================================================
--- kde-unstable-x86_64/PKGBUILD 2013-01-05 06:46:06 UTC (rev 174463)
+++ kde-unstable-x86_64/PKGBUILD 2013-01-05 06:47:11 UTC (rev 174464)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=nepomuk-core
-pkgver=4.9.95
-pkgrel=2
-pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
-url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
-makedepends=('cmake' 'automoc4' 'doxygen')
-source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
- 'fix-segfault.patch')
-sha1sums=('98bee83019e469e28772da24cbec05d7744e6e44'
- 'de0588164a4ae3ea89278675564a55e7e78ae4aa')
-
-build() {
- cd ${pkgname}-${pkgver}
- # KDEBUG#312148
- patch -p1 -i "${srcdir}"/fix-segfault.patch
- cd ../
-
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Fix the python shebang
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
-}
-sha1sums=('98bee83019e469e28772da24cbec05d7744e6e44'
- 'cfb1420dee81922e13952f81c0dde3450e99cf02')
Copied: nepomuk-core/repos/kde-unstable-x86_64/PKGBUILD (from rev 174463, nepomuk-core/kde-unstable/PKGBUILD)
===================================================================
--- kde-unstable-x86_64/PKGBUILD (rev 0)
+++ kde-unstable-x86_64/PKGBUILD 2013-01-05 06:47:11 UTC (rev 174464)
@@ -0,0 +1,33 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=nepomuk-core
+pkgver=4.9.97
+pkgrel=1
+pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
+url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg')
+makedepends=('cmake' 'automoc4' 'doxygen')
+source=("http://download.kde.org/unstable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('769e91df42af2456b0143718739738fd69101b79')
+
+build() {
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # Fix the python shebang
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+ "${pkgdir}"/usr/bin/nepomuk-simpleresource-rcgen
+}
+sha1sums=('769e91df42af2456b0143718739738fd69101b79')
Deleted: kde-unstable-x86_64/fix-segfault.patch
===================================================================
--- kde-unstable-x86_64/fix-segfault.patch 2013-01-05 06:46:06 UTC (rev 174463)
+++ kde-unstable-x86_64/fix-segfault.patch 2013-01-05 06:47:11 UTC (rev 174464)
@@ -1,188 +0,0 @@
---- a/services/fileindexer/indexer/exiv2extractor.cpp
-+++ b/services/fileindexer/indexer/exiv2extractor.cpp
-@@ -63,19 +63,45 @@
- }
-
- namespace {
-+ QString toString(const Exiv2::Value& value) {
-+ std::string str = value.toString();
-+ return QString::fromUtf8( str.c_str(), str.length() );
-+ }
-+
- QVariant toVariantLong(const Exiv2::Value& value) {
-- qlonglong l = value.toLong();
-- return QVariant(l);
-+ if( value.typeId() == Exiv2::unsignedLong || value.typeId() == Exiv2::signedLong ) {
-+ qlonglong val = value.toLong();
-+ return QVariant( val );
-+ }
-+
-+ QString str( toString(value) );
-+ bool ok = false;
-+ int val = str.toInt(&ok);
-+ if( ok )
-+ return QVariant( val );
-+
-+ return QVariant();
- }
-
- QVariant toVariantFloat(const Exiv2::Value& value) {
-- double f = value.toFloat();
-- return QVariant(f);
-+ if( value.typeId() == Exiv2::tiffFloat || value.typeId() == Exiv2::tiffDouble )
-+ return QVariant( value.toFloat() );
-+
-+ QString str( toString(value) );
-+ bool ok = false;
-+ float val = str.toFloat(&ok);
-+ if( ok )
-+ return QVariant( val );
-+
-+ return QVariant();
- }
-
- QVariant toVariantString(const Exiv2::Value& value) {
-- std::string str = value.toString();
-- return QVariant( QString::fromUtf8( str.c_str(), str.length() ) );
-+ QString str = toString(value);
-+ if( !str.isEmpty() )
-+ return QVariant( str );
-+
-+ return QVariant();
- }
- }
-
-@@ -122,27 +148,37 @@
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.Flash") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::flash(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::flash(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.PixelXDimension") );
- if( it != data.end() ) {
-- fileRes.setProperty( NFO::width(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NFO::width(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.PixelYDimension") );
- if( it != data.end() ) {
-- fileRes.setProperty( NFO::height(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NFO::height(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.Make") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::make(), toVariantString( it->value() ) );
-+ QVariant value = toVariantString( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::make(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.Model") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::model(), toVariantString( it->value() ) );
-+ QVariant value = toVariantString( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::model(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.DateTime") );
-@@ -153,57 +189,79 @@
-
- it = data.findKey( Exiv2::ExifKey("Exif.Image.Orientation") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::orientation(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::orientation(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.FocalLength") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::focalLength(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::focalLength(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.FocalLengthIn35mmFilm") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::focalLengthIn35mmFilm(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::focalLengthIn35mmFilm(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ExposureTime") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::exposureTime(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::exposureTime(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ApertureValue") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::apertureValue(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::apertureValue(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ExposureBiasValue") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::exposureBiasValue(), toVariantFloat( it->value() ) );
-+ QVariant value = toVariantFloat( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::exposureBiasValue(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.WhiteBalance") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::whiteBalance(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::whiteBalance(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.MeteringMode") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::meteringMode(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::meteringMode(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.ISOSpeedRatings") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::isoSpeedRatings(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::isoSpeedRatings(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.Saturation") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::saturation(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::saturation(), value );
- }
-
- it = data.findKey( Exiv2::ExifKey("Exif.Photo.Sharpness") );
- if( it != data.end() ) {
-- fileRes.setProperty( NEXIF::sharpness(), toVariantLong( it->value() ) );
-+ QVariant value = toVariantLong( it->value() );
-+ if( !value.isNull() )
-+ fileRes.setProperty( NEXIF::sharpness(), value );
- }
-
- fileRes.addType( NEXIF::Photo() );
More information about the arch-commits
mailing list