Temporarily delegate .CR2 images to imagemagick until #530 is fixed.

Webreaper · May 1, 2024 · af4cc8d · af4cc8d
1 parent a6f3fc4
commit af4cc8d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Damselfly.Core.ImageProcessing/ImageMagickProcessor.cs b/Damselfly.Core.ImageProcessing/ImageMagickProcessor.cs
@@ -11,7 +11,7 @@ public class ImageMagickProcessor : IImageProcessor
 
     private const string graphicsMagickExe = "gm";
 
-    private static readonly string[] s_imageExtensions = { ".jpg", ".jpeg", ".png", ".heic", ".tif", ".tiff", ".webp", ".arw", ".cr3" };
+    private static readonly string[] s_imageExtensions = { ".jpg", ".jpeg", ".png", ".heic", ".tif", ".tiff", ".webp", ".arw", ".cr2", ".cr3" };
     private static bool imAvailable;
     private readonly bool s_useGraphicsMagick = false; // GM doesn't support HEIC yet.
     private string verString = "(not found)";

diff --git a/Damselfly.Core.ImageProcessing/SkiaSharpProcessor.cs b/Damselfly.Core.ImageProcessing/SkiaSharpProcessor.cs
@@ -13,8 +13,9 @@ namespace Damselfly.Core.ImageProcessing;
 public class SkiaSharpProcessor : IImageProcessor
 {
     // SkiaSharp doesn't handle .heic files... yet
+    // delegate CR2 files to ImageMagick for now
     private static readonly string[] s_imageExtensions =
-        { ".jpg", ".jpeg", ".png", /*".heic", */".webp", ".bmp", ".dng", ".cr2", ".orf", ".nef" };
+        { ".jpg", ".jpeg", ".png", /*".heic", */".webp", ".bmp", ".dng", /*".cr2",*/ ".orf", ".nef" };
 
     public static ICollection<string> SupportedFileExtensions => s_imageExtensions;