Skip to content

Commit

Permalink
Update ImageSharp usages
Browse files Browse the repository at this point in the history
  • Loading branch information
peppy committed Mar 6, 2024
1 parent b53b752 commit 0696e7d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public TextureUpload Get(string name)

private TextureUpload upscale(TextureUpload textureUpload)
{
var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
var image = Image.LoadPixelData(textureUpload.Data, textureUpload.Width, textureUpload.Height);

// The original texture upload will no longer be returned or used.
textureUpload.Dispose();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ private TextureUpload limitTextureUploadSize(TextureUpload textureUpload)
// The original texture upload will no longer be returned or used.
textureUpload.Dispose();

Size size = image.Size();
Size size = image.Size;

// Assume that panel backgrounds are always displayed using `FillMode.Fill`.
// Also assume that all backgrounds are wider than they are tall, so the
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Skinning/LegacyTextureLoaderStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private bool shouldConvertToGrayscale(string name)

private TextureUpload convertToGrayscale(TextureUpload textureUpload)
{
var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
var image = Image.LoadPixelData(textureUpload.Data, textureUpload.Width, textureUpload.Height);

// stable uses `0.299 * r + 0.587 * g + 0.114 * b`
// (https://github.com/peppy/osu-stable-reference/blob/013c3010a9d495e3471a9c59518de17006f9ad89/osu!/Graphics/Textures/pTexture.cs#L138-L153)
Expand Down
2 changes: 1 addition & 1 deletion osu.Game/Skinning/MaxDimensionLimitedTextureLoaderStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private TextureUpload limitTextureUploadSize(TextureUpload textureUpload)

if (textureUpload.Height > max_supported_texture_size || textureUpload.Width > max_supported_texture_size)
{
var image = Image.LoadPixelData(textureUpload.Data.ToArray(), textureUpload.Width, textureUpload.Height);
var image = Image.LoadPixelData(textureUpload.Data, textureUpload.Width, textureUpload.Height);

// The original texture upload will no longer be returned or used.
textureUpload.Dispose();
Expand Down

0 comments on commit 0696e7d

Please sign in to comment.