1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From: =?utf-8?q?Bastien_Roucari=C3=A8s?= <[email protected]>
Date: Sat, 31 Aug 2024 15:21:05 0000
Subject: Fix for build for imagemagick6
forwarded: https://github.com/techblue/jmagick/issues/73
---
src/magick/magick_MagickImage.c | 11
1 file changed, 11 insertions( )
diff --git a/src/magick/magick_MagickImage.c b/src/magick/magick_MagickImage.c
index dab4bc6..eb6508c 100644
--- a/src/magick/magick_MagickImage.c
b/src/magick/magick_MagickImage.c
@@ -976,7 976,11 @@ JNIEXPORT jobject JNICALL Java_magick_MagickImage_colorizeImage
}
exception=AcquireExceptionInfo();
#if MagickLibVersion < 0x700
newImage = ColorizeImage(image, cstrOpacity, pixel, exception);
#else
newImage = ColorizeImage(image, cstrOpacity, &pixel, exception);
#endif
(*env)->ReleaseStringUTFChars(env, opacity, cstrOpacity);
if (newImage == NULL) {
throwMagickApiException(env, "Unable to colorize image", exception);
@@ -3114,12 3118,15 @@ JNIEXPORT jboolean JNICALL Java_magick_MagickImage_thresholdImage
#if MagickLibVersion <= 0x557
return ThresholdImage(image, threshold);
#elif MagickLibVersion <= 0x700
return BilevelImage(image, threshold);
#else
ExceptionInfo *exception = AcquireExceptionInfo();
jboolean result = BilevelImage(image, threshold, exception);
DestroyExceptionInfo(exception);
return result;
#endif
}
@@ -6109,7 6116,11 @@ JNIEXPORT jobject JNICALL Java_magick_MagickImage_optimizeLayer
clone_info = CloneImageInfo(image_info);
quantize_info = AcquireQuantizeInfo(clone_info);
#if MagickLibVersion < 0x700
RemapImages(quantize_info, layers, NULL);
#else
RemapImages(quantize_info, layers, NULL, exception);
#endif
DestroyExceptionInfo(exception);
|
