fixed; remove -size arg from extent

closes #103
master
Aaron Heckmann 12 years ago
parent 1cd9118a18
commit 6bf0e8c82d
  1. 5
      lib/args.js
  2. 10
      test/extent.js
  3. 4
      test/gravity.js

@ -1000,11 +1000,6 @@ module.exports = function (proto) {
geometry = 'x' + h + options geometry = 'x' + h + options
} }
// avoid error "geometry does not contain image (unable to crop image)" - gh-17
if (!(this.inputIs('jpg') && ~this._out.indexOf('-crop'))) {
this.in("-size", geometry);
}
return this.out("-extent", geometry); return this.out("-extent", geometry);
} }

@ -8,12 +8,10 @@ module.exports = function (gm, dir, finish, GM) {
var args = m.args(); var args = m.args();
assert.equal('convert', args[0]); assert.equal('convert', args[0]);
assert.equal('-size', args[1]); assert.equal('-scale', args[2]);
assert.equal('300x300', args[2]); assert.equal('200x100', args[3]);
assert.equal('-scale', args[4]); assert.equal('-extent', args[4]);
assert.equal('200x100', args[5]); assert.equal('300x300', args[5]);
assert.equal('-extent', args[6]);
assert.equal('300x300', args[7]);
if (!GM.integration) if (!GM.integration)
return finish(); return finish();

@ -11,9 +11,7 @@ module.exports = function (img, dir, finish, gm) {
var args = m.args(); var args = m.args();
assert.equal('convert', args[0]); assert.equal('convert', args[0]);
assert.equal('-size', args[1]); args= args.slice(2);
assert.equal('300x300', args[2]);
args= args.slice(4);
assert.deepEqual(args, [ assert.deepEqual(args, [
'-scale', '-scale',
'200x100', '200x100',

Loading…
Cancel
Save