Modify libversion logicand add functions for initalization

Author: musm

deps/build.jl

@@ -49,10 +49,10 @@ if is_windows()
     innounp_url   = "https://bintray.com/artifact/download/julialang/generic/innounp.exe"
     preloads      =
         """
-        init_envs["MAGICK_CONFIGURE_PATH"]     = \"$(escape_string(magick_libdir))\"
-        init_envs["MAGICK_CODER_MODULE_PATH"]  = \"$(escape_string(joinpath(magick_libdir, "modules", "coders")))\"
-        init_envs["MAGICK_FILTER_MODULE_PATH"] = \"$(escape_string(joinpath(magick_libdir, "modules", "filters")))\"
-        init_envs["PATH"]                      = \"$(escape_string(magick_libdir * ";"))\" * ENV["PATH"]\
+        init_envs["MAGICK_CONFIGURE_PATH"]     = "$(escape_string(magick_libdir))"
+        init_envs["MAGICK_CODER_MODULE_PATH"]  = "$(escape_string(joinpath(magick_libdir, "modules", "coders")))"
+        init_envs["MAGICK_FILTER_MODULE_PATH"] = "$(escape_string(joinpath(magick_libdir, "modules", "filters")))"
+        init_envs["PATH"]                      = "$(escape_string(magick_libdir * ";"))" * ENV["PATH"]
         """
 
     provides(BuildProcess,
@@ -73,9 +73,9 @@ if is_apple()
     homebrew_prefix = Homebrew.prefix()
     preloads =
         """
-        init_envs["MAGICK_CONFIGURE_PATH"]    = \"$(escape_string(joinpath(homebrew_prefix, "lib", "ImageMagick", "config-Q16")))\"
-        init_envs["MAGICK_CODER_MODULE_PATH"] = \"$(escape_string(joinpath(homebrew_prefix, "lib", "ImageMagick", "modules-Q16", "coders")))\"
-        init_envs["MAGICK_FILTER_MODULE_PATH"] = \"$(escape_string(joinpath(homebrew_prefix, "lib", "ImageMagick", "modules-Q16", "filters")))\"
+        init_envs["MAGICK_CONFIGURE_PATH"]     = "$(escape_string(joinpath(homebrew_prefix, "lib", "ImageMagick", "config-Q16")))"
+        init_envs["MAGICK_CODER_MODULE_PATH"]  = "$(escape_string(joinpath(homebrew_prefix, "lib", "ImageMagick", "modules-Q16", "coders")))"
+        init_envs["MAGICK_FILTER_MODULE_PATH"] = "$(escape_string(joinpath(homebrew_prefix, "lib", "ImageMagick", "modules-Q16", "filters")))"
         """
     provides(Homebrew.HB, "homebrew/core/imagemagick@6", libwand, os = :Darwin, preload = preloads)
 end

src/ImageMagick.jl

@@ -152,7 +152,7 @@ function image2wand(img, mapi=identity, quality=nothing, permute_horizontal=true
     T = eltype(imgw)
     channelorder = T<:Real ? "Gray" : ColorTypes.colorant_string(T)
     if T <: Union{RGB,RGBA,ARGB,BGRA,ABGR}
-        cs = libversionref[] > v"6.7.5" ? "sRGB" : "RGB"
+        cs = getlibversion() > v"6.7.5" ? "sRGB" : "RGB"
     else
         cs = channelorder
     end

src/libmagickwand.jl

@@ -20,17 +20,17 @@ export MagickWand,
 
 const init_envs = Dict{String,String}()
 
-# Find the library
-const depsfile = joinpath(dirname(@__FILE__), "..", "deps", "deps.jl")
+const depsfile = joinpath(dirname(@__DIR__), "deps", "deps.jl")
 if isfile(depsfile)
     include(depsfile)
 else
     error("ImageMagick not properly installed. Please run Pkg.build(\"ImageMagick\") then restart Julia.")
 end
 
-const libmagic = Ref{Ptr{Void}}()
+const libmagick = Ref{Ptr{Void}}()
 
 const MagickWandGenesis                = Ref{Ptr{Void}}()
+const MagickWandTerminus               = Ref{Ptr{Void}}()
 const NewMagickWand                    = Ref{Ptr{Void}}()
 const DestroyMagickWand                = Ref{Ptr{Void}}()
 const NewPixelWand                     = Ref{Ptr{Void}}()
@@ -75,18 +75,23 @@ const MagickRelinquishMemory           = Ref{Ptr{Void}}()
 const MagickQueryConfigureOption       = Ref{Ptr{Void}}()
 const MagickQueryConfigureOptions      = Ref{Ptr{Void}}()
 
-const libversionref = Ref{VersionNumber}()
 
-loadsym(fun::Symbol) = Libdl.dlsym(libmagic[], fun)
+initialize() = ccall(MagickWandGenesis[], Void, ())
+destroy() = ccall(MagickWandTerminus[], Void, ())
+
+loadsym(fun::Symbol) = Libdl.dlsym(libmagick[], fun)
+
+getlibversion() = VersionNumber(join(split(queryoption("LIB_VERSION_NUMBER"), ',')[1:3], '.'))
 
 function __init__()
     for (key, value) in init_envs
         ENV[key] = value
     end
 
-    libmagic[]  = Libdl.dlopen(libwand, Libdl.RTLD_GLOBAL)
+    libmagick[]  = Libdl.dlopen(libwand, Libdl.RTLD_GLOBAL)
 
     MagickWandGenesis[]                = loadsym(:MagickWandGenesis)
+    MagickWandTerminus[]               = loadsym(:MagickWandTerminus)
     NewMagickWand[]                    = loadsym(:NewMagickWand)
     DestroyMagickWand[]                = loadsym(:DestroyMagickWand)
     NewPixelWand[]                     = loadsym(:NewPixelWand)
@@ -131,10 +136,9 @@ function __init__()
     MagickQueryConfigureOptions[]      = loadsym(:MagickQueryConfigureOptions)
     MagickQueryConfigureOption[]       = loadsym(:MagickQueryConfigureOption)
 
-    ccall(MagickWandGenesis[], Void, ())
+    initialize()
 
-    libversionref[] = VersionNumber(join(split(queryoption("LIB_VERSION_NUMBER"), ',')[1:3], '.'))
-    global libversion = libversionref[]
+    global libversion = getlibversion()
 end
 
 # Constants