CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-10-01 17:56:51 +13:00
Code Issues Projects Releases Packages Wiki Activity

GetImage changes

Browse source
This commit is contained in:
Jaex 2015-12-29 13:58:21 +02:00
parent d78059e0c0
commit a4383fbb9e
1 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
ShareX.HelpersLib/Helpers/ClipboardHelpers.cs
View file

@ -232,10 +232,33 @@ public static bool CopyImageFromFile(string path)
}
public static Image GetImage()
{
try
{
lock (ClipboardLock)
{
if (HelpersOptions.UseAlternativeGetImage)
{
return GetImageAlternative();
}
return Clipboard.GetImage();
}
}
catch (Exception e)
{
DebugHelper.WriteException(e, "Clipboard get image failed.");
}
return null;
}
private static Image GetImageAlternative()
{
IDataObject dataObject = Clipboard.GetDataObject();
if (dataObject != null)
{
string[] dataFormats = dataObject.GetFormats(false);
if (dataFormats.Contains("PNG"))
@ -245,7 +268,8 @@ public static Image GetImage()
return (Image)Image.FromStream(ms).Clone();
}
}
else if (dataFormats.Contains(DataFormats.Dib))
if (dataFormats.Contains(DataFormats.Dib))
{
byte[] dib;
@ -280,9 +304,11 @@ public static Image GetImage()
}
}
}
return dataObject.GetData(DataFormats.Bitmap, true) as Image;
}
return Clipboard.GetImage();
return null;
}
}
}