[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.2/kdegraphics/libs/libkexiv2/libkexiv2
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-01-29 12:30:28
Message-ID: 1233232228.248232.30912.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918139 by cgilles:

backport commit #918138 from trunk
CCBUG: 175746


 M  +6 -10     kexiv2.cpp  


--- branches/KDE/4.2/kdegraphics/libs/libkexiv2/libkexiv2/kexiv2.cpp #918138:918139
@@ -6,8 +6,8 @@
  * Date        : 2006-09-15
  * Description : Exiv2 library interface for KDE
  *
- * 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>
+ * Copyright (C) 2006-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ * Copyright (C) 2006-2009 by Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -336,8 +336,7 @@
         // Image Comments ---------------------------------
 
         mode = image->checkMode(Exiv2::mdComment);
-        if (!d->imageComments.empty() && 
-            (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite))
+        if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)
         {
             image->setComment(d->imageComments);
         }
@@ -345,8 +344,7 @@
         // Exif metadata ----------------------------------
 
         mode = image->checkMode(Exiv2::mdExif);
-        if (!d->exifMetadata.empty() && 
-            (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite))
+        if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)
         {
             if (image->mimeType() == "image/tiff")
             {
@@ -390,8 +388,7 @@
         // Iptc metadata ----------------------------------
 
         mode = image->checkMode(Exiv2::mdIptc);
-        if (!d->iptcMetadata.empty() && 
-            (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite))
+        if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)
         {
             image->setIptcData(d->iptcMetadata);
         }
@@ -401,8 +398,7 @@
         // Xmp metadata -----------------------------------
 
         mode = image->checkMode(Exiv2::mdXmp);
-        if (!d->xmpMetadata.empty() && 
-            (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite))
+        if (mode == Exiv2::amWrite || mode == Exiv2::amReadWrite)
         {
             image->setXmpData(d->xmpMetadata);
         }
[prev in list] [next in list] [prev in thread] [next in thread]