mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-22 05:30:46 +02:00
fix dynamic images for osx
This commit is contained in:
parent
90b9b73912
commit
dc09bb8c08
|
@ -33,7 +33,9 @@ namespace Emby.Drawing.GDI
|
||||||
graphics.SmoothingMode = SmoothingMode.HighQuality;
|
graphics.SmoothingMode = SmoothingMode.HighQuality;
|
||||||
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
|
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
|
||||||
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
|
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
|
||||||
graphics.CompositingMode = CompositingMode.SourceCopy;
|
|
||||||
|
// This causes the image to be blank in OSX
|
||||||
|
//graphics.CompositingMode = CompositingMode.SourceCopy;
|
||||||
|
|
||||||
for (var row = 0; row < rows; row++)
|
for (var row = 0; row < rows; row++)
|
||||||
{
|
{
|
||||||
|
@ -44,19 +46,9 @@ namespace Emby.Drawing.GDI
|
||||||
|
|
||||||
if (files.Count > index)
|
if (files.Count > index)
|
||||||
{
|
{
|
||||||
using (var fileStream = fileSystem.GetFileStream(files[index], FileMode.Open, FileAccess.Read, FileShare.Read, true))
|
using (var imgtemp = Image.FromFile(files[index]))
|
||||||
{
|
{
|
||||||
using (var memoryStream = new MemoryStream())
|
graphics.DrawImage(imgtemp, x, y, cellWidth, cellHeight);
|
||||||
{
|
|
||||||
fileStream.CopyTo(memoryStream);
|
|
||||||
|
|
||||||
memoryStream.Position = 0;
|
|
||||||
|
|
||||||
using (var imgtemp = Image.FromStream(memoryStream, true, false))
|
|
||||||
{
|
|
||||||
graphics.DrawImage(imgtemp, x, y, cellWidth, cellHeight);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,7 +82,9 @@ namespace Emby.Drawing.GDI
|
||||||
graphics.SmoothingMode = SmoothingMode.HighQuality;
|
graphics.SmoothingMode = SmoothingMode.HighQuality;
|
||||||
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
|
graphics.InterpolationMode = InterpolationMode.HighQualityBicubic;
|
||||||
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
|
graphics.PixelOffsetMode = PixelOffsetMode.HighQuality;
|
||||||
graphics.CompositingMode = CompositingMode.SourceCopy;
|
|
||||||
|
// This causes the image to be blank in OSX
|
||||||
|
//graphics.CompositingMode = CompositingMode.SourceCopy;
|
||||||
|
|
||||||
for (var row = 0; row < rows; row++)
|
for (var row = 0; row < rows; row++)
|
||||||
{
|
{
|
||||||
|
@ -99,21 +93,10 @@ namespace Emby.Drawing.GDI
|
||||||
var x = col * singleSize;
|
var x = col * singleSize;
|
||||||
var y = row * singleSize;
|
var y = row * singleSize;
|
||||||
|
|
||||||
using (var fileStream = fileSystem.GetFileStream(files[index], FileMode.Open, FileAccess.Read, FileShare.Read, true))
|
using (var imgtemp = Image.FromFile(files[index]))
|
||||||
{
|
{
|
||||||
using (var memoryStream = new MemoryStream())
|
graphics.DrawImage(imgtemp, x, y, singleSize, singleSize);
|
||||||
{
|
|
||||||
fileStream.CopyTo(memoryStream);
|
|
||||||
|
|
||||||
memoryStream.Position = 0;
|
|
||||||
|
|
||||||
using (var imgtemp = Image.FromStream(memoryStream, true, false))
|
|
||||||
{
|
|
||||||
graphics.DrawImage(imgtemp, x, y, singleSize, singleSize);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -121,16 +104,5 @@ namespace Emby.Drawing.GDI
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static Stream GetStream(Image image)
|
|
||||||
{
|
|
||||||
var ms = new MemoryStream();
|
|
||||||
|
|
||||||
image.Save(ms, ImageFormat.Png);
|
|
||||||
|
|
||||||
ms.Position = 0;
|
|
||||||
|
|
||||||
return ms;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue