Merge pull request #83 from Tichau/feature/new-input-types

Support new raw image input format: cr2.
This commit is contained in:
Adrien Allard authored and GitHub committed 2019-04-27 16:53:49 +02:00
commit 4d5a3e03be
7 files changed
+23 -8

No files matched your search

@@ -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);
}
}
@@ -79,8 +79,8 @@
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
</Reference>
<Reference Include="Magick.NET-Q16-AnyCPU, Version=7.8.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.8.0\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
<Reference Include="Magick.NET-Q16-AnyCPU, Version=7.12.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>..\..\packages\Magick.NET-Q16-AnyCPU.7.12.0\lib\net40\Magick.NET-Q16-AnyCPU.dll</HintPath>
</Reference>
<Reference Include="Markdown.Xaml">
<HintPath>..\..\Middleware\Markdown.Xaml.dll</HintPath>
+1
View File
@@ -156,6 +156,7 @@ namespace FileConverter
case "arw":
case "bmp":
case "cr2":
case "exr":
case "ico":
case "jpg":
@@ -187,6 +187,7 @@
<ConversionPreset Name="To Gif" OutputType="Gif" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -222,6 +223,7 @@
<ConversionPreset Name="To Gif (low quality)" OutputType="Gif" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -439,6 +441,7 @@
<ConversionPreset Name="To Png" OutputType="Png" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -481,6 +484,7 @@
<ConversionPreset Name="To Webp" OutputType="Webp" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -505,6 +509,7 @@
<ConversionPreset Name="To small Png (25%)" OutputType="Png" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -528,6 +533,7 @@
<ConversionPreset Name="To Png (rotate left)" OutputType="Png" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -550,6 +556,7 @@
<ConversionPreset Name="To Png (rotate right)" OutputType="Png" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -572,6 +579,7 @@
<ConversionPreset Name="To Jpg" OutputType="Jpg" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -595,6 +603,7 @@
</ConversionPreset>
<ConversionPreset Name="To Ico" OutputType="Ico" IsDefaultSettings="true">
<InputTypes>bmp</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>ico</InputTypes>
<InputTypes>jpg</InputTypes>
@@ -612,6 +621,7 @@
</ConversionPreset>
<ConversionPreset Name="To Pdf" OutputType="Pdf" IsDefaultSettings="true">
<InputTypes>arw</InputTypes>
<InputTypes>cr2</InputTypes>
<InputTypes>bmp</InputTypes>
<InputTypes>exr</InputTypes>
<InputTypes>jpg</InputTypes>
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net45" />
<package id="Magick.NET-Q16-AnyCPU" version="7.8.0" targetFramework="net45" />
<package id="Magick.NET-Q16-AnyCPU" version="7.12.0" targetFramework="net461" />
<package id="Microsoft.Office.Interop.Excel" version="15.0.4795.1000" targetFramework="net45" />
<package id="Microsoft.Office.Interop.PowerPoint" version="12.0.4518.1014" targetFramework="net45" />
<package id="Microsoft.Office.Interop.Word" version="15.0.4797.1003" targetFramework="net45" />
+2 -2
View File
@@ -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).
+1 -1
View File
@@ -162,7 +162,7 @@
<Component Id="RegistryEntries" Guid="{1862E9DC-1B37-4AFD-85BF-2E9CFFAFA9F8}">
<RegistryKey Root="HKCU" Key="Software\FileConverter" ForceDeleteOnUninstall="yes">
<RegistryValue Name="Path" Type="string" Value="[INSTALLFOLDER]FileConverter.exe"/>
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;arw;avi;bik;bmp;cda;doc;docx;exr;flac;flv;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;odp;ods;odt;oga;ogg;ogv;pdf;png;ppt;pptx;psd;raf;svg;tga;tif;tiff;vob;wav;webm;webp;wma;wmv;xls;xlsx"/>
<RegistryValue Name="CompatibleInputExtensions" Type="string" Value="3gp;aac;aiff;ape;arw;avi;bik;bmp;cda;cr2;doc;docx;exr;flac;flv;gif;ico;jpg;jpeg;m4a;m4v;mkv;mov;mp3;mp4;mpeg;odp;ods;odt;oga;ogg;ogv;pdf;png;ppt;pptx;psd;raf;svg;tga;tif;tiff;vob;wav;webm;webp;wma;wmv;xls;xlsx"/>
</RegistryKey>
</Component>
</ComponentGroup>