Commit Graph

303 Commits

Author SHA1 Message Date
Nathan Fiedler
3e178d1b8e Update ImageMagick version in Dockerfile 2017-11-26 19:48:21 -08:00
Nathan Fiedler
c2e519f19f Some tidying up 2017-10-08 17:10:56 -07:00
Nathan Fiedler
88dcb28e40 Update ImageMagick version in Dockerfile 2017-10-08 17:10:36 -07:00
Nathan Fiedler
2e6d7faa41 Merge pull request #28 from gentoo90/windows
Parametrize build, add Windows support.
2017-10-08 15:37:56 -07:00
gentoo90
7a387cb675 Add info about env variables and building on Windows to README.md 2017-10-06 21:58:47 +03:00
gentoo90
66a2f0cef4 Parametrize build via environment variables
build.rs now recognizes next environment variables:
IMAGE_MAGICK_DIR - installation directory
IMAGE_MAGICK_LIB_DIRS - list of lib dirs split by ":"
IMAGE_MAGICK_INCLUDE_DIRS - list of include dirs split by ":"
IMAGE_MAGICK_LIBS - list of the libs to link to
IMAGE_MAGICK_STATIC - if set to value other than 0, link statically
2017-10-06 20:24:51 +03:00
Nathan Fiedler
06f1a4352a Merge branch 'magick-7' 2017-08-26 13:14:51 -07:00
Nathan Fiedler
a758819cc9 Update changelog, readme, and crate version
cargo test passes
2017-08-26 13:14:12 -07:00
Nathan Fiedler
a1f211ad1f Merge pull request #27 from little-bobby-tables/get-image-page
Add get_image_page to MagickWand
2017-08-23 08:42:05 -07:00
little-bobby-tables
f6c55ba836 add get_image_page to MagickWand
get_image_page (MagickGetImagePage) is especially useful
for determining the overall dimensions of a GIF, which may have
frames with different widths and heights. In such cases,
get_image_width and get_image_height report the dimensions of
the last frame only.
2017-08-23 19:37:38 +07:00
Nathan Fiedler
a1d50c2f01 Remove old cruft, document testing with Docker 2017-08-19 20:10:23 -07:00
Nathan Fiedler
2d63b00b1f Fix typo in doc comment 2017-08-19 17:45:06 -07:00
little-bobby-tables
b748139e10 fix "libMagickWand-7.Q16HDRI.so.3: cannot open shared object file" 2017-08-19 16:41:08 +07:00
little-bobby-tables
7abde0e7c6 resolve initial compilation issues 2017-08-19 16:35:58 +07:00
little-bobby-tables
e5a5472b1e update build.rs 2017-08-19 16:01:51 +07:00
little-bobby-tables
628ba81a4c add a development Dockerfile 2017-08-19 16:01:02 +07:00
Nathan Fiedler
14f78e3734 Fix pkg-config invocation in build.rs
It seems that pkg-config ignores the --max-version option when combined with
certain other options. As such, that check was not really working. Since the
pkg-config Rust crate always passes those certain other options, it is
necessary to invoke the pkg-config command directly from build.rs instead.

cargo test passes
2017-07-10 21:32:59 -07:00
Nathan Fiedler
acabbafa08 Downgrade rust-bindgen to 0.25.5
There is an issue when building on Linux when using 0.26.0 or higher, so
keep to a version that still works on Mac and Linux.

cargo test passes
2017-07-08 21:30:42 -07:00
Nathan Fiedler
979cdd3269 Fix Ubuntu 16 test VM, rename directory
Also remove the FreeBSD VM definition, as it basically does not work in
VirtualBox and Vagrant, for whatever reason.
2017-07-08 21:29:04 -07:00
Nathan Fiedler
1436145cb5 Tag new release with small API addition
Also, update bindgen version and format some of the comments and
documentation.

cargo test passes
2017-07-07 20:38:01 -07:00
Nathan Fiedler
cba0de65fa Merge pull request #25 from gentoo90/compare
Add `compare_images` method
2017-05-16 10:08:58 -07:00
gentoo90
c50b3e27de Add compare_images method 2017-05-16 16:43:08 +03:00
Nathan Fiedler
4a5b6935ed Merge pull request #24 from gadomski/split-pkg-config-version-flags
Split the pkg-config version and flags checks
2017-04-10 11:23:28 -07:00
Pete Gadomski
d39972da88 Split the pkg-config version and flags checks
Apparently, on RHEL 6.7, pkg-config doesn't let you check versions and
output flags in the same command run.
2017-04-10 08:13:36 -06:00
Nathan Fiedler
00749a2d3d Forgot to set package version 2017-04-08 21:07:20 -07:00
Nathan Fiedler
034a7313bf Update CHANGELOG, add bindgen link to README 2017-04-08 20:58:20 -07:00
Nathan Fiedler
e7054d3e35 Use the rust-bindgen crate properly
Using the changes from @gadomski along with some additional work, to get the
generated bindings working again. Works on macOS and FreeBSD 11. A couple of
hacks are needed for FreeBSD, but nothing too serious.

Changed to use the libc prefix, and changed to use the generated enums.

