Merge pull request #18025 from Rmys/master

imagemagick ver. bump
2026-01-15 10:50:57 +03:00
parent fad310fb67 1a4cedf062
commit 0f7b0bba4e
1 changed files with 13 additions and 0 deletions
@@ -0,0 +1,13 @@
+diff --git a/coders/dng.c b/coders/dng.c
+index 29ef3a799..673852510 100644
+--- a/coders/dng.c
+++ b/coders/dng.c
+@@ -332,7 +332,7 @@ static void SetLibRawParams(const ImageInfo *image_info,Image *image,
+ }
+ 
+ static void LibRawDataError(void *data,const char *magick_unused(file),
+-#if defined(MAGICK_LIBRAW_VERSION_TAIL) && MAGICK_LIBRAW_VERSION_TAIL == 202502
+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0,22) || (defined(MAGICK_LIBRAW_VERSION_TAIL) && MAGICK_LIBRAW_VERSION_TAIL == 202502)
+   const INT64 offset)
+ #else
+   const int offset)