From 7ac6812ce7e7e35f450b0c1a886fdedc5d0659a6 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:46:28 +0200 Subject: [PATCH 1/7] Enable SA1003. --- stylecop.ruleset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylecop.ruleset b/stylecop.ruleset index dcf1791e..22cd1a6e 100644 --- a/stylecop.ruleset +++ b/stylecop.ruleset @@ -9,7 +9,7 @@ - + From af3aef4d9e7e16155f4b7a8304fcb24ef46989ec Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:46:43 +0200 Subject: [PATCH 2/7] Remove redundant base constructor call. --- src/Generator.Bind/Structures/Parameter.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Generator.Bind/Structures/Parameter.cs b/src/Generator.Bind/Structures/Parameter.cs index 626c4280..297422ed 100644 --- a/src/Generator.Bind/Structures/Parameter.cs +++ b/src/Generator.Bind/Structures/Parameter.cs @@ -20,7 +20,6 @@ namespace Bind.Structures /// Creates a new Parameter without type and name. /// public Parameter() - :base() { } From 5db88e0a8fdc00facbf8a7478f6d2821b3ae77a5 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:47:43 +0200 Subject: [PATCH 3/7] Correct cast operator position. --- src/OpenTK/BlittableValueType.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenTK/BlittableValueType.cs b/src/OpenTK/BlittableValueType.cs index 264aa83f..23eade4c 100644 --- a/src/OpenTK/BlittableValueType.cs +++ b/src/OpenTK/BlittableValueType.cs @@ -118,8 +118,8 @@ namespace OpenTK // or [StructLayout(LayoutKind.Explicit)] private static bool CheckStructLayoutAttribute(Type type) { - StructLayoutAttribute[] attr = (StructLayoutAttribute[]) - type.GetCustomAttributes(typeof(StructLayoutAttribute), true); + StructLayoutAttribute[] attr = + (StructLayoutAttribute[])type.GetCustomAttributes(typeof(StructLayoutAttribute), true); if ((attr == null) || (attr != null && attr.Length > 0 && attr[0].Value != LayoutKind.Explicit && attr[0].Pack != 1)) From b08acb758a940319c664de2799b0d7509e528efa Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:58:15 +0200 Subject: [PATCH 4/7] Correct cast operator position. --- src/OpenTK/Math/Box2.cs | 2 +- src/OpenTK/Math/Box2d.cs | 2 +- src/OpenTK/Math/MathHelper.cs | 2 +- src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs | 4 ++-- src/OpenTK/Platform/Egl/EglContext.cs | 8 ++++---- src/OpenTK/Platform/Egl/EglGraphicsMode.cs | 2 +- src/OpenTK/Platform/Windows/WinRawJoystick.cs | 4 ++-- src/OpenTK/Platform/Windows/WinRawKeyboard.cs | 2 +- src/OpenTK/Platform/Windows/WinRawMouse.cs | 2 +- src/OpenTK/Platform/X11/Functions.cs | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/OpenTK/Math/Box2.cs b/src/OpenTK/Math/Box2.cs index 16789ef3..51b27e68 100644 --- a/src/OpenTK/Math/Box2.cs +++ b/src/OpenTK/Math/Box2.cs @@ -184,7 +184,7 @@ namespace OpenTK /// public override bool Equals(object obj) { - return obj is Box2 && Equals((Box2) obj); + return obj is Box2 && Equals((Box2)obj); } /// diff --git a/src/OpenTK/Math/Box2d.cs b/src/OpenTK/Math/Box2d.cs index 8b32e232..232ab4ed 100644 --- a/src/OpenTK/Math/Box2d.cs +++ b/src/OpenTK/Math/Box2d.cs @@ -185,7 +185,7 @@ namespace OpenTK /// public override bool Equals(object obj) { - return obj is Box2d && Equals((Box2d) obj); + return obj is Box2d && Equals((Box2d)obj); } /// diff --git a/src/OpenTK/Math/MathHelper.cs b/src/OpenTK/Math/MathHelper.cs index f5fac0ad..66e0038a 100644 --- a/src/OpenTK/Math/MathHelper.cs +++ b/src/OpenTK/Math/MathHelper.cs @@ -306,7 +306,7 @@ namespace OpenTK } private static unsafe int FloatToInt32Bits(float f) { - return *((int*) &f); + return *((int*)&f); } /// diff --git a/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs b/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs index 2d2cb07e..d0dedb56 100644 --- a/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs +++ b/src/OpenTK/Platform/Egl/EglAnglePlatformFactory.cs @@ -53,7 +53,7 @@ namespace OpenTK.Platform.Egl public override IGraphicsContext CreateGLContext(GraphicsMode mode, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags) { - var angle_window = (IAngleWindowInfoInternal) window; + var angle_window = (IAngleWindowInfoInternal)window; var egl_window = CreateWindowInfo(angle_window, major, flags); var egl_context = new EglWinContext(mode, egl_window, shareContext, major, minor, flags); angle_window.EglContext = egl_context; @@ -63,7 +63,7 @@ namespace OpenTK.Platform.Egl public override IGraphicsContext CreateGLContext(ContextHandle handle, IWindowInfo window, IGraphicsContext shareContext, bool directRendering, int major, int minor, GraphicsContextFlags flags) { - var angle_window = (IAngleWindowInfoInternal) window; + var angle_window = (IAngleWindowInfoInternal)window; var egl_window = CreateWindowInfo(angle_window, major, flags); var egl_context = new EglWinContext(handle, egl_window, shareContext, major, minor, flags); angle_window.EglContext = egl_context; diff --git a/src/OpenTK/Platform/Egl/EglContext.cs b/src/OpenTK/Platform/Egl/EglContext.cs index 5e123328..d85850a8 100644 --- a/src/OpenTK/Platform/Egl/EglContext.cs +++ b/src/OpenTK/Platform/Egl/EglContext.cs @@ -152,12 +152,12 @@ namespace OpenTK.Platform.Egl { if (window is EglWindowInfo) { - WindowInfo = (EglWindowInfo) window; + WindowInfo = (EglWindowInfo)window; } #if !ANDROID else if (window is IAngleWindowInfoInternal) { - WindowInfo = ((IAngleWindowInfoInternal) window).EglWindowInfo; + WindowInfo = ((IAngleWindowInfoInternal)window).EglWindowInfo; } #endif @@ -263,9 +263,9 @@ namespace OpenTK.Platform.Egl var internalContext = sharedContext as IGraphicsContextInternal; if (internalContext != null) { - return (EglContext) internalContext.Implementation; + return (EglContext)internalContext.Implementation; } - return (EglContext) sharedContext; + return (EglContext)sharedContext; } } } diff --git a/src/OpenTK/Platform/Egl/EglGraphicsMode.cs b/src/OpenTK/Platform/Egl/EglGraphicsMode.cs index 91df6fbb..c66385b7 100644 --- a/src/OpenTK/Platform/Egl/EglGraphicsMode.cs +++ b/src/OpenTK/Platform/Egl/EglGraphicsMode.cs @@ -58,7 +58,7 @@ namespace OpenTK.Platform.Egl IntPtr[] configs = new IntPtr[1]; int[] attribList = new int[] { - Egl.SURFACE_TYPE, (int) surfaceType, + Egl.SURFACE_TYPE, (int)surfaceType, Egl.RENDERABLE_TYPE, (int)renderableFlags, Egl.RED_SIZE, color.Red, diff --git a/src/OpenTK/Platform/Windows/WinRawJoystick.cs b/src/OpenTK/Platform/Windows/WinRawJoystick.cs index 233a640f..cadd9a1f 100644 --- a/src/OpenTK/Platform/Windows/WinRawJoystick.cs +++ b/src/OpenTK/Platform/Windows/WinRawJoystick.cs @@ -426,8 +426,8 @@ namespace OpenTK.Platform.Windows { if (stick.AxisCaps[i].LogicalMin > 0) { - short scaled_value = (short) HidHelper.ScaleValue( - (int) ((long) value + stick.AxisCaps[i].LogicalMin), + short scaled_value = (short)HidHelper.ScaleValue( + (int)((long)value + stick.AxisCaps[i].LogicalMin), stick.AxisCaps[i].LogicalMin, stick.AxisCaps[i].LogicalMax, Int16.MinValue, Int16.MaxValue); stick.SetAxis(collection, page, usage, scaled_value); diff --git a/src/OpenTK/Platform/Windows/WinRawKeyboard.cs b/src/OpenTK/Platform/Windows/WinRawKeyboard.cs index c19c9010..bee7eca8 100644 --- a/src/OpenTK/Platform/Windows/WinRawKeyboard.cs +++ b/src/OpenTK/Platform/Windows/WinRawKeyboard.cs @@ -109,7 +109,7 @@ namespace OpenTK.Platform.Windows // making a guess at backwards compatability. Not sure what older windows returns in these cases... if (deviceClass == null || deviceClass.Equals(string.Empty)){ RegistryKey classGUIDKey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Class\" + deviceClassGUID); - deviceClass = classGUIDKey != null ? (string) classGUIDKey.GetValue("Class") : string.Empty; + deviceClass = classGUIDKey != null ? (string)classGUIDKey.GetValue("Class") : string.Empty; } if (String.IsNullOrEmpty(deviceDesc)) diff --git a/src/OpenTK/Platform/Windows/WinRawMouse.cs b/src/OpenTK/Platform/Windows/WinRawMouse.cs index 99d9c62c..877f906e 100644 --- a/src/OpenTK/Platform/Windows/WinRawMouse.cs +++ b/src/OpenTK/Platform/Windows/WinRawMouse.cs @@ -111,7 +111,7 @@ namespace OpenTK.Platform.Windows // Added to address OpenTK issue 3198 with mouse on Windows 8 string deviceClassGUID = (string)regkey.GetValue("ClassGUID"); RegistryKey classGUIDKey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Class\" + deviceClassGUID); - deviceClass = classGUIDKey != null ? (string) classGUIDKey.GetValue("Class") : string.Empty; + deviceClass = classGUIDKey != null ? (string)classGUIDKey.GetValue("Class") : string.Empty; } // deviceDesc remained null on a new Win7 system - not sure why. diff --git a/src/OpenTK/Platform/X11/Functions.cs b/src/OpenTK/Platform/X11/Functions.cs index 672b74bd..288e306b 100644 --- a/src/OpenTK/Platform/X11/Functions.cs +++ b/src/OpenTK/Platform/X11/Functions.cs @@ -553,7 +553,7 @@ namespace OpenTK.Platform.X11 public byte A, R, G, B; public Pixel(byte a, byte r, byte g, byte b) { - A= a; + A = a; R = r; G = g; B = b; @@ -602,7 +602,7 @@ namespace OpenTK.Platform.X11 { for (int x = 0; x < width; ++x) { - byte bit = (byte) (1 << (msbfirst ? (7 - (x & 7)) : (x & 7))); + byte bit = (byte)(1 << (msbfirst ? (7 - (x & 7)) : (x & 7))); int offset = y * stride + (x >> 3); if (image.GetPixel(x, y).A >= 128) From 205cb307ec841c585afa265dfe174c9a57fe429c Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:58:41 +0200 Subject: [PATCH 5/7] Correct base call operator position. --- src/OpenTK/Math/Quaternion.cs | 2 +- src/OpenTK/Math/Quaterniond.cs | 2 +- src/OpenTK/Platform/Android/AndroidGraphicsMode.cs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenTK/Math/Quaternion.cs b/src/OpenTK/Math/Quaternion.cs index 317742d5..bea308bc 100644 --- a/src/OpenTK/Math/Quaternion.cs +++ b/src/OpenTK/Math/Quaternion.cs @@ -95,7 +95,7 @@ namespace OpenTK /// /// The euler angles as a Vector3 public Quaternion(Vector3 eulerAngles) - :this(eulerAngles.X, eulerAngles.Y, eulerAngles.Z) + : this(eulerAngles.X, eulerAngles.Y, eulerAngles.Z) { } /// diff --git a/src/OpenTK/Math/Quaterniond.cs b/src/OpenTK/Math/Quaterniond.cs index 851bb316..b629536b 100644 --- a/src/OpenTK/Math/Quaterniond.cs +++ b/src/OpenTK/Math/Quaterniond.cs @@ -95,7 +95,7 @@ namespace OpenTK /// /// The euler angles as a Vector3d public Quaterniond(Vector3d eulerAngles) - :this(eulerAngles.X, eulerAngles.Y, eulerAngles.Z) + : this(eulerAngles.X, eulerAngles.Y, eulerAngles.Z) { } /// diff --git a/src/OpenTK/Platform/Android/AndroidGraphicsMode.cs b/src/OpenTK/Platform/Android/AndroidGraphicsMode.cs index 8169e292..fe2cf73d 100644 --- a/src/OpenTK/Platform/Android/AndroidGraphicsMode.cs +++ b/src/OpenTK/Platform/Android/AndroidGraphicsMode.cs @@ -14,8 +14,8 @@ namespace OpenTK.Platform.Android /// /// constructors (pass null to the display parameter for lazy initialization) /// - public AndroidGraphicsMode(ColorFormat color, int depth, int stencil, int samples, int buffers, bool stereo) : - this(null, 1, color, depth, stencil, samples, buffers, stereo) + public AndroidGraphicsMode(ColorFormat color, int depth, int stencil, int samples, int buffers, bool stereo) + : this(null, 1, color, depth, stencil, samples, buffers, stereo) { } @@ -30,8 +30,8 @@ namespace OpenTK.Platform.Android /// /// Requested OpenGL version (1 or 2) /// GraphicsMode to copy values from. - public AndroidGraphicsMode(object display_ignored, int majorVersion, GraphicsMode mode) : - this(display_ignored, majorVersion, mode.ColorFormat, mode.Depth, mode.Stencil, mode.Samples, mode.Buffers, mode.Stereo) + public AndroidGraphicsMode(object display_ignored, int majorVersion, GraphicsMode mode) + : this(display_ignored, majorVersion, mode.ColorFormat, mode.Depth, mode.Stencil, mode.Samples, mode.Buffers, mode.Stereo) { } From c06ce5658d7c088e827dfd925d9234eb325fee64 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:59:09 +0200 Subject: [PATCH 6/7] Correct equality comparsion operator position. --- src/OpenTK/Platform/Egl/EglWindowInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenTK/Platform/Egl/EglWindowInfo.cs b/src/OpenTK/Platform/Egl/EglWindowInfo.cs index dd00ced0..ecdec262 100644 --- a/src/OpenTK/Platform/Egl/EglWindowInfo.cs +++ b/src/OpenTK/Platform/Egl/EglWindowInfo.cs @@ -68,7 +68,7 @@ namespace OpenTK.Platform.Egl public void CreateWindowSurface(IntPtr config) { Surface = Egl.CreateWindowSurface(Display, config, Handle, IntPtr.Zero); - if (Surface==IntPtr.Zero) + if (Surface == IntPtr.Zero) { throw new GraphicsContextException(String.Format( "[EGL] Failed to create window surface, error {0}.", Egl.GetError())); From 3bfaeda99db3ee8e7aa359b514ff553c3d1c2890 Mon Sep 17 00:00:00 2001 From: Jarl Gullberg Date: Sun, 30 Jul 2017 17:59:19 +0200 Subject: [PATCH 7/7] Correct arithmetic operator position. --- src/OpenTK/Platform/Linux/Bindings/Evdev.cs | 4 +- src/OpenTK/Platform/Windows/API.cs | 2 +- src/OpenTK/Platform/Windows/XInputJoystick.cs | 2 +- src/OpenTK/Platform/X11/API.cs | 78 +++++++++---------- src/OpenTK/Platform/X11/Structs.cs | 36 ++++----- src/OpenTK/Platform/X11/X11DisplayDevice.cs | 4 +- 6 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/OpenTK/Platform/Linux/Bindings/Evdev.cs b/src/OpenTK/Platform/Linux/Bindings/Evdev.cs index bf49623d..50e617f8 100644 --- a/src/OpenTK/Platform/Linux/Bindings/Evdev.cs +++ b/src/OpenTK/Platform/Linux/Bindings/Evdev.cs @@ -472,7 +472,7 @@ namespace OpenTK.Platform.Linux MT_TOOL_Y = 0x3d, /* Center Y tool position */ MAX = 0x3f, - CNT = (MAX+1), + CNT = (MAX + 1), } internal enum EvdevButton @@ -579,7 +579,7 @@ namespace OpenTK.Platform.Linux PWR = 0x16, FF_STATUS = 0x17, MAX = 0x1f, - CNT = (MAX+1), + CNT = (MAX + 1), } internal enum EvdevIoctl : uint diff --git a/src/OpenTK/Platform/Windows/API.cs b/src/OpenTK/Platform/Windows/API.cs index 3c716ba1..5992b63d 100644 --- a/src/OpenTK/Platform/Windows/API.cs +++ b/src/OpenTK/Platform/Windows/API.cs @@ -3326,7 +3326,7 @@ namespace OpenTK.Platform.Windows /* * NEC PC-9800 kbd definitions */ - OEM_NEC_EQUAL= 0x92, // '=' key on numpad + OEM_NEC_EQUAL = 0x92, // '=' key on numpad /* * Fujitsu/OASYS kbd definitions diff --git a/src/OpenTK/Platform/Windows/XInputJoystick.cs b/src/OpenTK/Platform/Windows/XInputJoystick.cs index 8aa6823b..bf17115c 100644 --- a/src/OpenTK/Platform/Windows/XInputJoystick.cs +++ b/src/OpenTK/Platform/Windows/XInputJoystick.cs @@ -81,7 +81,7 @@ namespace OpenTK.Platform.Windows { XInputButtons dir = 0; - dir =XInputButtons.DPadUp | XInputButtons.DPadLeft; + dir = XInputButtons.DPadUp | XInputButtons.DPadLeft; if ((buttons & dir) == dir) { return HatPosition.UpLeft; diff --git a/src/OpenTK/Platform/X11/API.cs b/src/OpenTK/Platform/X11/API.cs index 6ad1fd29..5a9f0ee0 100644 --- a/src/OpenTK/Platform/X11/API.cs +++ b/src/OpenTK/Platform/X11/API.cs @@ -677,7 +677,7 @@ XF86VidModeGetGammaRampSize( public override string ToString () { - return string.Format("MotifWmHints