* System.Drawing/Image.cs: On win32, when cloning images initialized from

[mono.git] / mcs / class / System.Drawing / System.Drawing.Imaging / MetafileHeader.cs

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileHeader.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileHeader.cs
index 18279cbfeaf41414f3048bc3d18c141d1a00b02f..242d2c3342c0be5510063074f5ad80c6e22fc9b3 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileHeader.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileHeader.cs
@@ -79,11 +79,11 @@ namespace System.Drawing.Imaging {
                public WmfMetaHeader    wmf_header;
                [FieldOffset (40)]
                public EnhMetafileHeader emf_header;
-               [FieldOffset (124)]
-               public int              emfplus_header_size;
                [FieldOffset (128)]
-               public int              logical_dpi_x;
+               public int              emfplus_header_size;
                [FieldOffset (132)]
+               public int              logical_dpi_x;
+               [FieldOffset (136)]
                public int              logical_dpi_y;
        }
 
@@ -186,7 +186,11 @@ namespace System.Drawing.Imaging {
                // note: this always returns a new instance (where we can change
                // properties even if they don't seems to affect anything)
                public MetaHeader WmfHeader {
-                       get { return new MetaHeader (header.wmf_header); }
+                       get {
+                               if (IsWmf ())
+                                        return new MetaHeader (header.wmf_header);
+                               throw new ArgumentException ("WmfHeader only available on WMF files.");
+                       }
                }
        }
 }