2008-03-03 Ivan N. Zlatev <contact@i-nz.net>

	* ImageFormatConverter.cs: Perform a case insensitive comparison
	instead of a case sensitive one.
	[Fixes bug #366567]

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

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 5b896a319276e0471aef4cbd57875ab25ca2bb23..404f8b64e67a61263a97af52246878101a76fb83 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-03  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * ImageFormatConverter.cs: Perform a case insensitive comparison 
+       instead of a case sensitive one.
+       [Fixes bug #366567]
+
 2008-03-03  Sebastien Pouliot  <sebastien@ximian.com>
 
        * Icon.cs: Don't require icon entries when creating a new icon 

diff --git a/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs b/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs
index 28e695d053faf183b6a6929c27ceb7ed6a95a8e7..e776fa6fd58226c341f8c4a88e6b3db1662a77a7 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs
+++ b/mcs/class/System.Drawing/System.Drawing/ImageFormatConverter.cs
@@ -99,28 +99,26 @@ namespace System.Drawing
                                        return ImageFormat.Wmf;
                        } else {
                                // case #3, this is probably a short format
-                               switch (strFormat) {
-                               case "Bmp":
+                               if (String.Compare (strFormat, "Bmp", true) == 0)
                                        return ImageFormat.Bmp;
-                               case "Emf":
+                               else if (String.Compare (strFormat, "Emf", true) == 0)
                                        return ImageFormat.Emf;
-                               case "Exif":
+                               else if (String.Compare (strFormat, "Exif", true) == 0)
                                        return ImageFormat.Exif;
-                               case "Gif":
+                               else if (String.Compare (strFormat, "Gif", true) == 0)
                                        return ImageFormat.Gif;
-                               case "Icon":
+                               else if (String.Compare (strFormat, "Icon", true) == 0)
                                        return ImageFormat.Icon;
-                               case "Jpeg":
+                               else if (String.Compare (strFormat, "Jpeg", true) == 0)
                                        return ImageFormat.Jpeg;
-                               case "MemoryBmp":
+                               else if (String.Compare (strFormat, "MemoryBmp", true) == 0)
                                        return ImageFormat.MemoryBmp;
-                               case "Png":
+                               else if (String.Compare (strFormat, "Png", true) == 0)
                                        return ImageFormat.Png;
-                               case "Tiff":
+                               else if (String.Compare (strFormat, "Tiff", true) == 0)
                                        return ImageFormat.Tiff;
-                               case "Wmf":
+                               else if (String.Compare (strFormat, "Wmf", true) == 0)
                                        return ImageFormat.Wmf;
-                               }
                        }
                        // last case, this is an unknown string
                        return base.ConvertFrom (context, culture, val);