@gallop.software/studio 2.3.98 → 2.3.99

package/dist/server/index.js

@@ -4484,49 +4484,33 @@ async function handleEditImage(request) {
     const exifMeta = await sharp7(exifCorrectedBuffer).metadata();
     const exifWidth = exifMeta.width || 0;
     const exifHeight = exifMeta.height || 0;
-    let rotatedBuffer;
-    let rotatedWidth;
-    let rotatedHeight;
-    if (rotation !== 0) {
-      rotatedBuffer = await sharp7(exifCorrectedBuffer).rotate(rotation).toBuffer();
-      if (rotation === 90 || rotation === 270) {
-        rotatedWidth = exifHeight;
-        rotatedHeight = exifWidth;
-      } else {
-        rotatedWidth = exifWidth;
-        rotatedHeight = exifHeight;
-      }
-    } else {
-      rotatedBuffer = exifCorrectedBuffer;
-      rotatedWidth = exifWidth;
-      rotatedHeight = exifHeight;
-    }
-    const cropX = Math.max(0, Math.min(crop.x, rotatedWidth - 1));
-    const cropY = Math.max(0, Math.min(crop.y, rotatedHeight - 1));
-    const cropWidth = Math.min(crop.width, rotatedWidth - cropX);
-    const cropHeight = Math.min(crop.height, rotatedHeight - cropY);
-    let croppedPipeline = sharp7(rotatedBuffer);
-    if (cropX > 0 || cropY > 0 || cropWidth < rotatedWidth || cropHeight < rotatedHeight) {
-      croppedPipeline = croppedPipeline.extract({
+    const cropX = Math.max(0, Math.min(crop.x, exifWidth - 1));
+    const cropY = Math.max(0, Math.min(crop.y, exifHeight - 1));
+    const cropWidth = Math.min(crop.width, exifWidth - cropX);
+    const cropHeight = Math.min(crop.height, exifHeight - cropY);
+    let pipeline = sharp7(exifCorrectedBuffer);
+    if (cropX > 0 || cropY > 0 || cropWidth < exifWidth || cropHeight < exifHeight) {
+      pipeline = pipeline.extract({
         left: Math.round(cropX),
         top: Math.round(cropY),
         width: Math.round(cropWidth),
         height: Math.round(cropHeight)
       });
     }
-    if (resize.width !== cropWidth || resize.height !== cropHeight) {
-      croppedPipeline = croppedPipeline.resize(resize.width, resize.height);
+    if (rotation !== 0) {
+      pipeline = pipeline.rotate(rotation);
     }
+    pipeline = pipeline.resize(resize.width, resize.height);
     const ext = path10.extname(imagePath).toLowerCase();
     let finalBuffer;
     if (ext === ".png") {
-      finalBuffer = await croppedPipeline.png({ quality: 85 }).toBuffer();
+      finalBuffer = await pipeline.png({ quality: 85 }).toBuffer();
     } else if (ext === ".webp") {
-      finalBuffer = await croppedPipeline.webp({ quality: 85 }).toBuffer();
+      finalBuffer = await pipeline.webp({ quality: 85 }).toBuffer();
     } else if (ext === ".gif") {
-      finalBuffer = await croppedPipeline.gif().toBuffer();
+      finalBuffer = await pipeline.gif().toBuffer();
     } else {
-      finalBuffer = await croppedPipeline.jpeg({ quality: 85 }).toBuffer();
+      finalBuffer = await pipeline.jpeg({ quality: 85 }).toBuffer();
     }
     const finalMeta = await sharp7(finalBuffer).metadata();
     const finalWidth = finalMeta.width || resize.width;