Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-22 05:30:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-12 14:28:43 -05:00
parent ccc7f5da71
commit e71d02e8b1
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Emby.Drawing/GDI/GDIImageEncoder.cs
View file

@ -32,7 +32,7 @@ namespace Emby.Drawing.GDI
{ {
using (var img = Image.FromStream(stream)) using (var img = Image.FromStream(stream))
{ {
} }
} }
_logger.Info("GDIImageEncoder started"); _logger.Info("GDIImageEncoder started");
@ -79,13 +79,13 @@ namespace Emby.Drawing.GDI
{ {
using (var croppedImage = image.CropWhitespace()) using (var croppedImage = image.CropWhitespace())
{ {
_fileSystem.CreateDirectory(Path.GetDirectoryName(outputPath)); _fileSystem.CreateDirectory(Path.GetDirectoryName(outputPath));
using (var outputStream = _fileSystem.GetFileStream(outputPath, FileMode.Create, FileAccess.Write, FileShare.Read, false)) using (var outputStream = _fileSystem.GetFileStream(outputPath, FileMode.Create, FileAccess.Write, FileShare.Read, false))
{ {
croppedImage.Save(System.Drawing.Imaging.ImageFormat.Png, outputStream, 100); croppedImage.Save(System.Drawing.Imaging.ImageFormat.Png, outputStream, 100);
} }
} }
} }
} }
@ -131,7 +131,7 @@ namespace Emby.Drawing.GDI
var outputFormat = GetOutputFormat(originalImage, selectedOutputFormat); var outputFormat = GetOutputFormat(originalImage, selectedOutputFormat);
_fileSystem.CreateDirectory(Path.GetDirectoryName(cacheFilePath)); _fileSystem.CreateDirectory(Path.GetDirectoryName(cacheFilePath));
// Save to the cache location // Save to the cache location
using (var cacheFileStream = _fileSystem.GetFileStream(cacheFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, false)) using (var cacheFileStream = _fileSystem.GetFileStream(cacheFilePath, FileMode.Create, FileAccess.Write, FileShare.Read, false))