fix importing unknown image types such as .DWG, closes #2628

zadam · Feb 11, 2022 · 59e8720 · 59e8720
1 parent 40598d2
commit 59e8720
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/services/image.js b/src/services/image.js
@@ -17,18 +17,26 @@ async function processImage(uploadBuffer, originalName, shrinkImageSwitch) {
     const compressImages = optionService.getOptionBool("compressImages");
     const origImageFormat = getImageType(uploadBuffer);
 
-    if (origImageFormat && ["webp", "svg", "gif"].includes(origImageFormat.ext)) {
-        // JIMP does not support webp at the moment: https://github.com/oliver-moran/jimp/issues/144
+    if (!origImageFormat || !["jpg", "png"].includes(origImageFormat.ext)) {
         shrinkImageSwitch = false;
     }
     else if (isAnimated(uploadBuffer)) {
         // recompression of animated images will make them static
         shrinkImageSwitch = false;
     }
 
-    const finalImageBuffer = (compressImages && shrinkImageSwitch) ? await shrinkImage(uploadBuffer, originalName) : uploadBuffer;
-
-    const imageFormat = getImageType(finalImageBuffer);
+    let finalImageBuffer;
+    let imageFormat;
+
+    if (compressImages && shrinkImageSwitch) {
+        finalImageBuffer = await shrinkImage(uploadBuffer, originalName);
+        imageFormat = getImageType(finalImageBuffer);
+    } else {
+        finalImageBuffer = uploadBuffer;
+        imageFormat = origImageFormat || {
+            ext: 'dat'
+        };
+    }
 
     return {
         buffer: finalImageBuffer,
@@ -43,7 +51,9 @@ function getImageType(buffer) {
         }
     }
     else {
-        return imageType(buffer) || "jpg"; // optimistic JPG default
+        return imageType(buffer) || {
+            ext: "jpg"
+        }; // optimistic JPG default
     }
 }