2006-05-05 Sebastien Pouliot <sebastien@ximian.com>

	* PaletteFlags.cs: corcompare fixes for 2.0. Add [Flags] and remove
	[Serializable]

svn path=/trunk/mcs/; revision=60334

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
index fb1007b061f0fca7833339da0ee868b3301b8f8d..65da5923e4909d99de9a8e3aa76eb1c15362cf0f 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-05  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * PaletteFlags.cs: corcompare fixes for 2.0. Add [Flags] and remove
+       [Serializable]
+
 2006-04-20  Peter Dennis Bartok  <pbartok@novell.com>
 
        * BitmapData.cs: Updated to match the BitmapData structure

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs
index 11b968b47af0de52d122eda629f06230ecf76426..af5401a2e734f3e5788f8f4863d326fa7b12517c 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs
@@ -1,12 +1,10 @@
 //
 // System.Drawing.Imaging.PaletteFlags.cs
 //
-// (C) 2002 Ximian, Inc.  http://www.ximian.com
 // Author: Dennis Hayes (dennish@raytek.com)
 //
-
-//
-// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+// Copyright (C) 2004, 2006 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -27,10 +25,14 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;
-namespace System.Drawing.Imaging 
-{
+
+namespace System.Drawing.Imaging {
+
+#if NET_2_0
+       [Flags]
+#else
        [Serializable]
+#endif
        public enum PaletteFlags {
                GrayScale = 2,
                Halftone = 4,