Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-11 05:52:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

[GcodeThumbnails]Return 32 bit ARGB image (#29802)

Browse Source
This commit is contained in:
Pedro Lamas
2023-11-13 16:04:05 +00:00
committed by GitHub
parent ba76bfe04e
commit 22000228e2
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.cs
View File

@@ -2,6 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license. // The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information. // See the LICENSE file in the project root for more information.
using System.Drawing.Drawing2D; using System.Drawing.Drawing2D;
using System.Drawing.Imaging;
using Common.Utilities; using Common.Utilities;
namespace Microsoft.PowerToys.ThumbnailHandler.Gcode namespace Microsoft.PowerToys.ThumbnailHandler.Gcode
@@ -47,9 +48,20 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Gcode
var gcodeThumbnail = GcodeHelper.GetBestThumbnail(reader); var gcodeThumbnail = GcodeHelper.GetBestThumbnail(reader);
var thumbnail = gcodeThumbnail?.GetBitmap(); Bitmap thumbnail = null;
if (thumbnail != null && thumbnail.Width != cx && thumbnail.Height != cx) try
{
thumbnail = gcodeThumbnail?.GetBitmap();
}
catch (Exception)
{
// TODO: add logger
}
if (thumbnail != null && (
((thumbnail.Width != cx || thumbnail.Height > cx) && (thumbnail.Height != cx || thumbnail.Width > cx)) ||
thumbnail.PixelFormat != PixelFormat.Format32bppArgb))
{ {
// We are not the appropriate size for caller. Resize now while // We are not the appropriate size for caller. Resize now while
// respecting the aspect ratio. // respecting the aspect ratio.
@@ -80,7 +92,7 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Gcode
return null; return null;
} }
Bitmap destImage = new Bitmap(width, height); Bitmap destImage = new Bitmap(width, height, PixelFormat.Format32bppArgb);
destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution); destImage.SetResolution(image.HorizontalResolution, image.VerticalResolution);
@@ -95,6 +107,8 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Gcode
graphics.DrawImage(image, 0, 0, width, height); graphics.DrawImage(image, 0, 0, width, height);
} }
image.Dispose();
return destImage; return destImage;
} }