From 2caec59a52c21a62d4edd29d19ef1053d549a524 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 19 Jun 2017 19:50:28 +0300 Subject: [PATCH] Avoid checking pixels if it is not 32 bpp already --- ShareX.HelpersLib/Helpers/ImageHelpers.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ShareX.HelpersLib/Helpers/ImageHelpers.cs b/ShareX.HelpersLib/Helpers/ImageHelpers.cs index 037e56a41..50c98c719 100644 --- a/ShareX.HelpersLib/Helpers/ImageHelpers.cs +++ b/ShareX.HelpersLib/Helpers/ImageHelpers.cs @@ -676,10 +676,15 @@ public static bool IsImagesEqual(Bitmap bmp1, Bitmap bmp2) public static bool IsImageTransparent(Bitmap bmp) { - using (UnsafeBitmap unsafeBitmap = new UnsafeBitmap(bmp, true, ImageLockMode.ReadOnly)) + if (bmp != null && bmp.PixelFormat == PixelFormat.Format32bppArgb) { - return unsafeBitmap.IsTransparent(); + using (UnsafeBitmap unsafeBitmap = new UnsafeBitmap(bmp, true, ImageLockMode.ReadOnly)) + { + return unsafeBitmap.IsTransparent(); + } } + + return false; } public static bool AddMetadata(Image img, int id, string text)