minor image colour tweaking

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/APngProvider.cs

@@ -27,21 +27,21 @@ using System.Windows.Media.Imaging;
 using LibAPNG;
 using QuickLook.Common.ExtensionMethods;
 
-namespace QuickLook.Plugin.ImageViewer.AnimatedImage
+namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
-    internal class APngAnimationProvider : AnimationProvider
+    internal class APngProvider : AnimationProvider
     {
         private readonly Frame _baseFrame;
         private readonly List<FrameInfo> _frames;
         private readonly List<BitmapSource> _renderedFrames;
         private int _lastEffectivePreviousPreviousFrameIndex;
-        private NativeImageProvider _nativeImageProvider;
+        private NativeProvider _nativeImageProvider;
 
-        public APngAnimationProvider(string path, MetaProvider meta) : base(path, meta)
+        public APngProvider(string path, MetaProvider meta) : base(path, meta)
         {
             if (!IsAnimatedPng(path))
             {
-                _nativeImageProvider = new NativeImageProvider(path, meta);
+                _nativeImageProvider = new NativeProvider(path, meta);
                 Animator = _nativeImageProvider.Animator;
                 return;
             }

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/DcrawProvider.cs

@@ -0,0 +1,29 @@
+// Copyright © 2020 Paddy Xu
+// 
+// This file is part of QuickLook program.
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+using System;
+
+namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
+{
+    internal class DcrawProvider : NativeProvider
+    {
+        public DcrawProvider(string path, MetaProvider meta) : base(path, meta)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/GifProvider.cs

@@ -24,15 +24,15 @@ using QuickLook.Common.ExtensionMethods;
 using QuickLook.Common.Helpers;
 using Size = System.Windows.Size;
 
-namespace QuickLook.Plugin.ImageViewer.AnimatedImage
+namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
-    internal class GifAnimationProvider : AnimationProvider
+    internal class GifProvider : AnimationProvider
     {
         private Bitmap _fileHandle;
         private BitmapSource _frame;
         private bool _isPlaying;
 
-        public GifAnimationProvider(string path, MetaProvider meta) : base(path, meta)
+        public GifProvider(string path, MetaProvider meta) : base(path, meta)
         {
             _fileHandle = (Bitmap) Image.FromFile(path);
 

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/ImageMagickProvider.cs

@@ -23,9 +23,10 @@ using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using ImageMagick;
+using ImageMagick.Formats.Dng;
 using QuickLook.Common.Helpers;
 
-namespace QuickLook.Plugin.ImageViewer.AnimatedImage
+namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
     internal class ImageMagickProvider : AnimationProvider
     {
@@ -80,9 +81,19 @@ namespace QuickLook.Plugin.ImageViewer.AnimatedImage
 
             return new Task<BitmapSource>(() =>
             {
+                var settings = new MagickReadSettings
+                {
+                    Defines = new DngReadDefines
+                    {
+                        OutputColor = DngOutputColor.SRGB,
+                        UseCameraWhitebalance = true,
+                        DisableAutoBrightness = false
+                    }
+                };
+
                 try
                 {
-                    using (var mi = new MagickImage(Path))
+                    using (var mi = new MagickImage(Path, settings))
                     {
                         var profile = mi.GetColorProfile();
                         if (profile?.Description != null && !profile.Description.Contains("sRGB"))

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/AnimatedImage/Providers/NativeProvider.cs

@@ -23,11 +23,11 @@ using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
 using QuickLook.Common.Helpers;
 
-namespace QuickLook.Plugin.ImageViewer.AnimatedImage
+namespace QuickLook.Plugin.ImageViewer.AnimatedImage.Providers
 {
-    internal class NativeImageProvider : AnimationProvider
+    internal class NativeProvider : AnimationProvider
     {
-        public NativeImageProvider(string path, MetaProvider meta) : base(path, meta)
+        public NativeProvider(string path, MetaProvider meta) : base(path, meta)
         {
             Animator = new Int32AnimationUsingKeyFrames();
             Animator.KeyFrames.Add(new DiscreteInt32KeyFrame(0,

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/Plugin.cs

@@ -22,7 +22,7 @@ using System.Linq;
 using System.Windows;
 using QuickLook.Common.Helpers;
 using QuickLook.Common.Plugin;
-using QuickLook.Plugin.ImageViewer.AnimatedImage;
+using QuickLook.Plugin.ImageViewer.AnimatedImage.Providers;
 
 namespace QuickLook.Plugin.ImageViewer
 {
@@ -49,13 +49,13 @@ namespace QuickLook.Plugin.ImageViewer
         {
             AnimatedImage.AnimatedImage.Providers.Add(
                 new KeyValuePair<string[], Type>(new[] {".apng", ".png"},
-                    typeof(APngAnimationProvider)));
+                    typeof(APngProvider)));
             AnimatedImage.AnimatedImage.Providers.Add(
                 new KeyValuePair<string[], Type>(new[] {".gif"},
-                    typeof(GifAnimationProvider)));
+                    typeof(GifProvider)));
             AnimatedImage.AnimatedImage.Providers.Add(
                 new KeyValuePair<string[], Type>(new[] {".bmp", ".jpg", ".jpeg", ".tif", ".tiff"},
-                    typeof(NativeImageProvider)));
+                    typeof(NativeProvider)));
             AnimatedImage.AnimatedImage.Providers.Add(
                 new KeyValuePair<string[], Type>(new[] {"*"},
                     typeof(ImageMagickProvider)));

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/QuickLook.Plugin.ImageViewer.csproj

@@ -62,8 +62,8 @@
     <Reference Include="LibAPNG">
       <HintPath>.\LibAPNG.dll</HintPath>
     </Reference>
-    <Reference Include="Magick.NET-Q8-AnyCPU, Version=7.16.1.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+    <Reference Include="Magick.NET-Q8-AnyCPU, Version=7.17.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q8-AnyCPU.7.16.1\lib\net40\Magick.NET-Q8-AnyCPU.dll</HintPath>
+      <HintPath>..\..\packages\Magick.NET-Q8-AnyCPU.7.17.0\lib\net40\Magick.NET-Q8-AnyCPU.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
@@ -82,12 +82,13 @@
       <Link>Properties\GitVersion.cs</Link>
     </Compile>
     <Compile Include="AnimatedImage\AnimatedImage.cs" />
-    <Compile Include="AnimatedImage\APngAnimationProvider.cs" />
+    <Compile Include="AnimatedImage\Providers\APngProvider.cs" />
-    <Compile Include="AnimatedImage\GifAnimationProvider.cs" />
+    <Compile Include="AnimatedImage\Providers\DcrawProvider.cs" />
+    <Compile Include="AnimatedImage\Providers\GifProvider.cs" />
     <Compile Include="AnimatedImage\AnimationProvider.cs" />
     <Compile Include="Helper.cs" />
-    <Compile Include="AnimatedImage\ImageMagickProvider.cs" />
+    <Compile Include="AnimatedImage\Providers\ImageMagickProvider.cs" />
-    <Compile Include="AnimatedImage\NativeImageProvider.cs" />
+    <Compile Include="AnimatedImage\Providers\NativeProvider.cs" />
     <Compile Include="ImagePanel.xaml.cs">
       <DependentUpon>ImagePanel.xaml</DependentUpon>
     </Compile>
@@ -123,5 +124,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

QuickLook.Plugin/QuickLook.Plugin.ImageViewer/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <packages>
-  <package id="Magick.NET-Q8-AnyCPU" version="7.16.1" targetFramework="net462" />
+  <package id="Magick.NET-Q8-AnyCPU" version="7.17.0" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>