From 58d9e0fef76ccdb49b3fef0afda4c790cbab20ae Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 11 Nov 2015 22:34:30 +0000 Subject: [PATCH] Pre-extract rotate should not swap width/height #296 --- src/pipeline.cc | 2 +- test/fixtures/expected/extract-rotate.jpg | Bin 1056 -> 5340 bytes test/fixtures/expected/rotate-extract.jpg | Bin 1627 -> 5383 bytes test/unit/extract.js | 16 ++++++++-------- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pipeline.cc b/src/pipeline.cc index 82212675..26a493eb 100755 --- a/src/pipeline.cc +++ b/src/pipeline.cc @@ -285,7 +285,7 @@ class PipelineWorker : public AsyncWorker { // Get pre-resize image width and height int inputWidth = image->Xsize; int inputHeight = image->Ysize; - if (rotation == Angle::D90 || rotation == Angle::D270) { + if (!baton->rotateBeforePreExtract && (rotation == Angle::D90 || rotation == Angle::D270)) { // Swap input output width and height when rotating by 90 or 270 degrees int swap = inputWidth; inputWidth = inputHeight; diff --git a/test/fixtures/expected/extract-rotate.jpg b/test/fixtures/expected/extract-rotate.jpg index 9ad6d34b4a4b7a0c4fda5361fbaad9dfdbeaf48f..ecd6e78a1796608bd9e3547b7d731be9ddb75900 100644 GIT binary patch literal 5340 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 delta 1482 zcmV;*1vUDID%%W@qkjNo0AvFJA^-vr0Rs^M|HJ?r000650RaI3000000000000RU7 z0tEpE2mizXEf4?#0s#a81OWpB1poj50003301*QO5+N~B1rs7cVIwke1{6XwLsEf} z|HJ?p0RaI40RaI3000000000000RO600ag9!~hx*0RaI40e=Aj000000000000033 zF%cm_|Jncy0|5X65d#qbKLGgFnC@(5`4dgtW5&c0f6PbHwys5H90{lDZGh#x1A?|k zo+r-p>+146=3K`fP2Jtb{VuXK^=2m6&Q)qtK>q;bchk_}LFQFVAJknHl|eNvp`hx^ z%|vwvcBAFdntxuNr9%)$Q0nDhE_{iQ6*c!IoQmw{llLi^zClR*+?kz!wIGj_l`W)F z*u{}Vn=y8_bH^7~8^#Lh!k&Z^ZB#2qcXL?I`6jHf{{R`FyN(j;L|2KJkNU1!`7=cr z;?ixt8eB~YG4XtJB%#Sv0g_*c^)$QyM-W=ftTOOu)PF93frNX5n4Ysb`-X?#+{r$= z*D&VEe%Rx86IdWxuiPt{m@+PQ#t|u$**<30H4JPD8)sJKm8^AUT3?Vo$MgggZ!sK7 z4!>jarf8-yiQj^Y^h}DNvWG8Z^(mXS*2zgZ;-aL1+bhf zTk=FJwSVdOC8-E< zk_~<&mCLoVHTjYx82H$}5=Yn6$jTQcW(3ij8Zri%$C1U%9YO)9H{JQ0o~K82qua^_ z-{x;NO^An{e>2Zw=nyE)2h;$V!*kTlD>vfqq<>}Hor5%U>Q^R_QHRZb{KT>lM)W=< zbJ@l@<`pCn6;4sJg%aAFrz;|k2<~@FUf<>i89x62D0cafxN6U|7P#{RsdgCJ`KbHg z&iFycjhR5c1kKcja;i;VVr*pvSONf@E`879SYfPy_z-zW-*F-+4nbl-k};106}GTU zk$*fGI-*kz4(el*za@}+n)>##2po#JnxtmcAMpo*CFhB^(@H56iEP9%Rk(D(0tz6n z^EjGepFYsRd|Zq5aK@kZsJn#JZ3H!s;sZ{tk0!!FEB6bODI9=I9TE+UorZ@VWid0| zHB@1JwbLEMgIqylVoBq#vm&jnr1jII(|^7t#0xO)x|sR09J-R{v&JD7p2yr@N-2W@a{mAa`hQ5wibprxvX{!|VSgc~ zaUg6iNuw9SeX`E3cdsM)hvB17MP&(Z+zm@?X3j_CO6Z=!FWKbOa~mm9U(Op3#eN@NH{NfS{{SnwmFhScKHKl?&3|1xjf>~*2iCC>wiMgU@ly3&#S1o_#$TT&Qe;_J7j#8FIfB zDmw0Pe6(z=Kq`8adJ48Vhg7~{wFgJ?BIQ(yU$|GTmDdnL&O{wfO&1o^$3`1i%E+O| zADF%{tEm^?m|s+T#5UJaustyKI0wAj7}S!jl(D%Z2&Shae0rTj`e=U4l1scEdTG~k znr+3*#eBLDyZ diff --git a/test/unit/extract.js b/test/unit/extract.js index 9a1f2f79..4497e048 100755 --- a/test/unit/extract.js +++ b/test/unit/extract.js @@ -96,25 +96,25 @@ describe('Partial image extraction', function() { }); it('Extract then rotate', function(done) { - sharp(fixtures.inputJpg) - .extract(10, 10, 100, 100) + sharp(fixtures.inputPngWithGreyAlpha) + .extract(10, 20, 380, 280) .rotate(90) .toBuffer(function(err, data, info) { if (err) throw err; - assert.strictEqual(100, info.width); - assert.strictEqual(100, info.height); + assert.strictEqual(280, info.width); + assert.strictEqual(380, info.height); fixtures.assertSimilar(fixtures.expected('extract-rotate.jpg'), data, done); }); }); it('Rotate then extract', function(done) { - sharp(fixtures.inputJpg) + sharp(fixtures.inputPngWithGreyAlpha) .rotate(90) - .extract(10, 10, 100, 100) + .extract(10, 20, 280, 380) .toBuffer(function(err, data, info) { if (err) throw err; - assert.strictEqual(100, info.width); - assert.strictEqual(100, info.height); + assert.strictEqual(280, info.width); + assert.strictEqual(380, info.height); fixtures.assertSimilar(fixtures.expected('rotate-extract.jpg'), data, done); }); });