From 19bec9346eee9068a8d9411c3e87c393507d2fbc Mon Sep 17 00:00:00 2001 From: Pierre Inglebert Date: Wed, 2 Apr 2014 22:17:41 +0200 Subject: [PATCH] add libmagick load support --- README.md | 2 +- src/sharp.cc | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index de2df328..78b5c5d2 100755 --- a/README.md +++ b/README.md @@ -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: diff --git a/src/sharp.cc b/src/sharp.cc index b8902c7d..b8409ef4 100755 --- a/src/sharp.cc +++ b/src/sharp.cc @@ -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);