seoxi/magick-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #82 from brownjohnf/allow-imagemagick-7-1

Browse Source 
Update imagemmagick checks to support 7.1
This commit is contained in:
Nathan Fiedler
2021-06-28 18:26:12 -07:00
committed by GitHub
parent 40f8c58b5b c65027800d
commit fe415039b1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.rs
View File

@ -24,7 +24,7 @@ use std::path::{Path, PathBuf};
use std::process::Command; use std::process::Command;
const MIN_VERSION: &'static str = "7.0"; const MIN_VERSION: &'static str = "7.0";
const MAX_VERSION: &'static str = "7.1"; const MAX_VERSION: &'static str = "7.2";
static HEADER: &'static str = "#include <MagickWand/MagickWand.h>\n"; static HEADER: &'static str = "#include <MagickWand/MagickWand.h>\n";

2
docker/Dockerfile
View File

@ -4,7 +4,7 @@ RUN apt-get update \
&& apt-get -y install curl build-essential clang pkg-config libjpeg-turbo-progs libpng-dev \ && apt-get -y install curl build-essential clang pkg-config libjpeg-turbo-progs libpng-dev \
&& rm -rfv /var/lib/apt/lists/* && rm -rfv /var/lib/apt/lists/*
ENV MAGICK_VERSION 7.0 ENV MAGICK_VERSION 7.1
RUN curl https://download.imagemagick.org/ImageMagick/download/ImageMagick.tar.gz | tar xz \ RUN curl https://download.imagemagick.org/ImageMagick/download/ImageMagick.tar.gz | tar xz \
&& cd ImageMagick-${MAGICK_VERSION}* \ && cd ImageMagick-${MAGICK_VERSION}* \