michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put all pixmap constructors in using statements.

Browse Source 
Cleanup extra ImageInfo as well
This commit is contained in:
Erwin de Haan 2019-01-03 19:11:18 +01:00
parent 0a3862ff80
commit 635dd36727
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Emby.Drawing.Skia/SkiaEncoder.cs
View File

@ -556,10 +556,11 @@ namespace Emby.Drawing.Skia
_fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath)); _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath));
using (var outputStream = new SKFileWStream(outputPath)) using (var outputStream = new SKFileWStream(outputPath))
{ {
SKImageInfo imageInfo = new SKImageInfo(width,height); using (var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels()))
var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels()); {
pixmap.Encode(outputStream, skiaOutputFormat, quality); pixmap.Encode(outputStream, skiaOutputFormat, quality);
return outputPath; return outputPath;
}
} }
} }
@ -609,9 +610,10 @@ namespace Emby.Drawing.Skia
_fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath)); _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath));
using (var outputStream = new SKFileWStream(outputPath)) using (var outputStream = new SKFileWStream(outputPath))
{ {
SKImageInfo imageInfo = new SKImageInfo(width, height); using (var pixmap = new SKPixmap(new SKImageInfo(width, height), saveBitmap.GetPixels()))
var pixmap = new SKPixmap(new SKImageInfo(width, height), saveBitmap.GetPixels()); {
pixmap.Encode(outputStream, skiaOutputFormat, quality); pixmap.Encode(outputStream, skiaOutputFormat, quality);
}
} }
} }
} }

14
Emby.Drawing.Skia/StripCollageBuilder.cs
View File

@ -49,9 +49,10 @@ namespace Emby.Drawing.Skia
{ {
using (var outputStream = new SKFileWStream(outputPath)) using (var outputStream = new SKFileWStream(outputPath))
{ {
SKImageInfo imageInfo = new SKImageInfo(width, height); using (var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels()))
var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels()); {
pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90); pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90);
}
} }
} }
} }
@ -62,9 +63,10 @@ namespace Emby.Drawing.Skia
{ {
using (var outputStream = new SKFileWStream(outputPath)) using (var outputStream = new SKFileWStream(outputPath))
{ {
SKImageInfo imageInfo = new SKImageInfo(width, height); using (var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels()))
var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels()); {
pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90); pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90);
}
} }
} }
} }