From d62fcfd6579a90eaa2bd9cb237291105d682e44e Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Thu, 27 Dec 2012 20:39:43 +0100 Subject: jpeg-utils: Use Exiv2::Exifdatum.count() for key presence test --- src/jpeg-utils.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp index 196752a..d68bf59 100644 --- a/src/jpeg-utils.cpp +++ b/src/jpeg-utils.cpp @@ -253,16 +253,12 @@ exif_has_key (ExifData *exif, const gchar *key) if (g_str_has_prefix (key, "Exif.")) { Exiv2::ExifData &exifData = exif->image->exifData(); - if (! exifData.empty()) { - return (! exifData[key].toString().empty()); - } + return !exifData.empty() && exifData[key].count() > 0; } if (g_str_has_prefix (key, "Iptc.")) { Exiv2::IptcData &iptcData = exif->image->iptcData(); - if (! iptcData.empty()) { - return (! iptcData[key].toString().empty()); - } + return !iptcData.empty() && iptcData[key].count() > 0; } return FALSE; -- cgit v1.2.3