From f49d20033d81e9c2d1a335af603a5e56402014a9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 10 May 2017 00:49:11 -0400 Subject: move crop whitespace directly to encode image --- Emby.Drawing.Net/GDIImageEncoder.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'Emby.Drawing.Net/GDIImageEncoder.cs') diff --git a/Emby.Drawing.Net/GDIImageEncoder.cs b/Emby.Drawing.Net/GDIImageEncoder.cs index 638415afd..e710baaa7 100644 --- a/Emby.Drawing.Net/GDIImageEncoder.cs +++ b/Emby.Drawing.Net/GDIImageEncoder.cs @@ -75,27 +75,24 @@ namespace Emby.Drawing.Net } } - public void CropWhiteSpace(string inputPath, string outputPath) + private Image GetImage(string path, bool cropWhitespace) { - using (var image = (Bitmap)Image.FromFile(inputPath)) + if (cropWhitespace) { - using (var croppedImage = image.CropWhitespace()) + using (var originalImage = (Bitmap)Image.FromFile(path)) { - _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath)); - - using (var outputStream = _fileSystem.GetFileStream(outputPath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, false)) - { - croppedImage.Save(System.Drawing.Imaging.ImageFormat.Png, outputStream, 100); - } + return originalImage.CropWhitespace(); } } + + return Image.FromFile(path); } public void EncodeImage(string inputPath, string cacheFilePath, bool autoOrient, int width, int height, int quality, ImageProcessingOptions options, ImageFormat selectedOutputFormat) { var hasPostProcessing = !string.IsNullOrEmpty(options.BackgroundColor) || options.UnplayedCount.HasValue || options.AddPlayedIndicator || options.PercentPlayed > 0; - using (var originalImage = Image.FromFile(inputPath)) + using (var originalImage = GetImage(inputPath, options.CropWhiteSpace)) { var newWidth = Convert.ToInt32(width); var newHeight = Convert.ToInt32(height); -- cgit v1.2.3