projects / packages / gthumb.git / blame
| Commit | Line | Data |
|---|---|---|
| 93cf97de JB |
1 | --- gthumb-3.12.2/extensions/raw_files/main.c.orig 2022-04-03 20:38:59.000000000 +0200 |
| 2 | +++ gthumb-3.12.2/extensions/raw_files/main.c 2023-03-27 06:25:00.752465430 +0200 | |
| 3 | @@ -30,6 +30,12 @@ | |
| 4 | #include "gth-metadata-provider-raw.h" | |
| 5 | ||
| 6 | ||
| 7 | +#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) | |
| 8 | +# define GTHUMB_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK) | |
| 9 | +#else | |
| 10 | +# define GTHUMB_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK) | |
| 11 | +#endif | |
| 12 | + | |
| 13 | typedef enum { | |
| 14 | RAW_OUTPUT_COLOR_RAW = 0, | |
| 15 | RAW_OUTPUT_COLOR_SRGB = 1, | |
| 16 | @@ -213,7 +219,7 @@ _cairo_image_surface_create_from_raw (GI | |
| 17 | size_t size; | |
| 18 | GthImage *image = NULL; | |
| 19 | ||
| 20 | - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); | |
| 21 | + raw_data = libraw_init (GTHUMB_LIBRAW_INIT_OPTIONS); | |
| 22 | if (raw_data == NULL) { | |
| 23 | _libraw_set_gerror (error, errno); | |
| 24 | goto fatal_error; | |
| 25 | @@ -300,7 +306,7 @@ _cairo_image_surface_create_from_raw (GI | |
| 26 | if ((original_width != NULL) && (original_height != NULL)) { | |
| 27 | libraw_close (raw_data); | |
| 28 | ||
| 29 | - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); | |
| 30 | + raw_data = libraw_init (GTHUMB_LIBRAW_INIT_OPTIONS); | |
| 31 | if (raw_data == NULL) | |
| 32 | goto fatal_error; | |
| 33 | ||
| 34 | --- gthumb-3.12.2/extensions/raw_files/gth-metadata-provider-raw.c.orig 2022-04-03 20:38:59.000000000 +0200 | |
| 35 | +++ gthumb-3.12.2/extensions/raw_files/gth-metadata-provider-raw.c 2023-03-27 06:26:26.692045645 +0200 | |
| 36 | @@ -26,6 +26,12 @@ | |
| 37 | #include "main.h" | |
| 38 | ||
| 39 | ||
| 40 | +#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21) | |
| 41 | +# define GTHUMB_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_DATAERR_CALLBACK) | |
| 42 | +#else | |
| 43 | +# define GTHUMB_LIBRAW_INIT_OPTIONS (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK) | |
| 44 | +#endif | |
| 45 | + | |
| 46 | G_DEFINE_TYPE (GthMetadataProviderRaw, gth_metadata_provider_raw, GTH_TYPE_METADATA_PROVIDER) | |
| 47 | ||
| 48 | ||
| 49 | @@ -62,7 +68,7 @@ gth_metadata_provider_raw_read (GthMetad | |
| 50 | if (!_g_mime_type_is_raw (gth_file_data_get_mime_type (file_data))) | |
| 51 | return; | |
| 52 | ||
| 53 | - raw_data = libraw_init (LIBRAW_OPIONS_NO_MEMERR_CALLBACK | LIBRAW_OPIONS_NO_DATAERR_CALLBACK); | |
| 54 | + raw_data = libraw_init (GTHUMB_LIBRAW_INIT_OPTIONS); | |
| 55 | if (raw_data == NULL) | |
| 56 | goto fatal_error; | |
| 57 |