exiv2 0.28.0 support about geeqie

[neheb]

--- a/src/exiv2.cc
+++ b/src/exiv2.cc
@@ -62,6 +62,11 @@

 #include "misc.h"

+#if EXIV2_TEST_VERSION(0,28,0)
+#define AnyError Error
+#define AutoPtr UniquePtr
+#endif
+
 typedef struct _AltKey AltKey;

 struct _AltKey
@@ -174,7 +179,7 @@ public:
        {
                cp_data_ = NULL;
                cp_length_ = 0;
-               image_ = image;
+               image_ = std::move(image);
                valid_ = TRUE;
        }

@@ -364,7 +369,11 @@ public:
                        Exiv2::Image *image = imageData_->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
 #else
                        if (!image) throw Exiv2::Error(21);
 #endif
@@ -839,7 +848,11 @@ gint exif_item_get_integer(ExifItem *item, gint *value)
 {
        try {
                if (!item || exif_item_get_elements(item) == 0) return 0;
+#if EXIV2_TEST_VERSION(0,28,0)
+               *value = ((Exiv2::Metadatum *)item)->toInt64();
+#else
                *value = ((Exiv2::Metadatum *)item)->toLong();
+#endif
                return 1;
        }
        catch (Exiv2::AnyError& e) {
@@ -1224,10 +1237,17 @@ guchar *exif_get_preview(ExifData *exif, guint *data_len, gint requested_width,
                        Exiv2::PreviewImage image = pm.getPreviewImage(*pos);

                        Exiv2::DataBuf buf = image.copy();
+#if EXIV2_TEST_VERSION(0,28,0)
+                       *data_len = buf.size();
+                       auto b = buf.data();
+                       buf.reset();
+                       return b;
+#else
                        std::pair<Exiv2::byte*, long> p = buf.release();

                        *data_len = p.second;
                        return p.first;
+#endif
                        }
                return NULL;
        }

[caclark]

Thanks for your help @neheb .
I cannot even get past the headers - I get:

/usr/local/include/exiv2/error.hpp:56:16: error: variable ‘Exiv2::EXIV2API Exiv2::LogMsg’ has initializer but incomplete type

and then everything fails...

I do not have a good feeling about this.

[xsdg]

I haven't taken a close look, but "initializer but incomplete type" means that the type is being used in a context where it needs to be fully defined, but the compiler doesn't see a full definition yet at that point.

This is a pure guess, but I'm guessing that error.hpp relies on a type that's defined in log.hpp or something, but doesn't actually #include that dependency, and it probably wasn't noticed because everywhere else that uses it also includes log.hpp first.

[xsdg]

(That is, just by the signature, this looks like an exiv2 bug)

[neheb]

Weird.

mkdir subprojects
meson wrap install exiv2
meson setup --wrap_mode=forcefallback build
meson compile -C build

Should result in a successful build.

edit: this project looks like it needs some clang-tidy cleanups.

[caclark]

Thanks @neheb . I can now compile the project. But....

With the exif window open and viewing a certain type of file there is a crash. It happens with NEF files from my camera, but not with NEF test images downloaded from the Internet.

Attached is the log file and a sample image. If anyone can easily see the problem, that is good. Otherwise it will take me a while (or longer) to find the problem.

log3.txt.gz
2019-12-23-11:21:44-DSC_3328.NEF.gz

[neheb]

Sounds like an upstream issue

[caclark]

Compilation is ok, but the seg. fault with some .nef files remains.

[neheb]

Some nef files.

Probably should submit a bug report upstream.

[caclark]

I have raised an issue at exiv2: Exiv2/exiv2#2638

If I knew anything about c++, things would be easier....

[neheb]

since this project is C++ as well, probably should use clang-tidy.

[caclark]

Fixed in commit c45cca7