ImageFormat.cs: Fixed ToString to use this.Equals to reflect argument changes to...

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

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
index aa1a93a9da3e988a318680e28ee729c47696476b..ce0c40daee08a77c754f1653bc4a19839aa7dbbc 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-13  Kornél Pál  <kornelpal@hotmail.com>
+
+       * ImageFormat.cs: Fixed ToString to use this.Equals to reflect argument
+         changes to ImageFormat objects. Added Exif and Icon strings to ToString
+         and reordered formats to match declaration.
+
 2005-11-13 Konstantin Triger <kostat@mainsoft.com>
 
         * ImageCodec.jvm.cs: throw an exception if codec is not found.
@@ -206,7 +212,7 @@
        * EncoderParameters.cs: Implemented.
        * EncoderParameter.cs: Implemented.
 
-2004-01-21 Jordi Mas i Hernàdez <jmas@softcatala.org>
+2004-01-21 Jordi Mas i Hernàdez <jmas@softcatala.org>
        * BmpBitmap.cs: fixed encoding and decoding problems
        * ImageAttributes.cs: implemented
 

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFormat.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFormat.cs
index f60f5300d55f0add6d70c5d6073e9bb78580ec23..1a7e94043b4a9593734cf7ca3a68c584e3e7815f 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFormat.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFormat.cs
@@ -80,28 +80,34 @@ namespace System.Drawing.Imaging {
                
                public override string ToString() 
                {                       
-                       if (Guid.Equals (Bmp))
+                       if (this.Equals (Bmp))
                                return "Bmp";                   
                                
-                       if (Guid.Equals (Emf))
+                       if (this.Equals (Emf))
                                return "Emf";                   
                                
-                       if (Guid.Equals (Gif))
+                       if (this.Equals (Exif))
+                               return "Exif";                  
+                               
+                       if (this.Equals (Gif))
                                return "Gif";                   
                                
-                       if (Guid.Equals (Jpeg))
-                               return "Jpeg";                                                  
+                       if (this.Equals (Tiff))
+                               return "Tiff";                  
+                               
+                       if (this.Equals (Png))
+                               return "Png";                   
                                
-                       if (Guid.Equals (MemoryBmp))
+                       if (this.Equals (MemoryBmp))
                                return "MemoryBmp";                     
                                
-                       if (Guid.Equals (Png))
-                               return "Png";                   
+                       if (this.Equals (Icon))
+                               return "Icon";                  
                                
-                       if (Guid.Equals (Tiff))
-                               return "Tiff";                  
+                       if (this.Equals (Jpeg))
+                               return "Jpeg";                                                  
                                
-                       if (Guid.Equals (Wmf))
+                       if (this.Equals (Wmf))
                                return "Wmf";                                                                                           
                        
                        // Default                      

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
index 905c38e0c1f0cc851702b8a3804cc7a5cd1e909e..75122b31a5088d99677b63ee9eae24c4c7a9bd07 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-13  Kornél Pál  <kornelpal@hotmail.com>
+
+       * TestImageFormat.cs: Added ToStringTest.
+
 2005-10-31  Jordi Mas i Hernandez <jordi@ximian.com>
 
        *  TestImageFormat.cs: New test unit

diff --git a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageFormat.cs b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageFormat.cs
index 0592bde7ff138e11ccfcb88f7037ba2ee50eeeae..f83bed886a972579f6ee0eb644f4450623d946a5 100644 (file)
--- a/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageFormat.cs
+++ b/mcs/class/System.Drawing/Test/System.Drawing.Imaging/TestImageFormat.cs
@@ -51,6 +51,7 @@ namespace MonoTests.System.Drawing
                private static ImageFormat IconImageFormat = new ImageFormat (new Guid ("b96b3cb5-0728-11d3-9d7b-0000f81ef32e"));
                private static ImageFormat JpegImageFormat = new ImageFormat(new Guid("b96b3cae-0728-11d3-9d7b-0000f81ef32e"));
                private static ImageFormat WmfImageFormat = new ImageFormat (new Guid ("b96b3cad-0728-11d3-9d7b-0000f81ef32e"));
+               private static ImageFormat CustomImageFormat = new ImageFormat (new Guid ("48749428-316f-496a-ab30-c819a92b3137"));
 
                [Test]
                public void DefaultImageFormats ()
@@ -67,5 +68,20 @@ namespace MonoTests.System.Drawing
                        Assert.AreEqual (WmfImageFormat.Guid, ImageFormat.Wmf.Guid, "DefaultImageFormats#10");
                }
 
+               [Test]
+               public void ToStringTest ()
+               {
+                       Assert.AreEqual (BmpImageFormat.ToString (), "Bmp", "ToStringTest#1");
+                       Assert.AreEqual (EmfImageFormat.ToString (), "Emf", "ToStringTest#2");
+                       Assert.AreEqual (ExifImageFormat.ToString (), "Exif", "ToStringTest#3");
+                       Assert.AreEqual (GifImageFormat.ToString (), "Gif", "ToStringTest#4");
+                       Assert.AreEqual (TiffImageFormat.ToString (), "Tiff", "ToStringTest#5");
+                       Assert.AreEqual (PngImageFormat.ToString (), "Png", "ToStringTest#6");
+                       Assert.AreEqual (MemoryBmpImageFormat.ToString (), "MemoryBmp", "ToStringTest#7");
+                       Assert.AreEqual (IconImageFormat.ToString (), "Icon", "ToStringTest#8");
+                       Assert.AreEqual (JpegImageFormat.ToString (), "Jpeg", "ToStringTest#9");
+                       Assert.AreEqual (WmfImageFormat.ToString (), "Wmf", "ToStringTest#10");
+                       Assert.AreEqual (CustomImageFormat.ToString (), "[ImageFormat: 48749428-316f-496a-ab30-c819a92b3137]", "ToStringTest#11");
+               }
        }
 }