From 08400c92fba8f970d1d7ed55031e1c6b85cd5239 Mon Sep 17 00:00:00 2001 From: mpd Date: Wed, 25 Sep 2013 16:02:15 -0700 Subject: [PATCH] use correct command, and ignore unneeded param --- lib/image-magick.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/image-magick.js b/lib/image-magick.js index a98e4d0..f00741d 100644 --- a/lib/image-magick.js +++ b/lib/image-magick.js @@ -93,7 +93,7 @@ ImageMagick.prototype.watermark = function(params, callback) { // if(!params.hasOwnProperty('size')) // throw new Error('Resize needs size-param with format x!') - this._convert(ImageMagick.Templates.get('watermarkCmd', {}), params, callback) + this._composite(ImageMagick.Templates.get('watermarkCmd', {}), params, callback) } // private @@ -287,7 +287,7 @@ ImageMagick.prototype._convert = function(_command, params, callback) { ImageMagick.prototype._composite = function(_command, params, callback) { var source = params.url , self = this - , size = params.size || params.crop.split('+')[0] +// , size = params.size || params.crop.split('+')[0] , pathHashString , srcTmpPath , destTmpPath