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

Add experimental, entropy-based auto-crop

Browse Source 
Remove deprecated extract API
This commit is contained in:
Lovell Fuller
2016-03-05 12:29:16 +00:00
parent 38ddb3b866
commit 2034efcf55
11 changed files with 214 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/pipeline.cc
View File

@@ -49,6 +49,7 @@ using sharp::Normalize;
using sharp::Gamma;
using sharp::Blur;
using sharp::Sharpen;
using sharp::EntropyCrop;
using sharp::ImageType;
using sharp::ImageTypeId;
@@ -506,9 +507,15 @@ class PipelineWorker : public AsyncWorker {
// Crop/max/min
int left;
int top;
std::tie(left, top) = CalculateCrop(
image.width(), image.height(), baton->width, baton->height, baton->gravity
);
if (baton->crop < 9) {
// Gravity-based crop
std::tie(left, top) = CalculateCrop(
image.width(), image.height(), baton->width, baton->height, baton->crop
);
} else {
// Entropy-based crop
std::tie(left, top) = EntropyCrop(image, baton->width, baton->height);
}
int width = std::min(image.width(), baton->width);
int height = std::min(image.height(), baton->height);
image = image.extract_area(left, top, width, height);
@@ -996,7 +1003,7 @@ NAN_METHOD(pipeline) {
baton->overlayGravity = attrAs<int32_t>(options, "overlayGravity");
// Resize options
baton->withoutEnlargement = attrAs<bool>(options, "withoutEnlargement");
baton->gravity = attrAs<int32_t>(options, "gravity");
baton->crop = attrAs<int32_t>(options, "crop");
baton->interpolator = attrAsStr(options, "interpolator");
// Operators
baton->flatten = attrAs<bool>(options, "flatten");