Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions

View file

@ -25,17 +25,17 @@ using System.Runtime.InteropServices;
namespace GreenshotPlugin.UnmanagedHelpers {
[StructLayout(LayoutKind.Sequential), Serializable()]
public struct SIZE {
public int width;
public int height;
public int Width;
public int Height;
public SIZE(Size size) : this(size.Width, size.Height) {
}
public SIZE(int width, int height) {
this.width = width;
this.height = height;
Width = width;
Height = height;
}
public Size ToSize() {
return new Size(width, height);
return new Size(Width, Height);
}
}
[StructLayout(LayoutKind.Sequential), Serializable()]