head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.4 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.2 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.7.0.10 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.8 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.6 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.4 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.2 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.6.0.14 pkgsrc-2010Q3-base:1.6 pkgsrc-2010Q2:1.6.0.12 pkgsrc-2010Q2-base:1.6 pkgsrc-2010Q1:1.6.0.10 pkgsrc-2010Q1-base:1.6 pkgsrc-2009Q4:1.6.0.8 pkgsrc-2009Q4-base:1.6 pkgsrc-2009Q3:1.6.0.6 pkgsrc-2009Q3-base:1.6 pkgsrc-2009Q2:1.6.0.4 pkgsrc-2009Q2-base:1.6 pkgsrc-2009Q1:1.6.0.2 pkgsrc-2009Q1-base:1.6 pkgsrc-2008Q4:1.5.0.10 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.8 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.6 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.4 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.2 pkgsrc-2008Q1:1.4.0.2 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2; locks; strict; comment @# @; 1.8 date 2012.03.19.23.12.19; author markd; state dead; branches; next 1.7; 1.7 date 2011.01.03.20.45.28; author markd; state Exp; branches; next 1.6; 1.6 date 2009.01.07.13.26.30; author drochner; state Exp; branches; next 1.5; 1.5 date 2008.07.02.13.35.16; author obache; state Exp; branches; next 1.4; 1.4 date 2008.01.14.23.17.27; author wiz; state Exp; branches; next 1.3; 1.3 date 2007.07.08.06.44.50; author wiz; state Exp; branches; next 1.2; 1.2 date 2007.04.01.13.48.39; author wiz; state Exp; branches; next 1.1; 1.1 date 2007.03.22.13.51.00; author joerg; state Exp; branches; next ; desc @@ 1.8 log @Update to KDE SC 4.8.0 @ text @$NetBSD: patch-aa,v 1.7 2011/01/03 20:45:28 markd Exp $ --- libkexiv2/libkexiv2/kexiv2.cpp.orig 2009-02-27 08:39:37.000000000 +0000 +++ libkexiv2/libkexiv2/kexiv2.cpp @@@@ -49,6 +49,20 @@@@ extern "C" #include "kexiv2private.h" #include "kexiv2.h" +#if defined(__NetBSD__) || defined(__DragonFly__) +#include +#endif + +#if (defined(__DragonFly__) && __DragonFly_version < 190000) || (defined(__NetBSD__) && __NetBSD_Version__ <= 399001700) +static double trunc(double val) +{ + if (val > 0) + return floor(val); + else + return ceil(val); +} +#endif + namespace KExiv2Iface { @@@@ -1603,7 +1617,11 @@@@ QString KExiv2::getExifTagTitle(const ch { std::string exifkey(exifTagName); Exiv2::ExifKey ek(exifkey); +#if (EXIV2_TEST_VERSION(0,21,0)) + return QString::fromLocal8Bit( ek.tagLabel().c_str() ); +#else return QString::fromLocal8Bit( Exiv2::ExifTags::tagTitle(ek.tag(), ek.ifdId()) ); +#endif } catch (Exiv2::Error& e) { @@@@ -1619,7 +1637,11 @@@@ QString KExiv2::getExifTagDescription(co { std::string exifkey(exifTagName); Exiv2::ExifKey ek(exifkey); +#if (EXIV2_TEST_VERSION(0,21,0)) + return QString::fromLocal8Bit( ek.tagDesc().c_str() ); +#else return QString::fromLocal8Bit( Exiv2::ExifTags::tagDesc(ek.tag(), ek.ifdId()) ); +#endif } catch (Exiv2::Error& e) { @ 1.7 log @Fix build with exiv2-0.21 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.6 2009/01/07 13:26:30 drochner Exp $ @ 1.6 log @update to 0.1.8 changes: - API changed: Move all Exiv2 classes acess methods to interanl provate container. ABI number set to 5.0.0. - Fix broken compilation with Exiv2 0.18. - Support TIFF metadata writting mode (require Exiv2 >= 0.18). - Added new methods canWriteComment(), canWriteExif(), canWriteIptc(). - Added new method supportMetadataWritting(). - Do not change file time-stamp when metadata are changed. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- libkexiv2/libkexiv2/kexiv2.cpp.orig 2008-12-13 11:35:51.000000000 +0100 d5 1 a5 1 @@@@ -48,6 +48,20 @@@@ extern "C" d26 24 @ 1.5 log @Recent DragonFly have trunc(). Patch provided by Hasso Tepper in PR 38867. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.4 2008/01/14 23:17:27 wiz Exp $ d3 4 a6 4 --- libkexiv2/libkexiv2/kexiv2.cpp.orig 2007-09-08 02:21:16 +0300 +++ libkexiv2/libkexiv2/kexiv2.cpp 2008-06-05 14:45:19 +0300 @@@@ -79,6 +79,20 @@@@ @ 1.4 log @Update to 0.1.6: 0.1.6 ------------------------------------------------------------------------ - API Changed : Kexiv2 destructor is now virtual. Krazy Code Checker fix (http://www.englishbreakfastnetwork.org/krazy) Bugs fixed from B.K.O (http://bugs.kde.org): 001 ==> 137750: color mode2 nikon d70s not recognized as adobe rgb 002 ==> 149267: digiKam crashes after finding gif,avi,txt and so on. 003 ==> 148182: Iptc.Application2.Keywords appends always the 0-byte. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2007/07/08 06:44:50 wiz Exp $ d3 3 a5 3 --- libkexiv2/libkexiv2/kexiv2.cpp.orig 2007-05-08 15:02:40.000000000 +0000 +++ libkexiv2/libkexiv2/kexiv2.cpp @@@@ -60,6 +60,20 @@@@ d9 1 a9 1 +#if defined(__NetBSD__) d13 1 a13 1 +#if defined(__DragonFly__) || (defined(__NetBSD__) && __NetBSD_Version__ <= 399001700) @ 1.3 log @Update to 0.1.5: 0.1.4, 0.1.5: Libtool versioning fixes. 0.1.3 ------------------------------------------------------------------------ New features - API changed: added 4 new static methods to get Exif/Iptc tags description/title. moved depreceate protected methods used by digiKam core to private. Bugs fixed from B.K.O (http://bugs.kde.org): 001 ==> 144604: Rotation causes Exif data corruption. GPS data fix General : Make size of icons used in album icon view more configurable using a slider in status bar. General : Removing direct Exiv2 library depency. libkexiv2 interface is used everywhere instead. 0.1.2 ------------------------------------------------------------------------ New features - added support for exiv2 from svn (next 0.14.0 release) - API changed: added printExiv2ExceptionError to manage Exiv2 C++ Exception error message Bugs fixed from B.K.O (http://bugs.kde.org): 001 ==> 142564: digiKam-signature in iptc and exif tags. 002 ==> 140297: GPS kipi plugin truncates input coordinates, introducing inacuracy. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2007/04/01 13:48:39 wiz Exp $ d3 2 a4 2 --- libkexiv2/kexiv2.cpp.orig 2007-05-08 15:02:40.000000000 +0000 +++ libkexiv2/kexiv2.cpp @ 1.2 log @Add patches from libkexiv2 svn fixing build with exiv2-0.14. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2007/03/22 13:51:00 joerg Exp $ d3 1 a3 1 --- libkexiv2/kexiv2.cpp.orig 2007-02-24 21:13:15.000000000 +0000 d5 1 a5 9 @@@@ -28,7 +28,6 @@@@ #include #include #include -#include #include #include #include @@@@ -61,6 +60,20 @@@@ a25 493 @@@@ -102,7 +115,11 @@@@ QString KExiv2::Exiv2Version() .arg(EXIV2_PATCH_VERSION); } -// -- Protected Methods ------------------------------------- +void KExiv2::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e) +{ + std::string s(e.what()); + qDebug("%s (%s)", msg.ascii(), s.c_str()); +} std::string& KExiv2::commentsMetaData() { @@@@ -119,8 +136,6 @@@@ Exiv2::IptcData& KExiv2::iptcMetaData() return d->iptcMetadata; } -// -- Public Methods -------------------------------- - bool KExiv2::clearComments() { return setComments(QByteArray()); @@@@ -135,7 +150,7 @@@@ bool KExiv2::clearExif() } catch( Exiv2::Error &e ) { - qDebug("Cannot clear Exif data using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot clear Exif data using Exiv2 ", e); } return false; @@@@ -150,7 +165,7 @@@@ bool KExiv2::clearIptc() } catch( Exiv2::Error &e ) { - qDebug("Cannot clear Iptc data using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot clear Iptc data using Exiv2 ", e); } return false; @@@@ -196,7 +211,7 @@@@ QByteArray KExiv2::getExif() const if (!d->filePath.isEmpty()) qDebug ("From file %s", d->filePath.ascii()); - qDebug("Cannot get Exif data using Exiv2 (%s", e.what().c_str()); + printExiv2ExceptionError("Cannot get Exif data using Exiv2 ", e); } return QByteArray(); @@@@ -237,7 +252,7 @@@@ QByteArray KExiv2::getIptc(bool addIrbHe if (!d->filePath.isEmpty()) qDebug ("From file %s", d->filePath.ascii()); - qDebug("Cannot get Iptc data using Exiv2 (%s)",e.what().c_str()); + printExiv2ExceptionError("Cannot get Iptc data using Exiv2 ",e); } return QByteArray(); @@@@ -266,7 +281,7 @@@@ bool KExiv2::setExif(const QByteArray& d if (!d->filePath.isEmpty()) qDebug ("From file %s", d->filePath.ascii()); - qDebug("Cannot set Exif data using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif data using Exiv2 ", e); } return false; @@@@ -289,7 +304,7 @@@@ bool KExiv2::setIptc(const QByteArray& d if (!d->filePath.isEmpty()) qDebug ("From file %s", d->filePath.ascii()); - qDebug("Cannot set Iptc data using Exiv2 (%s)",e.what().c_str()); + printExiv2ExceptionError("Cannot set Iptc data using Exiv2 ", e); } return false; @@@@ -312,7 +327,7 @@@@ bool KExiv2::setExif(Exiv2::DataBuf cons if (!d->filePath.isEmpty()) qDebug ("From file %s", d->filePath.ascii()); - qDebug("Cannot set Exif data using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif data using Exiv2 ", e); } return false; @@@@ -335,7 +350,7 @@@@ bool KExiv2::setIptc(Exiv2::DataBuf cons if (!d->filePath.isEmpty()) qDebug ("From file %s", d->filePath.ascii()); - qDebug("Cannot set Iptc data using Exiv2 (%s)",e.what().c_str()); + printExiv2ExceptionError("Cannot set Iptc data using Exiv2 ", e); } return false; @@@@ -370,9 +385,10 @@@@ bool KExiv2::load(const QString& filePat } catch( Exiv2::Error &e ) { - qDebug("Cannot load metadata using Exiv2 (%s)", e.what().c_str()); - return false; + printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e); } + + return false; } bool KExiv2::save(const QString& filePath) @@@@ -426,9 +442,10 @@@@ bool KExiv2::save(const QString& filePat } catch( Exiv2::Error &e ) { - qDebug("Cannot save metadata using Exiv2 (%s)", e.what().c_str()); - return false; + printExiv2ExceptionError("Cannot save metadata using Exiv2 ", e); } + + return false; } bool KExiv2::applyChanges() @@@@ -462,7 +479,7 @@@@ bool KExiv2::setImageProgramId(const QSt } catch( Exiv2::Error &e ) { - qDebug("Cannot set Program identity into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Program identity into image using Exiv2 ", e); } return false; @@@@ -517,7 +534,7 @@@@ QSize KExiv2::getImageDimensions() } catch( Exiv2::Error &e ) { - qDebug("Cannot parse image dimensions tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot parse image dimensions tag using Exiv2 ", e); } return QSize(); @@@@ -538,7 +555,7 @@@@ bool KExiv2::setImageDimensions(const QS } catch( Exiv2::Error &e ) { - qDebug("Cannot set image dimensions using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set image dimensions using Exiv2 ", e); } return false; @@@@ -615,7 +632,7 @@@@ QImage KExiv2::getExifThumbnail(bool fix } catch( Exiv2::Error &e ) { - qDebug("Cannot get Exif Thumbnail using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get Exif Thumbnail using Exiv2 ", e); } return thumbnail; @@@@ -638,7 +655,7 @@@@ bool KExiv2::setExifThumbnail(const QIma } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif Thumbnail using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif Thumbnail using Exiv2 ", e); } return false; @@@@ -729,7 +746,7 @@@@ KExiv2::ImageOrientation KExiv2::getImag } catch( Exiv2::Error &e ) { - qDebug("Cannot parse Exif Orientation tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot parse Exif Orientation tag using Exiv2 ", e); } return ORIENTATION_UNSPECIFIED; @@@@ -797,7 +814,7 @@@@ bool KExiv2::setImageOrientation(ImageOr } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif Orientation tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif Orientation tag using Exiv2 ", e); } return false; @@@@ -838,7 +855,7 @@@@ KExiv2::ImageColorWorkSpace KExiv2::getI } catch( Exiv2::Error &e ) { - qDebug("Cannot parse image color workspace tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot parse image color workspace tag using Exiv2 ", e); } return WORKSPACE_UNSPECIFIED; @@@@ -860,7 +877,7 @@@@ bool KExiv2::setImageColorWorkSpace(Imag } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif color workspace tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif color workspace tag using Exiv2 ", e); } return false; @@@@ -989,7 +1006,7 @@@@ QDateTime KExiv2::getImageDateTime() con } catch( Exiv2::Error &e ) { - qDebug("Cannot parse Exif date & time tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot parse Exif date & time tag using Exiv2 ", e); } return QDateTime(); @@@@ -1034,7 +1051,7 @@@@ bool KExiv2::setImageDateTime(const QDat } catch( Exiv2::Error &e ) { - qDebug("Cannot set Date & Time into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Date & Time into image using Exiv2 ", e); } return false; @@@@ -1052,7 +1069,7 @@@@ bool KExiv2::getImagePreview(QImage& pre } catch( Exiv2::Error &e ) { - qDebug("Cannot get image preview using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get image preview using Exiv2 ", e); } return false; @@@@ -1094,7 +1111,7 @@@@ bool KExiv2::setImagePreview(const QImag } catch( Exiv2::Error &e ) { - qDebug("Cannot get image preview using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get image preview using Exiv2 ", e); } return false; @@@@ -1121,8 +1138,8 @@@@ QString KExiv2::getExifTagString(const c } catch( Exiv2::Error &e ) { - qDebug("Cannot find Exif key '%s' into image using Exiv2 (%s)", - exifTagName, e.what().c_str()); + printExiv2ExceptionError(QString("Cannot find Exif key '%1' into image using Exiv2 ") + .arg(exifTagName), e); } return QString(); @@@@ -1140,7 +1157,7 @@@@ bool KExiv2::setExifTagString(const char } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif tag string into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif tag string into image using Exiv2 ", e); } return false; @@@@ -1167,8 +1184,8 @@@@ QString KExiv2::getIptcTagString(const c } catch( Exiv2::Error &e ) { - qDebug("Cannot find Iptc key '%s' into image using Exiv2 (%s)", - iptcTagName, e.what().c_str()); + printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ") + .arg(iptcTagName), e); } return QString(); @@@@ -1186,7 +1203,7 @@@@ bool KExiv2::setIptcTagString(const char } catch( Exiv2::Error &e ) { - qDebug("Cannot set Iptc tag string into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Iptc tag string into image using Exiv2 ", e); } return false; @@@@ -1207,8 +1224,8 @@@@ bool KExiv2::getExifTagLong(const char* } catch( Exiv2::Error &e ) { - qDebug("Cannot find Exif key '%s' into image using Exiv2 (%s)", - exifTagName, e.what().c_str()); + printExiv2ExceptionError(QString("Cannot find Exif key '%1' into image using Exiv2 ") + .arg(exifTagName), e); } return false; @@@@ -1231,8 +1248,8 @@@@ QByteArray KExiv2::getExifTagData(const } catch( Exiv2::Error &e ) { - qDebug("Cannot find Exif key '%s' into image using Exiv2 (%s)", - exifTagName, e.what().c_str()); + printExiv2ExceptionError(QString("Cannot find Exif key '%1' into image using Exiv2 ") + .arg(exifTagName), e); } return QByteArray(); @@@@ -1255,8 +1272,8 @@@@ QByteArray KExiv2::getIptcTagData(const } catch( Exiv2::Error &e ) { - qDebug("Cannot find Iptc key '%s' into image using Exiv2 (%s)", - iptcTagName, e.what().c_str()); + printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ") + .arg(iptcTagName), e); } return QByteArray(); @@@@ -1278,8 +1295,8 @@@@ bool KExiv2::getExifTagRational(const ch } catch( Exiv2::Error &e ) { - qDebug("Cannot find Exif Rational value from key '%s' into image using Exiv2 (%s)", - exifTagName, e.what().c_str()); + printExiv2ExceptionError(QString("Cannot find Exif Rational value from key '%1' " + "into image using Exiv2 ").arg(exifTagName), e); } return false; @@@@ -1297,7 +1314,7 @@@@ bool KExiv2::setExifTagLong(const char * } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif tag long value into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif tag long value into image using Exiv2 ", e); } return false; @@@@ -1315,7 +1332,7 @@@@ bool KExiv2::setExifTagRational(const ch } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif tag rational value into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif tag rational value into image using Exiv2 ", e); } return false; @@@@ -1335,7 +1352,7 @@@@ bool KExiv2::setExifTagData(const char * } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif tag data into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif tag data into image using Exiv2 ", e); } return false; @@@@ -1355,7 +1372,7 @@@@ bool KExiv2::setIptcTagData(const char * } catch( Exiv2::Error &e ) { - qDebug("Cannot set Iptc tag data into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Iptc tag data into image using Exiv2 ", e); } return false; @@@@ -1378,7 +1395,7 @@@@ bool KExiv2::removeExifTag(const char *e } catch( Exiv2::Error &e ) { - qDebug("Cannot remove Exif tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot remove Exif tag using Exiv2 ", e); } return false; @@@@ -1401,7 +1418,7 @@@@ bool KExiv2::removeIptcTag(const char *i } catch( Exiv2::Error &e ) { - qDebug("Cannot remove Iptc tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot remove Iptc tag using Exiv2 ", e); } return false; @@@@ -1499,7 +1516,7 @@@@ bool KExiv2::getGPSInfo(double& altitude } catch( Exiv2::Error &e ) { - qDebug("Cannot get Exif GPS tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get Exif GPS tag using Exiv2 ", e); } return false; @@@@ -1622,7 +1639,7 @@@@ bool KExiv2::setGPSInfo(double altitude, } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif GPS tag using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif GPS tag using Exiv2 ", e); } return false; @@@@ -1658,7 +1675,7 @@@@ bool KExiv2::removeGPSInfo(bool setProgr } catch( Exiv2::Error &e ) { - qDebug("Cannot remove Exif GPS tag using Exiv2 (%s)",e.what().c_str()); + printExiv2ExceptionError("Cannot remove Exif GPS tag using Exiv2 ", e); } return false; @@@@ -1749,7 +1766,7 @@@@ QStringList KExiv2::getImageKeywords() c } catch( Exiv2::Error &e ) { - qDebug("Cannot get IPTC Keywords from image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get IPTC Keywords from image using Exiv2 ", e); } return QStringList(); @@@@ -1806,7 +1823,7 @@@@ bool KExiv2::setImageKeywords(const QStr } catch( Exiv2::Error &e ) { - qDebug("Cannot set IPTC Keywords into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set IPTC Keywords into image using Exiv2 ", e); } return false; @@@@ -1837,7 +1854,7 @@@@ QStringList KExiv2::getImageSubjects() c } catch( Exiv2::Error &e ) { - qDebug("Cannot get IPTC Subjects from image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get IPTC Subjects from image using Exiv2 ", e); } return QStringList(); @@@@ -1889,7 +1906,7 @@@@ bool KExiv2::setImageSubjects(const QStr } catch( Exiv2::Error &e ) { - qDebug("Cannot set IPTC Subjects into image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set IPTC Subjects into image using Exiv2 ", e); } return false; @@@@ -1920,7 +1937,7 @@@@ QStringList KExiv2::getImageSubCategorie } catch( Exiv2::Error &e ) { - qDebug("Cannot get IPTC Sub Categories from image using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot get IPTC Sub Categories from image using Exiv2 ", e); } return QStringList(); @@@@ -1952,7 +1969,8 @@@@ bool KExiv2::setImageSubCategories(const ++it; }; - // Add new Sub Categories. Note that SubCategories IPTC tag is limited to 32 char but can be redondant. + // Add new Sub Categories. Note that SubCategories IPTC tag is limited to 32 + // characters but can be redondant. Exiv2::IptcKey iptcTag("Iptc.Application2.SuppCategory"); @@@@ -1972,7 +1990,7 @@@@ bool KExiv2::setImageSubCategories(const } catch( Exiv2::Error &e ) { - qDebug("Cannot set IPTC Sub Categories into image using Exiv2 (%s)",e.what().c_str()); + printExiv2ExceptionError("Cannot set IPTC Sub Categories into image using Exiv2 ", e); } return false; @@@@ -2000,7 +2018,7 @@@@ QString KExiv2::getExifComment() const } catch( Exiv2::Error &e ) { - qDebug("Cannot find Exif User Comment using Exiv2 (%s)",e.what().c_str()); + printExiv2ExceptionError("Cannot find Exif User Comment using Exiv2 ", e); } return QString(); @@@@ -2043,7 +2061,7 @@@@ bool KExiv2::setExifComment(const QStrin } catch( Exiv2::Error &e ) { - qDebug("Cannot set Exif Comment using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot set Exif Comment using Exiv2 ", e); } return false; @@@@ -2114,7 +2132,7 @@@@ QString KExiv2::convertCommentValue(cons } catch( Exiv2::Error &e ) { - qDebug("Cannot convert Comment using Exiv2 (%s)", e.what().c_str()); + printExiv2ExceptionError("Cannot convert Comment using Exiv2 ", e); } return QString(); @ 1.1 log @Play the trunc(3) game here as well. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- libkexiv2/kexiv2.cpp.orig 2007-03-22 13:32:51.000000000 +0000 d5 9 a13 1 @@@@ -61,6 +61,20 @@@@ d34 493 @