Index: libkexiv2/kexiv2comments.cpp

===================================================================

--- libkexiv2/kexiv2comments.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2comments.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -10,10 +10,6 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because

- *       it will be multithreaded. Use qDebug() instead.

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

@@ -47,7 +43,8 @@

     catch( Exiv2::Error &e )

     {

         std::string s(e.what());

-        qDebug("%s (Error #%i: %s)", "Cannot check Comment access mode using Exiv2 ", e.code(), s.c_str());

+        kDebug(51003) << "Cannot check Comment access mode using Exiv2 (Error #" 

+                      << e.code() << ": " << s.c_str() << ")" << endl;

     }

     return false;

Index: libkexiv2/kexiv2gps.cpp

===================================================================

--- libkexiv2/kexiv2gps.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2gps.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -10,20 +10,16 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because 

- *       it will be multithreaded. Use qDebug() instead. 

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

  * either version 2, or (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * ============================================================ */

 // C++ includes.

@@ -185,7 +181,7 @@

             Exiv2::ExifKey exifKey3("Exif.GPSInfo.GPSAltitude");

             Exiv2::ExifData exifData(d->exifMetadata);

             Exiv2::ExifData::iterator it = exifData.findKey(exifKey3);

-            if (it != exifData.end())

+            if (it != exifData.end() && (*it).count())

             {

                 num = (double)((*it).toRational(0).first);

                 den = (double)((*it).toRational(0).second);

@@ -226,7 +222,7 @@

         Exiv2::ExifKey exifKey("Exif.GPSInfo.GPSLatitude");

         Exiv2::ExifData exifData(d->exifMetadata);

         Exiv2::ExifData::iterator it = exifData.findKey(exifKey);

-        if (it != exifData.end())

+        if (it != exifData.end() && (*it).count() == 3)

         {

             return convertToGPSCoordinateString((*it).toRational(0).first, (*it).toRational(0).second,

                                                 (*it).toRational(1).first, (*it).toRational(1).second,

@@ -258,7 +254,7 @@

         Exiv2::ExifKey exifKey("Exif.GPSInfo.GPSLongitude");

         Exiv2::ExifData exifData(d->exifMetadata);

         Exiv2::ExifData::iterator it = exifData.findKey(exifKey);

-        if (it != exifData.end())

+        if (it != exifData.end() && (*it).count() == 3)

         {

             return convertToGPSCoordinateString((*it).toRational(0).first, (*it).toRational(0).second,

                                                 (*it).toRational(1).first, (*it).toRational(1).second,

@@ -276,7 +272,6 @@

     return QString();

 }

-

 bool KExiv2::setGPSInfo(double altitude, double latitude, double longitude, bool setProgramName) const

 {

     if (!setProgramId(setProgramName))

@@ -425,7 +420,7 @@

         // Altitude reference: byte "00" meaning "above sea level", "01" mening "behing sea level".

         value = Exiv2::Value::create(Exiv2::unsignedByte);

         if (altitude >= 0) value->read("0");

-	else               value->read("1");

+        else               value->read("1");

         d->exifMetadata.add(Exiv2::ExifKey("Exif.GPSInfo.GPSAltitudeRef"), value.get());

         // And the actual altitude, as absolute value..

@@ -477,7 +472,7 @@

         return false;

     try

-    {  

+    {

         QStringList gpsTagsKeys;

         for (Exiv2::ExifData::iterator it = d->exifMetadata.begin();

@@ -489,7 +484,7 @@

                 gpsTagsKeys.append(key);

         }

-        for(QStringList::Iterator it2 = gpsTagsKeys.begin(); it2 != gpsTagsKeys.end(); ++it2)

+        for(QStringList::const_iterator it2 = gpsTagsKeys.constBegin(); it2 != gpsTagsKeys.constEnd(); ++it2)

         {

             Exiv2::ExifKey gpsKey((*it2).toAscii().constData());

             Exiv2::ExifData::iterator it3 = d->exifMetadata.findKey(gpsKey);

@@ -630,7 +625,6 @@

     }

 }

-

 QString KExiv2::convertToGPSCoordinateString(long int numeratorDegrees, long int denominatorDegrees,

                                              long int numeratorMinutes, long int denominatorMinutes,

                                              long int numeratorSeconds, long int denominatorSeconds,

@@ -878,6 +872,4 @@

     *seconds = coordinate;

 }

-

-

 }  // NameSpace KExiv2Iface

Index: libkexiv2/kexiv2private.cpp

===================================================================

--- libkexiv2/kexiv2private.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2private.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -9,10 +9,6 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because

- *       it will be multithreaded. Use qDebug() instead.

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

@@ -34,25 +30,19 @@

 KExiv2Priv::KExiv2Priv()

 {

+    writeRawFiles = false;

     imageComments = std::string();

-

-#ifdef _XMP_SUPPORT_

-    Exiv2::XmpProperties::registerNs("http://www.microsoft.com/Photo/", "MicrosoftPhoto");

-#endif

 }

 KExiv2Priv::~KExiv2Priv()

 {

-    // Fix memory leak if Exiv2 support XMP.

-#ifdef _XMP_SUPPORT_

-    Exiv2::XmpParser::terminate();

-#endif // _XMP_SUPPORT_

 }

 void KExiv2Priv::printExiv2ExceptionError(const QString& msg, Exiv2::Error& e)

 {

     std::string s(e.what());

-    qDebug("%s (Error #%i: %s)", msg.toAscii().constData(), e.code(), s.c_str());

+    kDebug(51003) << msg.toAscii().constData() << " (Error #" 

+                  << e.code() << ": " << s.c_str() << endl;

 }

 QString KExiv2Priv::convertCommentValue(const Exiv2::Exifdatum &exifDatum)

Index: libkexiv2/kexiv2exif.cpp

===================================================================

--- libkexiv2/kexiv2exif.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2exif.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -10,20 +10,16 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because 

- *       it will be multithreaded. Use qDebug() instead. 

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

  * either version 2, or (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * ============================================================ */

 // Local includes.

@@ -47,7 +43,8 @@

     catch( Exiv2::Error &e )

     {

         std::string s(e.what());

-        qDebug("%s (Error #%i: %s)", "Cannot check Exif access mode using Exiv2 ", e.code(), s.c_str());

+        kDebug(51003) << "Cannot check Exif access mode using Exiv2 (Error #" 

+                      << e.code() << ": " << s.c_str() << ")" << endl;

     }

     return false;

@@ -106,7 +103,7 @@

     catch( Exiv2::Error &e )

     {

         if (!d->filePath.isEmpty())

-            qDebug ("From file %s", d->filePath.toAscii().constData());

+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;

         d->printExiv2ExceptionError("Cannot get Exif data using Exiv2 ", e);

     }

@@ -134,7 +131,7 @@

     catch( Exiv2::Error &e )

     {

         if (!d->filePath.isEmpty())

-            qDebug ("From file %s", d->filePath.toAscii().constData());

+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;

         d->printExiv2ExceptionError("Cannot set Exif data using Exiv2 ", e);

     }

@@ -618,11 +615,16 @@

                 case Exiv2::unsignedLong:

                 case Exiv2::signedShort:

                 case Exiv2::signedLong:

-                    return QVariant((int)it->toLong(component));

+                    if (it->count() > component)

+                        return QVariant((int)it->toLong(component));

+                    else

+                        return QVariant(QVariant::Int);

                 case Exiv2::unsignedRational:

                 case Exiv2::signedRational:

                     if (rationalAsListOfInts)

                     {

+                        if (it->count() <= component)

+                            return QVariant(QVariant::List);

                         QList<QVariant> list;

                         list << (*it).toRational(component).first;

                         list << (*it).toRational(component).second;

@@ -630,6 +632,8 @@

                     }

                     else

                     {

+                        if (it->count() <= component)

+                            return QVariant(QVariant::Double);

                         // prefer double precision

                         double num = (*it).toRational(component).first;

                         double den = (*it).toRational(component).second;

@@ -743,7 +747,7 @@

                 if (it != exifData.end())

                 {

                     long orientation = it->toLong();

-                    qDebug("Exif Thumbnail Orientation: %i", (int)orientation);

+                    kDebug(51003) << "Exif Thumbnail Orientation: " << (int)orientation << endl;

                     rotateExifQImage(thumbnail, (ImageOrientation)orientation);

                 }

@@ -820,7 +824,7 @@

         thumbFile.setAutoRemove(true);

         thumbFile.open();

         thumb.save(thumbFile.fileName(), "JPEG");

-        qDebug("Thumbnail temp file: %s", thumbFile.fileName().toAscii().data());

+        kDebug(51003) << "Thumbnail temp file: " << thumbFile.fileName().toAscii().data() << endl;

         const std::string &fileName((const char*)(QFile::encodeName(thumbFile.fileName())));

 #if (EXIV2_TEST_VERSION(0,17,91))

Index: libkexiv2/kexiv2.cpp

===================================================================

--- libkexiv2/kexiv2.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -9,10 +9,6 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because 

- *       it will be multithreaded. Use qDebug() instead. 

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

@@ -83,6 +79,25 @@

 //-- Statics methods ----------------------------------------------

+bool KExiv2::initializeExiv2()

+{

+#ifdef _XMP_SUPPORT_

+    return (Exiv2::XmpParser::initialize());

+#endif // _XMP_SUPPORT_

+

+    return true;

+}

+

+bool KExiv2::cleanupExiv2()

+{

+    // Fix memory leak if Exiv2 support XMP.

+#ifdef _XMP_SUPPORT_

+    Exiv2::XmpParser::terminate();

+#endif // _XMP_SUPPORT_

+

+    return true;

+}

+

 bool KExiv2::supportXmp()

 {

 #ifdef _XMP_SUPPORT_

@@ -92,13 +107,46 @@

 #endif // _XMP_SUPPORT_

 }

-bool KExiv2::supportTiffWritting()

+bool KExiv2::supportMetadataWritting(const QString& typeMime)

 {

+    if (typeMime == QString("image/jpeg"))

+    {

+        return true;

+    }

+    else if (typeMime == QString("image/tiff"))

+    {

 #if (EXIV2_TEST_VERSION(0,17,91))

-    return true;

+        return true;

 #else

+        return false;

+#endif

+    }

+    else if (typeMime == QString("image/png"))

+    {

+#if (EXIV2_TEST_VERSION(0,17,91))

+        return true;

+#else

+        return false;

+#endif

+    }

+    else if (typeMime == QString("image/jp2"))

+    {

+#if (EXIV2_TEST_VERSION(0,17,91))

+        return true;

+#else

+        return false;

+#endif

+    }

+    else if (typeMime == QString("image/x-raw"))

+    {

+#if (EXIV2_TEST_VERSION(0,17,91))

+        return true;

+#else

+        return false;

+#endif

+    }

+

     return false;

-#endif

 }

 QString KExiv2::Exiv2Version()

@@ -123,36 +171,77 @@

 bool KExiv2::isReadOnly(const QString& filePath)

 {

     if (!canWriteComment(filePath))

-        return false;

+        return true;

     if (!canWriteExif(filePath))

-        return false;

+        return true;

     if (!canWriteIptc(filePath))

-        return false;

+        return true;

 #ifdef _XMP_SUPPORT_

     if (!canWriteXmp(filePath))

-        return false;

+        return true;

 #endif // _XMP_SUPPORT_

-    return true;

+    return false;

 }

 //-- General methods ----------------------------------------------

+bool KExiv2::load(const QByteArray& imgData) const

+{

+    if (imgData.isEmpty())

+        return false;

+

+    try

+    {

+        Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((Exiv2::byte*)imgData.data(), imgData.size());

+

+        d->filePath = QString();

+        image->readMetadata();

+

+        // Image comments ---------------------------------

+

+        d->imageComments = image->comment();

+

+        // Exif metadata ----------------------------------

+

+        d->exifMetadata = image->exifData();

+

+        // Iptc metadata ----------------------------------

+

+        d->iptcMetadata = image->iptcData();

+

+#ifdef _XMP_SUPPORT_

+

+        // Xmp metadata -----------------------------------

+

+        d->xmpMetadata = image->xmpData();

+

+#endif // _XMP_SUPPORT_

+

+        return true;

+    }

+    catch( Exiv2::Error &e )

+    {

+        d->printExiv2ExceptionError("Cannot load metadata using Exiv2 ", e);

+    }

+

+    return false;

+}

+

 bool KExiv2::load(const QString& filePath) const

 {

     QFileInfo finfo(filePath);

     if (filePath.isEmpty() || !finfo.isReadable())

     {

-        qDebug("File '%s' is not readable.", finfo.fileName().toAscii().constData());

+        kDebug(51003) << "File '" << finfo.fileName().toAscii().constData() << "' is not readable." << endl;

         return false;

     }

     try

     {

-

         Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open((const char*)

                                       (QFile::encodeName(filePath)));

@@ -199,15 +288,33 @@

     QFileInfo dinfo(finfo.path());

     if (!finfo.isWritable())

     {

-        qDebug("File '%s' is read-only. Metadata not saved.", finfo.fileName().toAscii().constData());

+        kDebug(51003) << "File '" << finfo.fileName().toAscii().constData() << "' is read-only. Metadata not saved." << endl;

         return false;

     }

     if (!dinfo.isWritable())

     {

-        qDebug("Dir '%s' is read-only. Metadata not saved.", dinfo.filePath().toAscii().constData());

+        kDebug(51003) << "Dir '" << dinfo.filePath().toAscii().constData() << "' is read-only. Metadata not saved." << endl;

         return false;

     }

+    // TIFF/EP Raw file based supported by Exiv2 0.18 are : DNG, NEF, PEF.

+    QString rawTiffBasedSupported("dng nef pef");

+    QString rawTiffBasedNotSupported("3fr arw cr2 dcr erf k25 kdc mos orf raw sr2 srf");

+    if (rawTiffBasedNotSupported.contains(finfo.suffix().toUpper()))

+    {

+        kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() 

+                      << "' is TIFF based RAW file not yet supported. Metadata not saved." << endl;

+        return false;

+    }

+

+    if (rawTiffBasedSupported.contains(finfo.suffix().toUpper()) && !d->writeRawFiles)

+    {

+        kDebug(51003) << "'" << dinfo.filePath().toAscii().constData() 

+                      << "' is TIFF based RAW file supported but writing mode is disabled. " 

+                      << "Metadata not saved." << endl;

+        return false;

+    }

+

     try

     {

         Exiv2::AccessMode mode;

@@ -235,11 +342,12 @@

         {

             if (image->mimeType() == "image/tiff")

             {

+                Exiv2::ExifData exif = image->exifData();

+                QStringList untouchedTags;

+

                 // With tiff image we cannot overwrite whole Exif data as well, because 

                 // image data are stored in Exif container. We need to take a care about

                 // to not lost image data.

-                Exiv2::ExifData exif = image->exifData();

-                QStringList untouchedTags;

                 untouchedTags << "Exif.Image.ImageWidth";

                 untouchedTags << "Exif.Image.ImageLength";

                 untouchedTags << "Exif.Image.BitsPerSample";

@@ -331,6 +439,16 @@

     return d->filePath;

 }

+void KExiv2::setWriteRawFiles(bool on)

+{

+    d->writeRawFiles = on;

+}

+

+bool KExiv2::writeRawFiles() const

+{

+    return d->writeRawFiles;

+}

+

 bool KExiv2::setProgramId(bool /*on*/) const

 {

     return true;

Index: libkexiv2/kexiv2iptc.cpp

===================================================================

--- libkexiv2/kexiv2iptc.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2iptc.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -10,20 +10,16 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because 

- *       it will be multithreaded. Use qDebug() instead. 

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

  * either version 2, or (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * ============================================================ */

 // Local includes.

@@ -47,7 +43,8 @@

     catch( Exiv2::Error &e )

     {

         std::string s(e.what());

-        qDebug("%s (Error #%i: %s)", "Cannot check Iptc access mode using Exiv2 ", e.code(), s.c_str());

+        kDebug(51003) << "Cannot check Iptc access mode using Exiv2 (Error #" 

+                      << e.code() << ": " << s.c_str() << ")" << endl;

     }

     return false;

@@ -87,7 +84,7 @@

 #if (EXIV2_TEST_VERSION(0,10,0))

                 c2 = Exiv2::Photoshop::setIptcIrb(0, 0, iptc);

 #else

-                qDebug("Exiv2 version is to old. Cannot add Irb header to Iptc metadata");

+                kDebug(51003) << "Exiv2 version is to old. Cannot add Irb header to Iptc metadata" << endl;

                 return QByteArray();

 #endif

             }

@@ -108,7 +105,7 @@

     catch( Exiv2::Error &e )

     {

         if (!d->filePath.isEmpty())

-            qDebug ("From file %s", d->filePath.toAscii().constData());

+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;

         d->printExiv2ExceptionError("Cannot get Iptc data using Exiv2 ",e);

     }

@@ -136,7 +133,7 @@

     catch( Exiv2::Error &e )

     {

         if (!d->filePath.isEmpty())

-            qDebug ("From file %s", d->filePath.toAscii().constData());

+            kDebug(51003) << "From file " << d->filePath.toAscii().constData() << endl;

         d->printExiv2ExceptionError("Cannot set Iptc data using Exiv2 ", e);

     }

@@ -315,7 +312,7 @@

     catch( Exiv2::Error &e )

     {

         d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")

-                                 .arg(iptcTagName), e);

+                                    .arg(iptcTagName), e);

     }

     return QByteArray();

@@ -343,7 +340,7 @@

     catch( Exiv2::Error &e )

     {

         d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")

-                                 .arg(iptcTagName), e);

+                                    .arg(iptcTagName), e);

     }

     return QString();

@@ -397,7 +394,7 @@

     catch( Exiv2::Error &e )

     {

         d->printExiv2ExceptionError(QString("Cannot find Iptc key '%1' into image using Exiv2 ")

-                                 .arg(iptcTagName), e);

+                                    .arg(iptcTagName), e);

     }

     return QStringList();

@@ -415,8 +412,8 @@

         QStringList oldvals = oldValues;

         QStringList newvals = newValues;

-        qDebug() << d->filePath.toAscii().constData() << " : " << iptcTagName 

-                 << " => " << newvals.join(",").toAscii().constData() << endl;

+        kDebug(51003) << d->filePath.toAscii().constData() << " : " << iptcTagName 

+                      << " => " << newvals.join(",").toAscii().constData() << endl;

         // Remove all old values.

         Exiv2::IptcData iptcData(d->iptcMetadata);

@@ -457,7 +454,7 @@

     catch( Exiv2::Error &e )

     {

         d->printExiv2ExceptionError(QString("Cannot set Iptc key '%1' into image using Exiv2 ")

-                                 .arg(iptcTagName), e);

+                                    .arg(iptcTagName), e);

     }

     return false;

@@ -505,7 +502,8 @@

         QStringList oldkeys = oldKeywords;

         QStringList newkeys = newKeywords;

-        qDebug("%s ==> Iptc Keywords: %s", d->filePath.toAscii().constData(), newkeys.join(",").toAscii().constData());

+        kDebug(51003) << d->filePath.toAscii().constData() 

+                      << " ==> Iptc Keywords: " << newkeys.join(",").toAscii().constData() << endl;

         // Remove all old keywords.

         Exiv2::IptcData iptcData(d->iptcMetadata);

@@ -518,8 +516,7 @@

             // Also remove new keywords to avoid duplicates. They will be added again below.

             if ( key == QString("Iptc.Application2.Keywords") &&

-                 (oldKeywords.contains(val) || newKeywords.contains(val))

-               )

+                 (oldKeywords.contains(val) || newKeywords.contains(val)) )

                 it = iptcData.erase(it);

             else 

                 ++it;

Index: libkexiv2/kexiv2private.h

===================================================================

--- libkexiv2/kexiv2private.h	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2private.h	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -41,7 +41,6 @@

 #include <QMatrix>

 #include <QFileInfo>

 #include <QDataStream>

-#include <QDebug>

 // KDE includes.

@@ -49,6 +48,7 @@

 #include <kencodingdetector.h>

 #include <kstringhandler.h>

 #include <kdeversion.h>

+#include <kdebug.h>

 // Exiv2 includes.

@@ -119,6 +119,8 @@

 public:

+    bool            writeRawFiles;

+

     QString         filePath;

     std::string     imageComments;

Index: libkexiv2/kexiv2image.cpp

===================================================================

--- libkexiv2/kexiv2image.cpp	(.../tags/KDE/4.1.3/kdegraphics/libs/libkexiv2)	(revision 888944)

+++ libkexiv2/kexiv2image.cpp	(.../trunk/KDE/kdegraphics/libs/libkexiv2)	(revision 888944)

@@ -10,20 +10,16 @@

  * Copyright (C) 2006-2008 by Gilles Caulier <caulier dot gilles at gmail dot com>

  * Copyright (C) 2006-2008 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>

  *

- * NOTE: Do not use kdDebug() in this implementation because 

- *       it will be multithreaded. Use qDebug() instead. 

- *       See B.K.O #133026 for details.

- *

  * This program is free software; you can redistribute it

  * and/or modify it under the terms of the GNU General

  * Public License as published by the Free Software Foundation;

  * either version 2, or (at your option) any later version.

- * 

+ *

  * This program is distributed in the hope that it will be useful,

  * but WITHOUT ANY WARRANTY; without even the implied warranty of

  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  * GNU General Public License for more details.

- * 

+ *

  * ============================================================ */

 // Local includes.

@@ -236,7 +232,7 @@

         if (it != exifData.end())

         {

             orientation = it->toLong();

-            qDebug() << "Orientation => Exif.MinoltaCs7D.Rotation => " << (int)orientation << endl;

+            kDebug(51003) << "Orientation => Exif.MinoltaCs7D.Rotation => " << (int)orientation << endl;

             switch(orientation)

             {

                 case 76:

@@ -255,7 +251,7 @@

         if (it != exifData.end())

         {

             orientation = it->toLong();

-            qDebug() << "Orientation => Exif.MinoltaCs5D.Rotation => " << (int)orientation << endl;