From b71833996d3aecf3efdf253b605aa908e6e9112b Mon Sep 17 00:00:00 2001 From: Arkadiy Illarionov Date: Wed, 28 Feb 2024 22:26:45 +0300 Subject: [PATCH] Fix warnings in exiv2 Also fix indentation. --- src/exiv2.cc | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/exiv2.cc b/src/exiv2.cc index 49e95d08..2aab7823 100644 --- a/src/exiv2.cc +++ b/src/exiv2.cc @@ -332,14 +332,15 @@ public: copyXmpToExif(xmpData_, exifData_); Exiv2::Image *image = imageData_->image(); + if (!image) #ifdef HAVE_EXIV2_ERROR_CODE -#if EXIV2_TEST_VERSION(0,28,0) - if (!image) throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); -#else - if (!image) throw Exiv2::Error(Exiv2::kerInputDataReadFailed); -#endif +# if EXIV2_TEST_VERSION(0,28,0) + throw Exiv2::Error(Exiv2::ErrorCode::kerInputDataReadFailed); +# else + throw Exiv2::Error(Exiv2::kerInputDataReadFailed); +# endif #else - if (!image) throw Exiv2::Error(21); + throw Exiv2::Error(21); #endif image->setExifData(exifData_); image->setIptcData(iptcData_); @@ -648,7 +649,7 @@ char *exif_item_get_data(ExifItem *item, guint *data_len) auto md = reinterpret_cast(item); if (data_len) *data_len = md->size(); auto data = static_cast(g_malloc(md->size())); - long res = md->copy(reinterpret_cast(data), Exiv2::littleEndian /* should not matter */); + auto res = md->copy(reinterpret_cast(data), Exiv2::littleEndian /* should not matter */); g_assert(res == md->size()); return data; } @@ -955,7 +956,11 @@ static GList *exif_add_value_to_glist(GList *list, Exiv2::Metadatum &item, Metad else { /* read as a list */ - gint i; +#if EXIV2_TEST_VERSION(0,28,0) + size_t i; +#else + long i; +#endif for (i = 0; i < item.count(); i++) list = g_list_append(list, utf8_validate_or_convert(item.toString(i).c_str())); } -- 2.20.1