Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2026-02-10 00:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch from custom trim op to vips_find_trim #914

Browse Source
This commit is contained in:
Lovell Fuller
2018-10-02 11:24:32 +01:00
parent 11900945eb
commit 21fbe546b8
8 changed files with 34 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pipeline.cc
View File

@@ -100,8 +100,8 @@ class PipelineWorker : public Nan::AsyncWorker {
}
// Trim
if (baton->trimTolerance != 0) {
image = sharp::Trim(image, baton->trimTolerance);
if (baton->trimThreshold > 0.0) {
image = sharp::Trim(image, baton->trimThreshold);
}
// Pre extraction
@@ -233,7 +233,7 @@ class PipelineWorker : public Nan::AsyncWorker {
if (
xshrink == yshrink && xshrink >= 2 * shrink_on_load_factor &&
(inputImageType == ImageType::JPEG || inputImageType == ImageType::WEBP) &&
baton->gamma == 0 && baton->topOffsetPre == -1 && baton->trimTolerance == 0
baton->gamma == 0 && baton->topOffsetPre == -1 && baton->trimThreshold == 0.0
) {
if (xshrink >= 8 * shrink_on_load_factor) {
xfactor = xfactor / 8;
@@ -1183,7 +1183,7 @@ NAN_METHOD(pipeline) {
baton->sharpenJagged = AttrTo<double>(options, "sharpenJagged");
baton->threshold = AttrTo<int32_t>(options, "threshold");
baton->thresholdGrayscale = AttrTo<bool>(options, "thresholdGrayscale");
baton->trimTolerance = AttrTo<int32_t>(options, "trimTolerance");
baton->trimThreshold = AttrTo<double>(options, "trimThreshold");
baton->gamma = AttrTo<double>(options, "gamma");
baton->linearA = AttrTo<double>(options, "linearA");
baton->linearB = AttrTo<double>(options, "linearB");
@@ -1293,7 +1293,7 @@ NAN_METHOD(pipeline) {
}
// Force random access for certain operations
if (baton->accessMethod == VIPS_ACCESS_SEQUENTIAL && (
baton->trimTolerance != 0 || baton->normalise ||
baton->trimThreshold > 0.0 || baton->normalise ||
baton->position == 16 || baton->position == 17)) {
baton->accessMethod = VIPS_ACCESS_RANDOM;
}