diff --git a/Source/Compatibility/Graphics/Texture2D.cs b/Source/Compatibility/Graphics/Texture2D.cs index 56707aaa..7bf192aa 100644 --- a/Source/Compatibility/Graphics/Texture2D.cs +++ b/Source/Compatibility/Graphics/Texture2D.cs @@ -1,4 +1,4 @@ -#region License +#region License // // The Open Toolkit Library License // diff --git a/Source/Examples/OpenGL/1.1/StencilCSG.cs b/Source/Examples/OpenGL/1.1/StencilCSG.cs index b63465f0..65356af2 100644 --- a/Source/Examples/OpenGL/1.1/StencilCSG.cs +++ b/Source/Examples/OpenGL/1.1/StencilCSG.cs @@ -117,7 +117,7 @@ namespace Examples.Tutorial GL.GenTextures(1, out Texture); GL.BindTexture(TextureTarget.Texture2D, Texture); - BitmapData data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); + BitmapData data = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0); GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear); GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear); diff --git a/Source/Examples/OpenGL/1.1/TextureMatrix.cs b/Source/Examples/OpenGL/1.1/TextureMatrix.cs index 69bbe589..615c132d 100644 --- a/Source/Examples/OpenGL/1.1/TextureMatrix.cs +++ b/Source/Examples/OpenGL/1.1/TextureMatrix.cs @@ -120,7 +120,7 @@ namespace Examples.Tutorial GL.BindTexture(Target, texture); Bitmap bitmap = new Bitmap(filename); - BitmapData data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); + BitmapData data = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); GL.TexImage2D(Target, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0); GL.Finish(); bitmap.UnlockBits(data); diff --git a/Source/Examples/OpenGL/1.1/Textures.cs b/Source/Examples/OpenGL/1.1/Textures.cs index 4a91a917..2fc8277c 100644 --- a/Source/Examples/OpenGL/1.1/Textures.cs +++ b/Source/Examples/OpenGL/1.1/Textures.cs @@ -1,4 +1,4 @@ -#region --- License --- +#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ @@ -46,7 +46,7 @@ namespace Examples.Tutorial GL.GenTextures(1, out texture); GL.BindTexture(TextureTarget.Texture2D, texture); - BitmapData data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), + BitmapData data = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba, data.Width, data.Height, 0, diff --git a/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs b/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs index 235bd0c6..f31e1e5d 100644 --- a/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs +++ b/Source/Examples/OpenGL/GLSL/JuliaSetFractal.cs @@ -1,4 +1,4 @@ -#region --- License --- +#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. @@ -159,7 +159,7 @@ namespace Examples.Tutorial using (Bitmap bitmap = new Bitmap("Data/Textures/JuliaColorTable.bmp")) { - BitmapData data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, + BitmapData data = bitmap.LockBits(new System.Drawing.Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb); GL.TexImage1D(TextureTarget.Texture1D, 0, PixelInternalFormat.Rgb8, data.Width, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgr, PixelType.UnsignedByte, data.Scan0); @@ -177,7 +177,7 @@ namespace Examples.Tutorial { Bitmap bmp = new Bitmap(this.Width, this.Height); System.Drawing.Imaging.BitmapData data = - bmp.LockBits(new Rectangle(0, 0, this.Width, this.Height), + bmp.LockBits(new System.Drawing.Rectangle(0, 0, this.Width, this.Height), System.Drawing.Imaging.ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb); GL.ReadPixels(0, 0, this.Width, this.Height, diff --git a/Source/Examples/OpenTK/Test/Extensions.cs b/Source/Examples/OpenTK/Test/Extensions.cs index 197bfb91..6bd6d9c3 100644 --- a/Source/Examples/OpenTK/Test/Extensions.cs +++ b/Source/Examples/OpenTK/Test/Extensions.cs @@ -1,4 +1,4 @@ -#region --- License --- +#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ @@ -142,7 +142,7 @@ namespace Examples.WinForms // Change the width of our Form to make every DataGridView column visible. dataGridView1.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCellsExceptHeader); dataGridView1.Columns[1].Width = 450; - this.Size = dataGridView1.GetPreferredSize(new Size(2000, Height)); + this.Size = dataGridView1.GetPreferredSize(new System.Drawing.Size(2000, Height)); } #endregion diff --git a/Source/Examples/OpenTK/Test/GameWindowStates.cs b/Source/Examples/OpenTK/Test/GameWindowStates.cs index 8ca981ee..876c18c0 100644 --- a/Source/Examples/OpenTK/Test/GameWindowStates.cs +++ b/Source/Examples/OpenTK/Test/GameWindowStates.cs @@ -1,4 +1,4 @@ -#region --- License --- +#region --- License --- /* Copyright (c) 2006, 2007 Stefanos Apostolopoulos * See license.txt for license info */ @@ -68,7 +68,7 @@ namespace Examples.Tests gfx.DrawString(String.Format("Mouse {0} window.", mouse_in_window ? "inside" : "outside of"), TextFont, Brushes.White, new PointF(0, 3 * TextFont.Height)); } - System.Drawing.Imaging.BitmapData data = TextBitmap.LockBits(new Rectangle(0, 0, TextBitmap.Width, TextBitmap.Height), + System.Drawing.Imaging.BitmapData data = TextBitmap.LockBits(new System.Drawing.Rectangle(0, 0, TextBitmap.Width, TextBitmap.Height), System.Drawing.Imaging.ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb); GL.TexSubImage2D(TextureTarget.Texture2D, 0, 0, 0, TextBitmap.Width, TextBitmap.Height, PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0); TextBitmap.UnlockBits(data); diff --git a/Source/Examples/Utilities/LoaderGDI.cs b/Source/Examples/Utilities/LoaderGDI.cs index fbda2cfb..24e190ba 100644 --- a/Source/Examples/Utilities/LoaderGDI.cs +++ b/Source/Examples/Utilities/LoaderGDI.cs @@ -1,4 +1,4 @@ -#region --- License --- +#region --- License --- /* Licensed under the MIT/X11 license. * Copyright (c) 2006-2008 the OpenTK Team. * This notice may not be removed from any source distribution. @@ -87,7 +87,7 @@ namespace Examples.TextureLoaders throw new ArgumentException( "ERROR: Unsupported Pixel Format " + CurrentBitmap.PixelFormat ); } - BitmapData Data = CurrentBitmap.LockBits( new Rectangle( 0, 0, CurrentBitmap.Width, CurrentBitmap.Height ), ImageLockMode.ReadOnly, CurrentBitmap.PixelFormat ); + BitmapData Data = CurrentBitmap.LockBits( new System.Drawing.Rectangle( 0, 0, CurrentBitmap.Width, CurrentBitmap.Height ), ImageLockMode.ReadOnly, CurrentBitmap.PixelFormat ); if ( Data.Height > 1 ) { // image is 2D