add libmagick load support

This commit is contained in:
Pierre Inglebert 2014-04-02 22:17:41 +02:00
parent 9bd335079f
commit 19bec9346e
2 changed files with 8 additions and 2 deletions

View File

@ -26,7 +26,7 @@ This module is powered by the blazingly fast [libvips](https://github.com/jcupit
### Install libvips on Mac OS
brew install homebrew/science/vips --with-webp
brew install homebrew/science/vips --with-webp --with-graphicsmagick
The _gettext_ dependency of _libvips_ [can lead](https://github.com/lovell/sharp/issues/9) to a `library not found for -lintl` error. If so, please try:

View File

@ -33,7 +33,8 @@ typedef enum {
JPEG,
PNG,
WEBP,
TIFF
TIFF,
MAGICK
} ImageType;
unsigned char MARKER_JPEG[] = {0xff, 0xd8};
@ -117,6 +118,11 @@ class ResizeWorker : public NanAsyncWorker {
if (vips_tiffload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
return resize_error(baton, in);
}
} else if(vips_foreign_is_a("magickload", (baton->file_in).c_str())) {
inputImageType = MAGICK;
if (vips_magickload((baton->file_in).c_str(), &in, "access", baton->access_method, NULL)) {
return resize_error(baton, in);
}
} else {
resize_error(baton, in);
(baton->err).append("Unsupported input file " + baton->file_in);