--- core/libs/metadataengine/engine/metaengine_comments.cpp.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_comments.cpp

@@ -64,7 +64,7 @@ bool MetaEngine::canWriteComment(const QString& filePa

     catch (Exiv2::AnyError& e)

     {

         qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Comment access mode with Exiv2 (Error #"

-                                           << e.code() << ": " << QString::fromStdString(e.what()) << ")";

+                                           << static_cast<int>(e.code()) << ": " << QString::fromStdString(e.what()) << ")";

     }

     catch (...)

     {

--- core/libs/metadataengine/engine/metaengine_data_p.cpp.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_data_p.cpp

@@ -52,7 +52,7 @@ void MetaEngineData::Private::clear()

     catch (Exiv2::AnyError& e)

     {

         qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot clear data container with Exiv2 "

-                                           << "(Error #" << e.code() << ": "

+                                           << "(Error #" << static_cast<int>(e.code()) << ": "

                                            << QString::fromStdString(e.what())

                                            << ")";

     }

--- core/libs/metadataengine/engine/metaengine_exif.cpp.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_exif.cpp

@@ -80,7 +80,7 @@ bool MetaEngine::canWriteExif(const QString& filePath)

     catch (Exiv2::AnyError& e)

     {

         qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Exif access mode with Exiv2:(Error #"

-                                           << e.code() << ": " << QString::fromStdString(e.what()) << ")";

+                                           << static_cast<int>(e.code()) << ": " << QString::fromStdString(e.what()) << ")";

     }

     catch (...)

     {

@@ -739,7 +739,7 @@ bool MetaEngine::getExifTagLong(const char* exifTagNam

         if ((it != exifData.end()) && (it->count() > 0))

         {

-            val = it->toLong(component);

+            val = it->toInt64(component);

             return true;

         }

@@ -812,7 +812,7 @@ QVariant MetaEngine::getExifTagVariant(const char* exi

                 {

                     if ((int)it->count() > component)

                     {

-                        return QVariant((int)it->toLong(component));

+                        return QVariant((int)it->toInt64(component));

                     }

                     else

                     {

@@ -915,7 +915,7 @@ QString MetaEngine::getExifTagString(const char* exifT

             QString tagValue;

             QString key = QLatin1String(it->key().c_str());

-            if ((key == QLatin1String("Exif.CanonCs.LensType")) && (it->toLong() == 65535))

+            if ((key == QLatin1String("Exif.CanonCs.LensType")) && (it->toInt64() == 65535))

             {

                 // FIXME: workaround for a possible crash in Exiv2 pretty-print function for the Exif.CanonCs.LensType.

@@ -987,12 +987,12 @@ QImage MetaEngine::getExifThumbnail(bool fixOrientatio

         Exiv2::ExifThumbC thumb(d->exifMetadata());

         Exiv2::DataBuf const c1 = thumb.copy();

-        if (c1.size_ == 0)

+        if (c1.size() == 0)

         {

             return thumbnail;

         }

-        thumbnail.loadFromData(c1.pData_, c1.size_);

+        thumbnail.loadFromData(c1.c_data(), c1.size());

         if (!thumbnail.isNull())

         {

@@ -1010,7 +1010,7 @@ QImage MetaEngine::getExifThumbnail(bool fixOrientatio

                 if (it != exifData.end() && it->count())

                 {

-                    long orientation = it->toLong();

+                    long orientation = it->toInt64();

                     //qCDebug(DIGIKAM_METAENGINE_LOG) << "Exif Thumbnail Orientation: " << (int)orientation;

@@ -1092,12 +1092,12 @@ bool MetaEngine::setTiffThumbnail(const QImage& thumbI

         Exiv2::ExifData::const_iterator pos = d->exifMetadata().findKey(Exiv2::ExifKey("Exif.Image.NewSubfileType"));

-        if ((pos == d->exifMetadata().end()) || (pos->count() != 1) || (pos->toLong() != 0))

+        if ((pos == d->exifMetadata().end()) || (pos->count() != 1) || (pos->toInt64() != 0))

         {

 #if EXIV2_TEST_VERSION(0,27,0)

-            throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");

+            throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image");

 #else

@@ -1136,9 +1136,9 @@ bool MetaEngine::setTiffThumbnail(const QImage& thumbI

             Exiv2::DataBuf buf((Exiv2::byte*)data.data(), data.size());

             Exiv2::ULongValue val;

             val.read("0");

-            val.setDataArea(buf.pData_, buf.size_);

+            val.setDataArea(buf.c_data(), buf.size());

             d->exifMetadata()["Exif.SubImage1.JPEGInterchangeFormat"]       = val;

-            d->exifMetadata()["Exif.SubImage1.JPEGInterchangeFormatLength"] = uint32_t(buf.size_);

+            d->exifMetadata()["Exif.SubImage1.JPEGInterchangeFormatLength"] = uint32_t(buf.size());

             d->exifMetadata()["Exif.SubImage1.Compression"]                 = uint16_t(6);          // JPEG (old-style)

             d->exifMetadata()["Exif.SubImage1.NewSubfileType"]              = uint32_t(1);          // Thumbnail image

@@ -1261,7 +1261,7 @@ MetaEngine::MetaDataMap MetaEngine::getExifTagsDataLis

             {

                 tagValue = QString::number(md->value().size());

             }

-            else if (key == QLatin1String("Exif.CanonCs.LensType") && md->toLong() == 65535)

+            else if (key == QLatin1String("Exif.CanonCs.LensType") && md->toInt64() == 65535)

             {

                 // FIXME: workaround for a possible crash in Exiv2 pretty-print function for the Exif.CanonCs.LensType.

--- core/libs/metadataengine/engine/metaengine_iptc.cpp.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_iptc.cpp

@@ -29,6 +29,8 @@

 #include "digikam_debug.h"

 #include "digikam_config.h"

+#include <exiv2/photoshop.hpp>

+

 #if defined(Q_CC_CLANG)

 #   pragma clang diagnostic push

 #   pragma clang diagnostic ignored "-Wdeprecated-declarations"

@@ -65,7 +67,7 @@ bool MetaEngine::canWriteIptc(const QString& filePath)

     catch (Exiv2::AnyError& e)

     {

         qCCritical(DIGIKAM_METAENGINE_LOG) << "Cannot check Iptc access mode with Exiv2:(Error #"

-                                           << e.code() << ": " << QString::fromStdString(e.what()) << ")";

+                                           << static_cast<int>(e.code()) << ": " << QString::fromStdString(e.what()) << ")";

     }

     catch (...)

     {

@@ -121,7 +123,7 @@ QByteArray MetaEngine::getIptc(bool addIrbHeader) cons

                 c2 = Exiv2::IptcParser::encode(d->iptcMetadata());

             }

-            QByteArray data((const char*)c2.pData_, c2.size_);

+            QByteArray data(reinterpret_cast<const char *>(c2.c_data()), c2.size());

             return data;

         }

--- core/libs/metadataengine/engine/metaengine_item.cpp.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_item.cpp

@@ -127,7 +127,7 @@ QSize MetaEngine::getItemDimensions() const

         if ((it != exifData.end()) && it->count())

         {

-            width = it->toLong();

+            width = it->toInt64();

         }

         Exiv2::ExifKey key2("Exif.Photo.PixelYDimension");

@@ -135,7 +135,7 @@ QSize MetaEngine::getItemDimensions() const

         if ((it2 != exifData.end()) && it2->count())

         {

-            height = it2->toLong();

+            height = it2->toInt64();

         }

         if ((width != -1) && (height != -1))

@@ -153,7 +153,7 @@ QSize MetaEngine::getItemDimensions() const

         if ((it3 != exifData.end()) && it3->count())

         {

-            width = it3->toLong();

+            width = it3->toInt64();

         }

         Exiv2::ExifKey key4("Exif.Image.ImageLength");

@@ -161,7 +161,7 @@ QSize MetaEngine::getItemDimensions() const

         if ((it4 != exifData.end()) && it4->count())

         {

-            height = it4->toLong();

+            height = it4->toInt64();

         }

         if ((width != -1) && (height != -1))

@@ -320,7 +320,7 @@ MetaEngine::ImageOrientation MetaEngine::getItemOrient

         if ((it != exifData.end()) && it->count())

         {

-            orientation = it->toLong();

+            orientation = it->toInt64();

             //qCDebug(DIGIKAM_METAENGINE_LOG) << "Orientation => Exif.MinoltaCs7D.Rotation =>" << (int)orientation;

@@ -347,7 +347,7 @@ MetaEngine::ImageOrientation MetaEngine::getItemOrient

         if ((it != exifData.end()) && it->count())

         {

-            orientation = it->toLong();

+            orientation = it->toInt64();

             //qCDebug(DIGIKAM_METAENGINE_LOG) << "Orientation => Exif.MinoltaCs5D.Rotation =>" << (int)orientation;

@@ -376,7 +376,7 @@ MetaEngine::ImageOrientation MetaEngine::getItemOrient

         if ((it != exifData.end()) && it->count())

         {

-            orientation = it->toLong();

+            orientation = it->toInt64();

             //qCDebug(DIGIKAM_METAENGINE_LOG) << "Orientation => Exif.Image.Orientation =>" << (int)orientation;

--- core/libs/metadataengine/engine/metaengine_p.cpp.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_p.cpp

@@ -542,7 +542,7 @@ bool MetaEngine::Private::saveOperations(const QFileIn

 void MetaEngine::Private::printExiv2ExceptionError(const QString& msg, Exiv2::AnyError& e)

 {

     qCCritical(DIGIKAM_METAENGINE_LOG) << msg.toLatin1().constData()

-                                       << " (Error #" << e.code() << ": " << QString::fromStdString(e.what());

+                                       << " (Error #" << static_cast<int>(e.code()) << ": " << QString::fromStdString(e.what());

 }

 void MetaEngine::Private::printExiv2MessageHandler(int lvl, const char* msg)

--- core/libs/metadataengine/engine/metaengine_p.h.orig	2023-03-12 13:19:02 UTC

+++ core/libs/metadataengine/engine/metaengine_p.h

@@ -90,6 +90,10 @@

          ( EXIV2_VERSION >= EXIV2_MAKE_VERSION(major,minor,patch) )

 #endif

+#if EXIV2_TEST_VERSION(0,28,0)

+#   define AnyError Error

+#endif

+

 #if EXIV2_TEST_VERSION(0,27,99)

 #   define AutoPtr UniquePtr

 #endif

@@ -182,7 +186,7 @@ class Q_DECL_HIDDEN MetaEngine::Private (public)

      * Generic method to print the Exiv2 C++ Exception error message from 'e'.

      * 'msg' string is printed using qDebug rules.

      */

-    static void printExiv2ExceptionError(const QString& msg, Exiv2::AnyError& e);

+    static void printExiv2ExceptionError(const QString& msg, Exiv2::Error& e);

     /**

      * Generic method to print debug message from Exiv2.