diff options
| author | Přemysl Eric Janouch <p@janouch.name> | 2022-12-23 17:17:22 +0100 |
|---|---|---|
| committer | Přemysl Eric Janouch <p@janouch.name> | 2022-12-23 17:17:33 +0100 |
| commit | 62d82f38c811ce63d5b01dad97930c3f9ca02867 (patch) | |
| tree | f7b8e09de59fccb47355e567d5d60101d03c6112 | |
| parent | c063d93dc7037578a475ae559478bd302358472f (diff) | |
| download | fiv-62d82f38c811ce63d5b01dad97930c3f9ca02867.tar.gz fiv-62d82f38c811ce63d5b01dad97930c3f9ca02867.tar.xz fiv-62d82f38c811ce63d5b01dad97930c3f9ca02867.zip | |
Fix LibRaw 0.21.0 build
| -rw-r--r-- | fiv-io.c | 8 | ||||
| -rw-r--r-- | fiv-thumbnail.c | 3 |
2 files changed, 6 insertions, 5 deletions
@@ -43,6 +43,9 @@ #ifdef HAVE_LIBRAW #include <libraw.h> +#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 21, 0) +#define LIBRAW_OPIONS_NO_MEMERR_CALLBACK 0 +#endif #endif // HAVE_LIBRAW #ifdef HAVE_RESVG #include <resvg.h> @@ -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 <libraw.h> +#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. |