[Digikam-devel] extragear/graphics/digikam/libs/dmetadata

[Gilles Caulier]

SVN commit 605581 by cgilles:

digikam from trunk : bugfix : missing to test return values from Exiv2 library to Load IPTC/EXIF data. See B.K.O #136855 for details

CCMAIL: [hidden email]

 M  +16 -8     dmetadata.cpp  


--- trunk/extragear/graphics/digikam/libs/dmetadata/dmetadata.cpp #605580:605581
@@ -206,8 +206,10 @@
     {    
         if (!data.isEmpty())
         {
-            d->exifMetadata.load((const Exiv2::byte*)data.data(), data.size());
-            return true;
+            if (d->exifMetadata.load((const Exiv2::byte*)data.data(), data.size()) != 0)
+                return false;
+            else
+                return true;
         }
     }
     catch( Exiv2::Error &e )
@@ -229,8 +231,10 @@
     {    
         if (data.size_ != 0)
         {
-            d->exifMetadata.load(data.pData_, data.size_);
-            return true;
+            if (d->exifMetadata.load(data.pData_, data.size_) != 0)
+                return false;
+            else
+                return true;
         }
     }
     catch( Exiv2::Error &e )
@@ -252,8 +256,10 @@
     {    
         if (!data.isEmpty())
         {
-            d->iptcMetadata.load((const Exiv2::byte*)data.data(), data.size());
-            return true;
+            if (d->iptcMetadata.load((const Exiv2::byte*)data.data(), data.size()) != 0)
+                return false;
+            else
+                return true;
         }
     }
     catch( Exiv2::Error &e )
@@ -275,8 +281,10 @@
     {    
         if (data.size_ != 0)
         {
-            d->iptcMetadata.load(data.pData_, data.size_);
-            return true;
+            if (d->iptcMetadata.load(data.pData_, data.size_) != 0)
+                return false;
+            else
+                return true;
         }
     }
     catch( Exiv2::Error &e )
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel

[Gilles Caulier-2]

Le Vendredi 17 Novembre 2006 11:00, Gilles Caulier a écrit :

> From: Gilles Caulier <[hidden email]>
> Sender: Gilles Caulier <[hidden email]>
> Reply-To: digiKam developers <[hidden email]>
> To: <[hidden email]>
> CC: <[hidden email]>
> Subject: [Digikam-devel] extragear/graphics/digikam/libs/dmetadata
> Message-ID: <[hidden email]>
> Date: Fri, 17 Nov 2006 10:00:25 +0000
> Content-Type: text/plain
>
> Return-Path: <digikam-devel-bounces-+caulier.gilles=[hidden email]>
> Received: from localhost (localhost [127.0.0.1])
> by apelsin.fruitsalad.org (Cyrus v2.2.12) with LMTPA;
> Fri, 17 Nov 2006 02:40:25 +0100
> X-Sieve: CMU Sieve 2.2
> Received: from localhost (localhost [127.0.0.1])
> by apelsin.fruitsalad.org (Postfix) with ESMTP id 94E596862F1
> for <[hidden email]>; Fri, 17 Nov 2006 02:40:25 +0100 (CET)
> Received: from localhost (localhost [127.0.0.1])
> by apelsin.fruitsalad.org (Postfix) with ESMTP id 6A12A6862EE
> for <[hidden email]>; Fri, 17 Nov 2006 02:40:25 +0100 (CET)
> Received: from apelsin.fruitsalad.org ([127.0.0.1])
>  by localhost (apelsin.fruitsalad.org [127.0.0.1]) (amavisd-new, port
> 10024) with ESMTP id 91380-05 for <[hidden email]>;
>  Fri, 17 Nov 2006 02:40:23 +0100 (CET)
> Received: from ktown.kde.org (ktown.kde.org [131.246.120.250])
> by apelsin.fruitsalad.org (Postfix) with SMTP id 8E99B6862E3
> for <[hidden email]>; Fri, 17 Nov 2006 02:40:23 +0100 (CET)
> Received: (qmail 5800 invoked by uid 72); 17 Nov 2006 01:40:23 -0000
> Received: (qmail 5791 invoked from network); 17 Nov 2006 01:40:19 -0000
> Received: from mpemail.mpe-garching.mpg.de (HELO mpemail.mpe.mpg.de)
> (130.183.137.110)
> by ktown.kde.org with SMTP; 17 Nov 2006 01:40:15 -0000
> Received: from allee.mpe.mpg.de ([130.183.74.28])
> by mpemail.mpe.mpg.de with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32)
> (Exim 4.50) id 1GksiE-0000Ue-JO; Fri, 17 Nov 2006 02:40:14 +0100
> From: Achim Bohnet <[hidden email]>
> To: [hidden email]
> Date: Fri, 17 Nov 2006 02:40:13 +0100
> User-Agent: KMail/1.9.5
> MIME-Version: 1.0
> Content-Disposition: inline
> Message-Id: <[hidden email]>
> X-Authenticated-Id: ach
> Subject: [Digikam-devel] try2: test/check digikam(imageplugins) 0.9.0-rc1
> tarballs
> X-BeenThere: [hidden email]
> X-Mailman-Version: 2.1.9
> Precedence: list
> Reply-To: digiKam developers <[hidden email]>
> List-Id: digiKam developers <digikam-devel.kde.org>
> List-Unsubscribe: <https://mail.kde.org/mailman/listinfo/digikam-devel>,
> <mailto:[hidden email]?subject=unsubscribe>
> List-Archive: <http://mail.kde.org/pipermail/digikam-devel>
> List-Post: <mailto:[hidden email]>
> List-Help: <mailto:[hidden email]?subject=help>
> List-Subscribe: <https://mail.kde.org/mailman/listinfo/digikam-devel>,
> <mailto:[hidden email]?subject=subscribe>
> Content-Type: text/plain; charset="us-ascii"
> Content-Transfer-Encoding: 7bit
> X-Virus-Scanned: by amavisd-new at kdemail.net
> X-Kolab-Scheduling-Message: FALSE
>
> Hi,
>
> thx to Gilles for the fixes. digikam builds here now with exiv2 0.10.
> (on Kubuntu/Edgy).  Quick tests were fine here.  I've updated
> the tarball (same name as yesterday!):
>
>    http://www.mpe.mpg.de/~ach/tmp/digikam-0.9.0-rc1.tar.bz2             
> 17-Nov-2006 01:52  5.3M (md5sum: 99f094cf3789357f57b9e73c34591180)
>
> It contains a RELEASE.rev file with:
>
> Last Changed Rev: 605517
> Last Changed Date: 2006-11-17 01:45:42 +0100 (Fri, 17 Nov 2006)
>
> The digikamimageplugins tarball has not changed since yesterday:
>
>    http://www.mpe.mpg.de/~ach/tmp/digikamimageplugins-0.9.0-rc1.tar.bz2 
> 16-Nov-2006 02:09  3.5M (md5sum: 82ef9fffb900b62a19a4caea5a7472d7)
>
> Please report any problem.  If no showstopper is found,
> we'll upload and announce next Sunday or Monday.
>

Achim, i have fixed an important bug about DMetadata class with commit
#605581. Look B.K.O file #136855 for details.

Can you rebuild digiKam tarball ? Thanks in advance

Note: DigikamImagePlugins is not affected.

Gilles
_______________________________________________
Digikam-devel mailing list
[hidden email]
https://mail.kde.org/mailman/listinfo/digikam-devel