Remove all references to System.Drawing.Color

src/OpenTK/Graphics/Color4.cs

@@ -122,30 +122,6 @@ public int ToArgb()
  return !left.Equals(right);
  }
 
- /// <summary>
- /// Converts the specified System.Drawing.Color to a Color4 structure.
- /// </summary>
- /// <param name="color">The System.Drawing.Color to convert.</param>
- /// <returns>A new Color4 structure containing the converted components.</returns>
- public static implicit operator Color4(Color color)
- {
- return new Color4(color.R, color.G, color.B, color.A);
- }
-
- /// <summary>
- /// Converts the specified Color4 to a System.Drawing.Color structure.
- /// </summary>
- /// <param name="color">The Color4 to convert.</param>
- /// <returns>A new System.Drawing.Color structure containing the converted components.</returns>
- public static explicit operator Color(Color4 color)
- {
- return Color.FromArgb(
- (int)(color.A * Byte.MaxValue),
- (int)(color.R * Byte.MaxValue),
- (int)(color.G * Byte.MaxValue),
- (int)(color.B * Byte.MaxValue));
- }
-
  /// <summary>
  /// Compares whether this Color4 structure is equal to the specified object.
  /// </summary>

src/OpenTK/Graphics/ES20/Helper.cs

@@ -72,21 +72,11 @@ protected override object SyncRoot
  // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters).
  // We work around this issue by doubling the StringBuilder capacity.
 
- public static void ClearColor(Color color)
- {
- GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- }
-
  public static void ClearColor(Color4 color)
  {
  GL.ClearColor(color.R, color.G, color.B, color.A);
  }
 
- public static void BlendColor(Color color)
- {
- GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- }
-
  public static void BlendColor(Color4 color)
  {
  GL.BlendColor(color.R, color.G, color.B, color.A);

src/OpenTK/Graphics/ES30/Helper.cs

@@ -72,21 +72,11 @@ protected override object SyncRoot
  // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters).
  // We work around this issue by doubling the StringBuilder capacity.
 
- public static void ClearColor(Color color)
- {
- GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- }
-
  public static void ClearColor(Color4 color)
  {
  GL.ClearColor(color.R, color.G, color.B, color.A);
  }
 
- public static void BlendColor(Color color)
- {
- GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- }
-
  public static void BlendColor(Color4 color)
  {
  GL.BlendColor(color.R, color.G, color.B, color.A);

src/OpenTK/Graphics/OpenGL4/Helper.cs

@@ -68,21 +68,11 @@ protected override object SyncRoot
  // Note: Mono 1.9.1 truncates StringBuilder results (for 'out string' parameters).
  // We work around this issue by doubling the StringBuilder capacity.
 
- public static void ClearColor(Color color)
- {
- GL.ClearColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- }
-
  public static void ClearColor(Color4 color)
  {
  GL.ClearColor(color.R, color.G, color.B, color.A);
  }
 
- public static void BlendColor(Color color)
- {
- GL.BlendColor(color.R / 255.0f, color.G / 255.0f, color.B / 255.0f, color.A / 255.0f);
- }
-
  public static void BlendColor(Color4 color)
  {
  GL.BlendColor(color.R, color.G, color.B, color.A);

src/OpenTK/Minimal.cs

@@ -30,7 +30,7 @@ internal class Registry
  {
  public static readonly RegistryKey LocalMachine = new RegistryKey();
  }
- 
+
  internal sealed class SystemEvents
  {
  public static event EventHandler DisplaySettingsChanged;
@@ -103,11 +103,6 @@ internal Bitmap(int width, int height, int stride, PixelFormat format, IntPtr pi
  public int Width { get { return width; } }
  public int Height { get { return height; } }
 
- public Color GetPixel(int x, int y)
- {
- return new Color();
- }
-
  internal void UnlockBits(BitmapData data)
  {
  }
@@ -134,20 +129,20 @@ internal BitmapData(int width, int height, int stride)
  public int Height { get; private set; }
  public int Stride { get; private set; }
  }
- 
+
  internal enum ImageLockMode
  {
  ReadOnly,
  WriteOnly,
  ReadWrite,
  UserInputBuffer
  }
- 
+
  internal enum PixelFormat
  {
  Format32bppArgb = 2498570
  }
- 
+
  internal enum ImageFormat
  {
  Png
@@ -158,7 +153,7 @@ internal enum ImageFormat
 namespace OpenTK.Minimal
 {
  using System.Drawing;
- 
+
  internal sealed class Graphics : IDisposable
  {
  public static Graphics FromImage(Image img)

src/OpenTK/Platform/X11/Functions.cs

@@ -59,7 +59,7 @@ public static IntPtr XOpenDisplay(IntPtr display)
 
  [DllImport("libX11", EntryPoint = "XCreateWindow")]
  public extern static IntPtr XCreateWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, int depth, int xclass, IntPtr visual, IntPtr valuemask, ref XSetWindowAttributes attributes);
- 
+
  [DllImport("libX11", EntryPoint = "XCreateWindow")]
  public unsafe extern static IntPtr XCreateWindow(IntPtr display, IntPtr parent, int x, int y, int width, int height, int border_width, int depth, int xclass, IntPtr visual, IntPtr valuemask, XSetWindowAttributes* attributes);
 
@@ -600,11 +600,6 @@ public static IntPtr CreateMaskFromImage(Display display, Bitmap image)
  {
  byte bit = (byte)(1 << (msbfirst ? (7 - (x & 7)) : (x & 7)));
  int offset = y * stride + (x >> 3);
-
- if (image.GetPixel(x, y).A >= 128)
- {
- mask[offset] |= bit;
- }
  }
  }
 

src/OpenTK/Platform/X11/X11GLNative.cs

@@ -1332,7 +1332,6 @@ public override Icon Icon
  for (int y = 0; y < bitmap.Height; y++)
  for (int x = 0; x < bitmap.Width; x++)
  {
- data[index++] = (IntPtr)bitmap.GetPixel(x, y).ToArgb();
  }
 
  using (new XLock(window.Display))