Adjusting MagicCore mapping to IM7/windows [ci skip]

emcconville · Dec 26, 2018 · 6f305a9 · 6f305a9
1 parent 02afc92
commit 6f305a9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/wand/api.py b/wand/api.py
@@ -184,7 +184,7 @@ def load_library():
     libmagick.GetMagickQuantumDepth(ctypes.byref(IM_QUANTUM_DEPTH))
     # Does the library support HDRI?
     IM_HDRI = 'HDRI' in str(libmagick.GetMagickFeatures())
-    core.load_with_version(libmagick, IM_VERSION)
+    core.load_with_version(libmagick, IM_VERSION.value)
     magick_wand.load(library, IM_VERSION.value)
     magick_property.load(library, IM_VERSION.value)
     magick_image.load(library, IM_VERSION.value)

diff --git a/wand/cdefs/core.py b/wand/cdefs/core.py
@@ -86,9 +86,16 @@ def load(libmagick):
 
 
 def load_with_version(libmagick, IM_VERSION):
-    libmagick.AcquireKernelBuiltIn.argtypes = [c_void_p, c_void_p]
-    libmagick.AcquireKernelBuiltIn.restype = c_void_p
-    libmagick.AcquireKernelInfo.argtypes = [c_char_p]
-    libmagick.AcquireKernelInfo.restype = c_void_p
+    if IM_VERSION < 0x700:
+        libmagick.AcquireKernelBuiltIn.argtypes = [c_int, c_void_p]
+        libmagick.AcquireKernelBuiltIn.restype = c_void_p
+        libmagick.AcquireKernelInfo.argtypes = [c_char_p]
+        libmagick.AcquireKernelInfo.restype = c_void_p
+    else:
+        libmagick.AcquireKernelBuiltIn.argtypes = [c_int, c_void_p,
+                                                   c_void_p]
+        libmagick.AcquireKernelBuiltIn.restype = c_void_p
+        libmagick.AcquireKernelInfo.argtypes = [c_char_p, c_void_p]
+        libmagick.AcquireKernelInfo.restype = c_void_p
     libmagick.DestroyKernelInfo.argtypes = [c_void_p]
     libmagick.DestroyKernelInfo.restype = c_void_p