Merge pull request #348 from d2phap/develop

Develop v5.1

Author: d2phap

Setup/Languages/Korean.iglang

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "ImageGlass"
-#define MyAppVersion "5.0.5.7"
+#define MyAppVersion "5.1.5.20"
 #define MyAppPublisher "Duong Dieu Phap"
 #define MyAppURL "http://www.imageglass.org"
 #define MyAppExeName "ImageGlass.exe"

Setup/Languages/Slovenian.iglang

@@ -1,6 +1,8 @@
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
+//using System.Windows;
+using System.Windows.Media.Imaging;
 
 namespace ImageGlass.Core
 {
@@ -79,5 +81,25 @@ public static int Max(params int[] values)
             }
             return ret;
         }
+
+
+        /// <summary>
+        /// Convert BitmapSource to Bitmap
+        /// </summary>
+        /// <param name="bitmapsource"></param>
+        /// <returns></returns>
+        public static Bitmap BitmapFromSource(BitmapSource bitmapsource)
+        {
+            Bitmap bitmap;
+            using (System.IO.MemoryStream outStream = new System.IO.MemoryStream())
+            {
+                BitmapEncoder enc = new BmpBitmapEncoder();
+
+                enc.Frames.Add(BitmapFrame.Create(bitmapsource));
+                enc.Save(outStream);
+                bitmap = new Bitmap(outStream);
+            }
+            return bitmap;
+        }
     }
 }

Setup/Languages/Swedish.iglang

@@ -81,8 +81,8 @@
     <Reference Include="IconLib, Version=0.73.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\IconLib.Unofficial.0.73.0\lib\net20\IconLib.dll</HintPath>
     </Reference>
-    <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.4.4.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.4.4\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
+    <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.4.5.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.4.5\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

Setup/setup.iss

@@ -73,6 +73,20 @@ void GetBitmapFromFile()
                 }
 
 
+                //using (var magicColl = new MagickImageCollection())
+                //{
+                //    magicColl.Read(new FileInfo(path), settings);
+
+                //    if (magicColl.Count > 0)
+                //    {
+                //        magicColl[0].Quality = 100;
+                //        magicColl[0].AddProfile(ColorProfile.SRGB);
+
+                //        bmp = BitmapBooster.BitmapFromSource(magicColl[0].ToBitmapSource());
+                //    }
+                //}
+
+
                 using (var magicImg = new MagickImage(path, settings))
                 {
                     magicImg.Quality = 100;
@@ -101,7 +115,22 @@ void GetBitmapFromFile()
                     //corect the image color
                     magicImg.AddProfile(ColorProfile.SRGB);
 
-                    bmp = magicImg.ToBitmap();
+                    if (ext.CompareTo(".heic") == 0)
+                    {
+                        // NOTE: ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                        // There is a bug with Magick.NET v7.4.5 
+                        // that ToBitmap() function will return wrong colorspace:
+                        // https://github.com/dlemstra/Magick.NET/issues/153#issuecomment-388080405
+                        // ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+                        // Hence, we need to export to BitmapSource then convert to Bitmap again
+                        bmp = BitmapBooster.BitmapFromSource(magicImg.ToBitmapSource());
+                    }
+                    else
+                    {
+                        bmp = magicImg.ToBitmap();
+                    }
+
+                        
                 }
             }
 

Source/Components/ImageGlass.Core/BitmapBooster.cs

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="IconLib.Unofficial" version="0.73.0" targetFramework="net471" />
-  <package id="Magick.NET-Q16-AnyCPU" version="7.4.4" targetFramework="net471" />
+  <package id="Magick.NET-Q16-AnyCPU" version="7.4.5" targetFramework="net471" />
 </packages>

Source/Components/ImageGlass.Core/ImageGlass.Core.csproj

@@ -78,8 +78,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.4.4.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.4.4\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
+    <Reference Include="Magick.NET-Q16-AnyCPU, Version=7.4.5.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.4.5\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore">
       <RequiredTargetFramework>3.0</RequiredTargetFramework>

Source/Components/ImageGlass.Core/Interpreter.cs

@@ -281,7 +281,14 @@ internal static Image GetThumbnailBmp(string filename, Size size, UseEmbeddedThu
                     // Revert to source image if an embedded thumbnail of required size was not found.
                     if (source == null)
                     {
-                        source = magicImg.ToBitmap();
+                        if (ext.CompareTo(".heic") == 0)
+                        {
+                            source = Core.BitmapBooster.BitmapFromSource(magicImg.ToBitmapSource());
+                        }
+                        else
+                        {
+                            source = magicImg.ToBitmap();
+                        }
                     }
 
                 }//END using MagickImage