mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 3.8.0

Browse Source 
Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61
This commit is contained in:
Jo Shields
2014-09-04 09:07:35 +01:00
parent a575963da9
commit fe777c5c82
1062 changed files with 12460 additions and 5983 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/System.Drawing/System.Drawing/Graphics.cs
View File

@@ -1744,7 +1744,7 @@ namespace System.Drawing
if (GDIPlus.Display == IntPtr.Zero) {
GDIPlus.Display = GDIPlus.XOpenDisplay (IntPtr.Zero);
if (GDIPlus.Display == IntPtr.Zero)
throw new NotSupportedException ("Could not open display (X-Server required. Check you DISPLAY environment variable)");
throw new NotSupportedException ("Could not open display (X-Server required. Check your DISPLAY environment variable)");
}
if (hwnd == IntPtr.Zero) {
hwnd = GDIPlus.XRootWindow (GDIPlus.Display, GDIPlus.XDefaultScreen (GDIPlus.Display));

2
mcs/class/System.Drawing/Test/System.Drawing.Drawing2D/TestHatchBrush.cs
View File

@@ -28,6 +28,7 @@
using System;
using System.IO;
using System.Drawing;
using System.Drawing.Imaging;
using System.Drawing.Drawing2D;
@@ -125,6 +126,7 @@ namespace MonoTests.System.Drawing.Drawing2D
// save the drawing
string file = "TestHatchBrush" + getOutSufix() + ".png";
bmp.Save (file, ImageFormat.Png);
File.Delete (file);
}
private void Constructors ()

7
mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageAttributes.cs
View File

@@ -27,6 +27,7 @@
//
using System;
using System.IO;
using System.Drawing;
using System.Drawing.Imaging;
using System.Security.Permissions;
@@ -114,6 +115,8 @@ namespace MonoTests.System.Drawing.Imaging {
private void Bug80323 (Color c)
{
string fileName = String.Format ("80323-{0}.png", c.ToArgb ().ToString ("X"));
// test case from bug #80323
ColorMatrix cm = new ColorMatrix (new float[][] {
new float[] {1, 0, 0, 0, 0}, //R
@@ -138,12 +141,14 @@ namespace MonoTests.System.Drawing.Imaging {
g.DrawImage (bmp, new Rectangle (0, 0, 100, 100), 0, 0, 100, 100, GraphicsUnit.Pixel, null);
g.DrawImage (bmp, new Rectangle (100, 0, 100, 100), 0, 0, 100, 100, GraphicsUnit.Pixel, ia);
}
b.Save (String.Format ("80323-{0}.png", c.ToArgb ().ToString ("X")));
b.Save (fileName);
Assert.AreEqual (Color.FromArgb (255, 255, 155, 155), b.GetPixel (50, 50), "50,50");
Assert.AreEqual (Color.FromArgb (255, 255, 205, 205), b.GetPixel (150, 50), "150,50");
}
}
}
File.Delete (fileName);
}
[Test]