[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: digikam-devel at kde.org

 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 )