From 62d82f38c811ce63d5b01dad97930c3f9ca02867 Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch
Date: Fri, 23 Dec 2022 17:17:22 +0100
Subject: Fix LibRaw 0.21.0 build
---
fiv-io.c | 8 +++-----
fiv-thumbnail.c | 3 +++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/fiv-io.c b/fiv-io.c
index c17abca..0c4d0e5 100644
--- a/fiv-io.c
+++ b/fiv-io.c
@@ -43,6 +43,9 @@
#ifdef HAVE_LIBRAW
#include
+#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 21, 0)
+#define LIBRAW_OPIONS_NO_MEMERR_CALLBACK 0
+#endif
#endif // HAVE_LIBRAW
#ifdef HAVE_RESVG
#include
@@ -1697,11 +1700,6 @@ fail:
#ifdef HAVE_LIBRAW // ---------------------------------------------------------
-// LibRaw 0.21.0 compatibility.
-#ifndef LIBRAW_OPIONS_NO_MEMERR_CALLBACK
-#define LIBRAW_OPIONS_NO_MEMERR_CALLBACK 0
-#endif
-
static cairo_surface_t *
open_libraw(const char *data, gsize len, GError **error)
{
diff --git a/fiv-thumbnail.c b/fiv-thumbnail.c
index f95ed70..d0ec91a 100644
--- a/fiv-thumbnail.c
+++ b/fiv-thumbnail.c
@@ -33,6 +33,9 @@
#ifdef HAVE_LIBRAW
#include
+#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 21, 0)
+#define LIBRAW_OPIONS_NO_MEMERR_CALLBACK 0
+#endif
#endif // HAVE_LIBRAW
// TODO(p): Consider merging back with fiv-io.
--
cgit v1.2.3-70-g09d2