Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@@ -50,9 +50,7 @@ namespace System.Drawing
public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISerializable
{
public delegate bool GetThumbnailImageAbort();
#if NET_2_0
private object tag;
#endif
internal IntPtr nativeObject = IntPtr.Zero;
// when using MS GDI+ and IStream we must ensure the stream stays alive for all the life of the Image
@@ -739,7 +737,6 @@ public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISer
}
}
#if NET_2_0
[DefaultValue (null)]
[LocalizableAttribute(false)]
[BindableAttribute(true)]
@@ -748,7 +745,6 @@ public abstract class Image : MarshalByRefObject, IDisposable , ICloneable, ISer
get { return tag; }
set { tag = value; }
}
#endif
public float VerticalResolution {
get {
float resolution;