fix: error when disable one of rotatable and scalable options

fix fengyuanchen#241
polydice · Oct 19, 2017 · bdbc456 · bdbc456
1 parent 4da21d1
commit bdbc456
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/js/render.js b/src/js/render.js
@@ -214,9 +214,9 @@ export default {
 
     if (transformed) {
       const { width: naturalWidth, height: naturalHeight } = getRotatedSizes({
-        width: imageData.naturalWidth * Math.abs(imageData.scaleX),
-        height: imageData.naturalHeight * Math.abs(imageData.scaleY),
-        degree: imageData.rotate,
+        width: imageData.naturalWidth * Math.abs(imageData.scaleX || 1),
+        height: imageData.naturalHeight * Math.abs(imageData.scaleY || 1),
+        degree: imageData.rotate || 0,
       });
       const width = canvasData.width * (naturalWidth / canvasData.naturalWidth);
       const height = canvasData.height * (naturalHeight / canvasData.naturalHeight);

diff --git a/src/js/utilities.js b/src/js/utilities.js
@@ -709,9 +709,9 @@ export function getSourceCanvas(
   {
     naturalWidth: imageNaturalWidth,
     naturalHeight: imageNaturalHeight,
-    rotate,
-    scaleX,
-    scaleY,
+    rotate = 0,
+    scaleX = 1,
+    scaleY = 1,
   },
   {
     aspectRatio,