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

List:       kde-commits
Subject:    branches/extragear/kde3/graphics/digikam/digikam
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-06-18 9:40:27
Message-ID: 1245318027.023050.10808.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 983407 by cgilles:

backport commit #982571 from trunk


 M  +9 -7      metadatahub.cpp  
 M  +7 -6      metadatahub.h  


--- branches/extragear/kde3/graphics/digikam/digikam/metadatahub.cpp #983406:983407
@@ -2,23 +2,24 @@
  *
  * This file is a part of digiKam project
  * http://www.digikam.org
- * 
+ *
  * Date        : 2007-01-05
  * Description : Metadata handling
- * 
- * Copyright (C) 2007 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
  *
+ * Copyright (C) 2007-2009 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
+ * Copyright (C) 2007-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
  * 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.
- * 
+ *
  * ============================================================ */
 
 // Qt includes.
@@ -87,7 +88,6 @@
 
     template <class T> void loadWithInterval(const T &data, T &storage, T \
                &highestStorage, MetadataHub::Status &status);
     template <class T> void loadSingleValue(const T &data, T &storage, \
                MetadataHub::Status &status);
-
 };
 
 MetadataWriteSettings::MetadataWriteSettings()
@@ -536,7 +536,9 @@
                     oldKeywords.append(it.key()->tagPath(false));
             }
         }
-        dirty |= metadata.setImageKeywords(oldKeywords, newKeywords);
+        // NOTE: See B.K.O #175321 : we remove all old keyword from IPTC and XMP \
before to +        // synchronize metadata, else contents is not coherent.
+        dirty |= metadata.setImageKeywords(metadata.getImageKeywords(), \
newKeywords);  }
 
     if (settings.saveIptcPhotographerId && writeAllFields)
--- branches/extragear/kde3/graphics/digikam/digikam/metadatahub.h #983406:983407
@@ -2,23 +2,24 @@
  *
  * This file is a part of digiKam project
  * http://www.digikam.org
- * 
+ *
  * Date        : 2007-01-05
  * Description : Metadata handling
- * 
- * Copyright (C) 2007 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
  *
+ * Copyright (C) 2007-2009 by Marcel Wiesweg <marcel.wiesweg@gmx.de>
+ * Copyright (C) 2007-2009 by Gilles Caulier <caulier dot gilles at gmail dot com>
+ *
  * 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.
- * 
+ *
  * ============================================================ */
 
 #ifndef METADATAHUB_H
@@ -352,7 +353,7 @@
 
 private:
 
-    MetadataHubPriv     *d;
+    MetadataHubPriv *d;
 };
 
 } // namespace Digikam


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