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

Fix rotate-then-extract for EXIF orientation 2 (#3218)

Browse Source
This commit is contained in:
jakob0fischl 2022-05-15 13:26:57 +02:00 committed by GitHub
parent 51b4a7c564
commit 54d9dc46f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pipeline.cc
View File

@ -95,16 +95,18 @@ class PipelineWorker : public Napi::AsyncWorker {
if (baton->rotateBeforePreExtract) { if (baton->rotateBeforePreExtract) {
if (rotation != VIPS_ANGLE_D0) { if (rotation != VIPS_ANGLE_D0) {
image = image.rot(rotation); image = image.rot(rotation);
}
if (flip) { if (flip) {
image = image.flip(VIPS_DIRECTION_VERTICAL); image = image.flip(VIPS_DIRECTION_VERTICAL);
flip = FALSE;
} }
if (flop) { if (flop) {
image = image.flip(VIPS_DIRECTION_HORIZONTAL); image = image.flip(VIPS_DIRECTION_HORIZONTAL);
flop = FALSE;
} }
if (rotation != VIPS_ANGLE_D0 || flip || flop) {
image = sharp::RemoveExifOrientation(image); image = sharp::RemoveExifOrientation(image);
} }
flop = FALSE;
flip = FALSE;
if (baton->rotationAngle != 0.0) { if (baton->rotationAngle != 0.0) {
MultiPageUnsupported(nPages, "Rotate"); MultiPageUnsupported(nPages, "Rotate");
std::vector<double> background; std::vector<double> background;

41
test/unit/extract.js
View File

@ -168,8 +168,43 @@ describe('Partial image extraction', function () {
}); });
}); });
it('Rotate with EXIF mirroring then extract', function (done) { describe('Apply exif orientation and mirroring then extract', () => {
sharp(fixtures.inputJpgWithLandscapeExif7) [
{
name: 'EXIF-1',
image: fixtures.inputJpgWithLandscapeExif1
},
{
name: 'EXIF-2',
image: fixtures.inputJpgWithLandscapeExif2
},
{
name: 'EXIF-3',
image: fixtures.inputJpgWithLandscapeExif3
},
{
name: 'EXIF-4',
image: fixtures.inputJpgWithLandscapeExif4
},
{
name: 'EXIF-5',
image: fixtures.inputJpgWithLandscapeExif5
},
{
name: 'EXIF-6',
image: fixtures.inputJpgWithLandscapeExif6
},
{
name: 'EXIF-7',
image: fixtures.inputJpgWithLandscapeExif7
},
{
name: 'EXIF-8',
image: fixtures.inputJpgWithLandscapeExif8
}
].forEach(({ name, image }) => {
it(name, function (done) {
sharp(image)
.rotate() .rotate()
.extract({ left: 0, top: 208, width: 60, height: 40 }) .extract({ left: 0, top: 208, width: 60, height: 40 })
.toBuffer(function (err, data) { .toBuffer(function (err, data) {
@ -177,6 +212,8 @@ describe('Partial image extraction', function () {
fixtures.assertSimilar(fixtures.expected('rotate-mirror-extract.jpg'), data, done); fixtures.assertSimilar(fixtures.expected('rotate-mirror-extract.jpg'), data, done);
}); });
}); });
});
});
describe('Invalid parameters', function () { describe('Invalid parameters', function () {
describe('using the legacy extract(top,left,width,height) syntax', function () { describe('using the legacy extract(top,left,width,height) syntax', function () {