Fixes #22, #15, and #14

cargo test passes
2017-04-08 16:03:58 -07:00
Pete Gadomski
4507d07c9c Update to the bingen crate 2017-04-07 06:24:00 -06:00
Nathan Fiedler
d86bf69079 Strike out bindgen in README file 2017-04-06 20:02:54 -07:00
Nathan Fiedler
b22e97c908 Hack the MagickWand bindings
Using rust-bindgen to generate the bindings for the MagickWand library is
extremely difficult with the new versions of rust-bindgen. The old versions
of the generated bindings will be used for now, and nothing will be
generated at build time.

cargo test passes
2017-04-06 19:58:58 -07:00
Nathan Fiedler
f4843c246c Test with some flexibility in image size
The size of the image can vary from version to version (of ImageMagick) and
platform to platform (i.e. MacOS and FreeBSD). As such, allow for a degree
of variability in the resulting image size.

cargo test passes
2017-01-22 14:13:05 -08:00
Nathan Fiedler
6ade7438d9 Additional Homebrew link command is needed 2017-01-21 15:30:37 -08:00
Nathan Fiedler
693dc0b4e9 Specify exactly how to install ImageMagick with Homebrew 2017-01-21 13:18:22 -08:00
Nathan Fiedler
c45a066093 Quiet the package installation in Fabric script 2016-10-20 09:02:13 -07:00
Nathan Fiedler
2eccf1e91b Ensure pkg-config present when generating bindings
Not all systems have pkg-config installed by default.

cargo test passes
2016-10-20 08:51:25 -07:00
Nathan Fiedler
b63f25c550 Enforce MagickWand version in build.rs
It is very easy to overlook the version of MagickWand mentioned in the
README, so make sure the build system enforces it.

Fixes #19

cargo test passes
2016-10-16 11:00:06 -07:00
Nathan Fiedler
cb40925af0 Merge pull request #18 from brunoqc/patch-1
syntax highlighting in README.md
2016-10-05 09:39:53 -07:00
Bruno Bigras
1d31b971c6 syntax highlighting in README.md 2016-10-04 17:01:27 -04:00
Nathan Fiedler
50d10a3285 Add notes for 0.6.0 release 2016-09-20 20:11:49 -07:00
Nathan Fiedler
dd4becddd7 Hack to get build working on FreeBSD again
Due to a bug in rust-bindgen, use the bindings as generated on the Mac
for the same version of MagickWand as found on FreeBSD. That is, when
build.rs is invoked on a FreeBSD system, it will use the Mac-generated
bindings.rs rather than pulling down rust-bindgen and invoking it to
generate the bindings on the fly. See issue #385 in the rust-bindgen
project for details.

cargo test passes
2016-09-20 20:03:28 -07:00
Nathan Fiedler
2a76a0f164 Merge pull request #17 from gadomski/remove-usr-local-lib-link-path
Remove /usr/local/lib from rustc link search on OSX
2016-08-25 08:52:32 -07:00
Pete Gadomski
7563231707 Remove /usr/local/lib from rustc link search
If /usr/local/lib is in the search path, a Homebrew installed libJPEG
can end up conflicting with the system libJPEG as such:

```
$ otool -L /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
/System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO:
... snip ...
    /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib (compatibility version 1.0.0, current version 1.0.0)
... snip ...
```

```
$ cargo clean && cargo test
... snip ...
Doc-tests magick_rust
dyld: Symbol not found: __cg_jpeg_resync_to_restart
  Referenced from: /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
  Expected in: /usr/local/lib/libJPEG.dylib
 in /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO
```

Removing the /usr/local/lib link search path allows successful
compilation and testing on my OSX 10.11.6, with jpeg 8d installed into
/usr/local/lib via Homebrew. I realize this might be a problem with my
setup and not a universal issue, but as Homebrew is so common I thought
I'd submit this patch anyways.
2016-08-25 07:54:49 -06:00
Nathan Fiedler
094e24d859 Clarify versions of dependencies 2016-08-18 15:53:14 -07:00
Nathan Fiedler
39a58432b7 Include note about LIBCLANG_PATH envar for Linux 2016-08-18 15:47:35 -07:00
Nathan Fiedler
b0d439892b Correct the copyright year 2016-08-18 15:47:14 -07:00
Nathan Fiedler
8b8f2b4444 Update Fabric script for provisioning Ubuntu VM 2016-08-18 14:59:04 -07:00
Nathan Fiedler
5b4ba71530 Make note that Clang is required to build 2016-08-18 14:58:45 -07:00
Nathan Fiedler
eec7998d25 Use new rust-bindgen crate for faster builds
Rather than cloning the bindgen repository and building from source, use
the packaged crate. The result is the rebuilds are much, much faster.
Also, had to make numerous changes for the new version of bindgen.

cargo test passes
2016-08-14 21:23:05 -07:00
Nathan Fiedler
2c94dab05a Add license header to contributed files 2016-08-14 18:46:03 -07:00
Nathan Fiedler
f41202af44 No longer need to ignore bindings.rs 2016-08-12 20:32:07 -07:00