github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-06 04:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added better error handling for reading the bitmap [skip ci]

Browse source
This commit is contained in:
Robin Krom 2022-03-29 20:35:43 +02:00
parent 9ae5598ab8
commit 78cbb055cb
No known key found for this signature in database
GPG key ID: BCC01364F1371490
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Greenshot.Editor/FileFormatHandlers/DibFileFormatHandler.cs
View file

@ -86,11 +86,19 @@ namespace Greenshot.Editor.FileFormatHandlers
bitmapStream.Write(fileHeaderBytes, 0, fileHeaderSize); bitmapStream.Write(fileHeaderBytes, 0, fileHeaderSize);
bitmapStream.Write(dibBuffer, 0, dibBuffer.Length); bitmapStream.Write(dibBuffer, 0, dibBuffer.Length);
bitmapStream.Seek(0, SeekOrigin.Begin); bitmapStream.Seek(0, SeekOrigin.Begin);
// TODO: Replace with a FileFormatHandler try
{
using var beforeCloneImage = Image.FromStream(bitmapStream); using var beforeCloneImage = Image.FromStream(bitmapStream);
bitmap = ImageHelper.Clone(beforeCloneImage) as Bitmap; bitmap = ImageHelper.Clone(beforeCloneImage) as Bitmap;
return bitmap != null; return bitmap != null;
} }
catch (Exception ex)
{
Log.Error("Problem retrieving Format17 from clipboard.", ex);
bitmap = null;
return false;
}
}
Log.Info("Using special DIBV5 / Format17 format reader"); Log.Info("Using special DIBV5 / Format17 format reader");
// CF_DIBV5 // CF_DIBV5
IntPtr gcHandle = IntPtr.Zero; IntPtr gcHandle = IntPtr.Zero;