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

Ensure auto-rotation works with shrink-on-load #3352

Browse Source 
Fixes regression in 0.31.0
This commit is contained in:
Lovell Fuller
2022-09-07 14:17:40 +01:00
parent f5da147a58
commit fbd4970b57
6 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common.cc
View File

@@ -557,6 +557,7 @@ namespace sharp {
VImage RemoveExifOrientation(VImage image) {
VImage copy = image.copy();
copy.remove(VIPS_META_ORIENTATION);
copy.remove("exif-ifd0-Orientation");
return copy;
}

7
src/pipeline.cc
View File

@@ -92,7 +92,10 @@ class PipelineWorker : public Napi::AsyncWorker {
}
// Rotate pre-extract
if (baton->rotateBeforePreExtract) {
bool const shouldRotateBefore = baton->rotateBeforePreExtract &&
(rotation != VIPS_ANGLE_D0 || flip || flop || baton->rotationAngle != 0.0);
if (shouldRotateBefore) {
if (rotation != VIPS_ANGLE_D0) {
image = image.rot(rotation);
}
@@ -167,7 +170,7 @@ class PipelineWorker : public Napi::AsyncWorker {
// - input colourspace is not specified;
bool const shouldPreShrink = (targetResizeWidth > 0 || targetResizeHeight > 0) &&
baton->gamma == 0 && baton->topOffsetPre == -1 && baton->trimThreshold == 0.0 &&
baton->colourspaceInput == VIPS_INTERPRETATION_LAST;
baton->colourspaceInput == VIPS_INTERPRETATION_LAST && !shouldRotateBefore;
if (shouldPreShrink) {
// The common part of the shrink: the bit by which both axes must be shrunk