diff --git a/LibreMetaverse/ImportExport/ColladalLoader.cs b/LibreMetaverse/ImportExport/ColladalLoader.cs index 1664b220..25c57ee7 100644 --- a/LibreMetaverse/ImportExport/ColladalLoader.cs +++ b/LibreMetaverse/ImportExport/ColladalLoader.cs @@ -155,10 +155,10 @@ namespace OpenMetaverse.ImportExport Logger.Log("Image has irregular dimensions " + origWidth + "x" + origHieght + ". Resizing to " + width + "x" + height, Helpers.LogLevel.Info); var info = new SKImageInfo(width, height); - var scaledImage = SKImage.Create(info); - var skImage = SKImage.FromBitmap(bitmap); - skImage.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); - bitmap = SKBitmap.FromImage(scaledImage); + var scaledImage = new SKBitmap(info); + bitmap.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); + bitmap.Dispose(); + bitmap = scaledImage; } material.TextureData = J2kImage.ToBytes(J2kImage.CreateEncodableSource(bitmap)); diff --git a/PrimMesher/SculptMap.cs b/PrimMesher/SculptMap.cs index da688f0d..ee6eda31 100644 --- a/PrimMesher/SculptMap.cs +++ b/PrimMesher/SculptMap.cs @@ -165,10 +165,10 @@ namespace LibreMetaverse.PrimMesher private SKBitmap ScaleImage(SKBitmap srcImage, int destWidth, int destHeight) { var info = new SKImageInfo(destWidth, destHeight); - var scaledImage = SKImage.Create(info); - var skImage = SKImage.FromBitmap(srcImage); - skImage.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); - return SKBitmap.FromImage(scaledImage); + var scaledImage = new SKBitmap(info); + srcImage.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); + srcImage.Dispose(); + return scaledImage; } } } \ No newline at end of file diff --git a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs index c7c9f517..359dddfe 100644 --- a/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs +++ b/Programs/examples/TestClient/Commands/Inventory/UploadImageCommand.cs @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2016, openmetaverse.co - * Copyright (c) 2021-2022, Sjofn LLC. + * Copyright (c) 2021-2024, Sjofn LLC. * All rights reserved. * * - Redistribution and use in source and binary forms, with or without @@ -126,11 +126,11 @@ namespace OpenMetaverse.TestClient if (!IsPowerOfTwo((uint)oldwidth) || !IsPowerOfTwo((uint)oldheight)) { var info = new SKImageInfo(256, 256); - var scaledImage = SKImage.Create(info); - var skImage = SKImage.FromBitmap(bitmap); - skImage.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); + var scaledImage = new SKBitmap(info); + bitmap.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); - bitmap = SKBitmap.FromImage(scaledImage); + bitmap.Dispose(); + bitmap = scaledImage; oldwidth = 256; oldheight = 256; @@ -143,11 +143,11 @@ namespace OpenMetaverse.TestClient int newheight = (oldheight > 1024) ? 1024 : oldheight; var info = new SKImageInfo(newwidth, newheight); - var scaledImage = SKImage.Create(info); - var skImage = SKImage.FromBitmap(bitmap); - skImage.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); + var scaledImage = new SKBitmap(info); + bitmap.ScalePixels(scaledImage.PeekPixels(), SKFilterQuality.High); - bitmap = SKBitmap.FromImage(scaledImage); + bitmap.Dispose(); + bitmap = scaledImage; } } uploadData = J2kImage.ToBytes(J2kImage.CreateEncodableSource(bitmap));