diff --git a/index.js b/index.js index b050e698..941f7e19 100644 --- a/index.js +++ b/index.js @@ -90,8 +90,6 @@ var Sharp = function(input, options) { gamma: 0, greyscale: false, normalize: 0, - bandBoolOp: null, - booleanOp: null, booleanBufferIn: null, booleanFileIn: '', // overlay diff --git a/src/pipeline.cc b/src/pipeline.cc index 20f2a645..78223750 100644 --- a/src/pipeline.cc +++ b/src/pipeline.cc @@ -1289,10 +1289,14 @@ NAN_METHOD(pipeline) { } } // Bandbool operation - baton->bandBoolOp = GetBooleanOperation(attrAsStr(options, "bandBoolOp")); + if(Has(options, New("bandBoolOp").ToLocalChecked()).FromJust()) { + baton->bandBoolOp = GetBooleanOperation(attrAsStr(options, "bandBoolOp")); + } // Boolean operation - baton->booleanOp = GetBooleanOperation(attrAsStr(options, "booleanOp")); + if(Has(options, New("booleanOp").ToLocalChecked()).FromJust()) { + baton->booleanOp = GetBooleanOperation(attrAsStr(options, "booleanOp")); + } // Function to notify of queue length changes Callback *queueListener = new Callback( diff --git a/test/unit/extract.js b/test/unit/extract.js index 059e3e57..655eab52 100644 --- a/test/unit/extract.js +++ b/test/unit/extract.js @@ -181,6 +181,7 @@ describe('Partial image extraction', function() { .extract({ left: 3000, top: 10, width: 10, height: 10 }) .toBuffer(function(err) { assert(err instanceof Error); + assert.strictEqual(err.message, "extract_area: bad extract area\n"); done(); }); });