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

Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.

Browse source
This commit is contained in:
RKrom 2013-12-04 17:46:02 +01:00
parent 2a8e2475d8
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions
Download patch file Download diff file Expand all files Collapse all files

47
GreenshotPlugin/UnmanagedHelpers/GDIplus.cs
View file

@ -116,7 +116,8 @@ namespace GreenshotPlugin.UnmanagedHelpers {
private static readonly FieldInfo FIELD_INFO_NATIVE_MATRIX = typeof(Matrix).GetField("nativeMatrix", BindingFlags.GetField | BindingFlags.Instance | BindingFlags.NonPublic);
// Constant "FieldInfo" for getting the nativeImageAttributes from the ImageAttributes
private static readonly FieldInfo FIELD_INFO_NATIVE_IMAGEATTRIBUTES = typeof(ImageAttributes).GetField("nativeImageAttributes", BindingFlags.GetField | BindingFlags.Instance | BindingFlags.NonPublic);
private static bool isBlurEnabled = Environment.OSVersion.Version.Major >= 6;
/// <summary>
/// Get the nativeImage field from the bitmap
/// </summary>
@ -172,9 +173,9 @@ namespace GreenshotPlugin.UnmanagedHelpers {
/// <param name="radius"></param>
/// <returns></returns>
public static bool isBlurPossible(int radius) {
if (Environment.OSVersion.Version.Major < 6) {
if (!isBlurEnabled) {
return false;
} else if ((Environment.OSVersion.Version.Major >= 6 && Environment.OSVersion.Version.Minor >= 2) && radius < 20) {
} else if (Environment.OSVersion.Version.Minor >= 2 && radius < 20) {
return false;
}
return true;
@ -224,16 +225,22 @@ namespace GreenshotPlugin.UnmanagedHelpers {
// Everything worked, return true
return true;
} catch (Exception ex) {
isBlurEnabled = false;
LOG.Error("Problem using GdipBitmapApplyEffect: ", ex);
return false;
} finally {
if (hEffect != null) {
// Delete the effect
GdipDeleteEffect(hEffect);
}
if (hBlurParams != IntPtr.Zero) {
// Free the memory
Marshal.FreeHGlobal(hBlurParams);
try {
if (hEffect != IntPtr.Zero) {
// Delete the effect
GdipDeleteEffect(hEffect);
}
if (hBlurParams != IntPtr.Zero) {
// Free the memory
Marshal.FreeHGlobal(hBlurParams);
}
} catch (Exception ex) {
isBlurEnabled = false;
LOG.Error("Problem cleaning up ApplyBlur: ", ex);
}
}
}
@ -283,16 +290,22 @@ namespace GreenshotPlugin.UnmanagedHelpers {
// Everything worked, return true
return true;
} catch (Exception ex) {
isBlurEnabled = false;
LOG.Error("Problem using GdipDrawImageFX: ", ex);
return false;
} finally {
if (hEffect != null) {
// Delete the effect
GdipDeleteEffect(hEffect);
}
if (hBlurParams != IntPtr.Zero) {
// Free the memory
Marshal.FreeHGlobal(hBlurParams);
try {
if (hEffect != IntPtr.Zero) {
// Delete the effect
GdipDeleteEffect(hEffect);
}
if (hBlurParams != IntPtr.Zero) {
// Free the memory
Marshal.FreeHGlobal(hBlurParams);
}
} catch (Exception ex) {
isBlurEnabled = false;
LOG.Error("Problem cleaning up DrawWithBlur: ", ex);
}
}
}