diff --git a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
index 92cca53..7da5d53 100644
--- a/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
+++ b/Application/FileConverter/ConversionJobs/ConversionJob_ImageMagick.cs
@@ -71,10 +71,14 @@ namespace FileConverter.ConversionJobs
else
{
this.pageCount = 1;
- using (MagickImage image = new MagickImage(this.InputFilePath))
+ MagickReadSettings readSettings = new MagickReadSettings
+ {
+ Format = MagickFormat.Cr2
+ };
+
+ using (MagickImage image = new MagickImage(this.InputFilePath, readSettings))
{
Debug.Log("Load image {0} succeed.", this.InputFilePath);
-
this.ConvertImage(image);
}
}
diff --git a/Application/FileConverter/FileConverter.csproj b/Application/FileConverter/FileConverter.csproj
index f4ffecf..b201df0 100644
--- a/Application/FileConverter/FileConverter.csproj
+++ b/Application/FileConverter/FileConverter.csproj
@@ -79,8 +79,8 @@
..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll
-
- ..\..\packages\Magick.NET-Q16-AnyCPU.7.8.0\lib\net40\Magick.NET-Q16-AnyCPU.dll
+
+ ..\..\packages\Magick.NET-Q16-AnyCPU.7.12.0\lib\net40\Magick.NET-Q16-AnyCPU.dll
..\..\Middleware\Markdown.Xaml.dll
diff --git a/Application/FileConverter/Helpers.cs b/Application/FileConverter/Helpers.cs
index 89be138..8943938 100644
--- a/Application/FileConverter/Helpers.cs
+++ b/Application/FileConverter/Helpers.cs
@@ -156,6 +156,7 @@ namespace FileConverter
case "arw":
case "bmp":
+ case "cr2":
case "exr":
case "ico":
case "jpg":
diff --git a/Application/FileConverter/Settings.default.xml b/Application/FileConverter/Settings.default.xml
index 512bc0f..95aefde 100644
--- a/Application/FileConverter/Settings.default.xml
+++ b/Application/FileConverter/Settings.default.xml
@@ -187,6 +187,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -222,6 +223,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -439,6 +441,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -481,6 +484,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -505,6 +509,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -528,6 +533,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -550,6 +556,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -572,6 +579,7 @@
arw
bmp
+ cr2
exr
ico
jpg
@@ -595,6 +603,7 @@
bmp
+ cr2
exr
ico
jpg
@@ -612,6 +621,7 @@
arw
+ cr2
bmp
exr
jpg
diff --git a/Application/FileConverter/packages.config b/Application/FileConverter/packages.config
index 7023713..cdb731c 100644
--- a/Application/FileConverter/packages.config
+++ b/Application/FileConverter/packages.config
@@ -1,7 +1,7 @@
-
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b5376a..ffb4b5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
- Added: Brazilian Portuguese translation (thanks to Marhc).
- Added: Spanish translation (thanks to Chachak).
- Added: Italian translation (thanks to Davide).
-- Added: Support new raw image input formats: arw and raf.
+- Added: Support new raw image input formats: arw, raf and cr2.
- Added: Possibility to create preset folders in File Converter context menu.
- Added: Display conversion progress on the Windows taskbar item.
- Added: Display estimated remaining time for each jobs.
@@ -20,7 +20,7 @@
- Fixed: Issue where output video was not working correclty on some video players like Quick time (github issue #34) (thanks to Diego López Bugna).
- Fixed: Issue where icons and images were blurry on high dpi device.
- Tech: Complete rework of the project architecture to be able to improve it in a long term perspective. The project is now using the MVVM Light framework and is following more closely this design pattern.
-- Tech: Update ffmpeg to v4.0.0 and ImageMagick to v7.8.0.
+- Tech: Update ffmpeg to v4.0.0 and ImageMagick to v7.12.0.
- Tech: Update SharpShell to v2.7.1.
- Tech: Update project to Visual Studio 2017 and installer Wix 3.11.
- Tech: Update project to .NET framework 4.6.1 (the last .NET version compatible with Windows Vista).
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index 8f8a990..aae648e 100644
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -162,7 +162,7 @@
-
+