Merge pull request #143 from tingxin/fix_watermark_bug

wchaws · web-flow · commit 9830f69455f1 · 2022-09-29T21:58:30.000+08:00
fix bug:correct image width&amp;height when image orientation bigger than 5
diff --git a/source/new-image-handler/src/processor/image/watermark.ts b/source/new-image-handler/src/processor/image/watermark.ts
@@ -527,8 +527,7 @@ export class WatermarkAction extends BaseImageAction {
 function withNormalSize(metadata: sharp.Metadata): sharp.Metadata {
   const o = Object.assign({}, metadata);
   if ((metadata.orientation || 0) >= 5) {
-    o.width = o.height;
-    o.height = o.width;
+    [o.width, o.height] = [o.height, o.width];
   }
   return o;
 }

Original file line number	Diff line number	Diff line change
`@@ -527,8 +527,7 @@ export class WatermarkAction extends BaseImageAction {`
`527`	`527`	`function withNormalSize(metadata: sharp.Metadata): sharp.Metadata {`
`528`	`528`	`const o = Object.assign({}, metadata);`
`529`	`529`	`if ((metadata.orientation \|\| 0) >= 5) {`
`530`		`- o.width = o.height;`
`531`		`- o.height = o.width;`
	`530`	`+ [o.width, o.height] = [o.height, o.width];`
`532`	`531`	`}`
`533`	`532`	`return o;`
`534`	`533`	`}`