Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-10 19:10:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent boolean errors during extract operation (#509) (#511)

Browse Source
This commit is contained in:
Matt Hirsch 2016-07-16 05:56:15 -04:00 committed by Lovell Fuller
parent 15a577863a
commit c39a9b8de9
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.js
View File

@ -90,8 +90,6 @@ var Sharp = function(input, options) {
gamma: 0, gamma: 0,
greyscale: false, greyscale: false,
normalize: 0, normalize: 0,
bandBoolOp: null,
booleanOp: null,
booleanBufferIn: null, booleanBufferIn: null,
booleanFileIn: '', booleanFileIn: '',
// overlay // overlay

4
src/pipeline.cc
View File

@ -1289,10 +1289,14 @@ NAN_METHOD(pipeline) {
} }
} }
// Bandbool operation // Bandbool operation
if(Has(options, New("bandBoolOp").ToLocalChecked()).FromJust()) {
baton->bandBoolOp = GetBooleanOperation(attrAsStr(options, "bandBoolOp")); baton->bandBoolOp = GetBooleanOperation(attrAsStr(options, "bandBoolOp"));
}
// Boolean operation // Boolean operation
if(Has(options, New("booleanOp").ToLocalChecked()).FromJust()) {
baton->booleanOp = GetBooleanOperation(attrAsStr(options, "booleanOp")); baton->booleanOp = GetBooleanOperation(attrAsStr(options, "booleanOp"));
}
// Function to notify of queue length changes // Function to notify of queue length changes
Callback *queueListener = new Callback( Callback *queueListener = new Callback(

1
test/unit/extract.js
View File

@ -181,6 +181,7 @@ describe('Partial image extraction', function() {
.extract({ left: 3000, top: 10, width: 10, height: 10 }) .extract({ left: 3000, top: 10, width: 10, height: 10 })
.toBuffer(function(err) { .toBuffer(function(err) {
assert(err instanceof Error); assert(err instanceof Error);
assert.strictEqual(err.message, "extract_area: bad extract area\n");
done(); done();
}); });
}); });