Merge branch 'RTnhN-GifToImg' into integration
This commit is contained in:
commit
65f35f86af
@ -43,8 +43,9 @@ namespace FileConverter.ConversionJobs
|
||||
return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
||||
if (Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Image ||
|
||||
Helpers.GetExtensionCategory(inputFileExtension) == Helpers.InputCategoryNames.Document)
|
||||
if (conversionPreset.OutputType == OutputType.Jpg ||
|
||||
conversionPreset.OutputType == OutputType.Png ||
|
||||
conversionPreset.OutputType == OutputType.Webp)
|
||||
{
|
||||
return new ConversionJob_ImageMagick(conversionPreset, inputFilePath);
|
||||
}
|
||||
|
@ -86,6 +86,12 @@ namespace FileConverter.ConversionJobs
|
||||
readSettings.Format = MagickFormat.Dng;
|
||||
break;
|
||||
|
||||
case ".gif":
|
||||
// Get the first frame of the gif for conversion.
|
||||
// Maybe in the future make this user selectable.
|
||||
readSettings.FrameIndex = 0;
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -216,7 +216,7 @@ namespace FileConverter
|
||||
case OutputType.Jpg:
|
||||
case OutputType.Png:
|
||||
case OutputType.Webp:
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Document;
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Document || category == InputCategoryNames.AnimatedImage;
|
||||
|
||||
case OutputType.Gif:
|
||||
return category == InputCategoryNames.Image || category == InputCategoryNames.Video || category == InputCategoryNames.AnimatedImage;
|
||||
|
@ -3,6 +3,7 @@
|
||||
## Next Version
|
||||
|
||||
- New: Option to use NVidia hardware acceleration for mp4 video (thanks to tacheometry).
|
||||
- New: Add Gif to Image conversion support (issue #433, #115) (thanks to RTnhN)
|
||||
- New: Persian translation (thanks to MrHero118 and Mehrdad32).
|
||||
- New: Serbian translation (thanks to crnobog69).
|
||||
- New: Japanese translation (thanks to oogamiyuta).
|
||||
|
Loading…
x
Reference in New Issue
Block a user