Author: spouliot
Date: 2006-09-11 20:49:46 -0400 (Mon, 11 Sep 2006)
New Revision: 65266

Modified:
   trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
   trunk/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs
Log:
2006-09-11  Sebastien Pouliot  <[EMAIL PROTECTED]>

        * ImageConverter.cs: Fixed ConvertTo to deal with null values (#79331)
        and not to "return new NotSupportedException", throwing them is better



Modified: trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog     2006-09-12 
00:17:10 UTC (rev 65265)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ChangeLog     2006-09-12 
00:49:46 UTC (rev 65266)
@@ -1,3 +1,8 @@
+2006-09-11  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * ImageConverter.cs: Fixed ConvertTo to deal with null values (#79331)
+       and not to "return new NotSupportedException", throwing them is better
+
 2006-09-07  Kornél Pál  <[EMAIL PROTECTED]>
 
        * ComIStreamMarshaler.cs: ManagedToNativeWrapper: Dispose COM vtable

Modified: trunk/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs     
2006-09-12 00:17:10 UTC (rev 65265)
+++ trunk/mcs/class/System.Drawing/System.Drawing/ImageConverter.cs     
2006-09-12 00:49:46 UTC (rev 65266)
@@ -75,17 +75,24 @@
                        return Image.FromStream (ms);   
                }
 
-               public override object ConvertTo (ITypeDescriptorContext 
context, CultureInfo culture, object val, Type destType )
+               public override object ConvertTo (ITypeDescriptorContext 
context, CultureInfo culture, object val, Type destType)
                {
-                       if ((val is System.Drawing.Image) && (destType == 
typeof (System.String)))
-                               return val.ToString ();
-                       else if (CanConvertTo (null, destType)){
-                               //came here means destType is byte array ;
-                               MemoryStream ms = new MemoryStream ();
-                               ((Image)val).Save (ms, ((Image)val).RawFormat);
-                               return ms.GetBuffer ();
-                       }else
-                               return new NotSupportedException 
("ImageConverter can not convert from " + val.GetType ());
+                       if (val == null)
+                               return "(none)";
+
+                       if (val is System.Drawing.Image) {
+                               if (destType == typeof (string)) {
+                                       return val.ToString ();
+                               } else if (CanConvertTo (null, destType)) {
+                                       //came here means destType is byte 
array ;
+                                       MemoryStream ms = new MemoryStream ();
+                                       ((Image)val).Save (ms, 
((Image)val).RawFormat);
+                                       return ms.GetBuffer ();
+                               }
+                       }
+
+                       string msg = Locale.GetText ("ImageConverter can not 
convert from type '{0}'.", val.GetType ());
+                       throw new NotSupportedException (msg);
                }
 
                public override PropertyDescriptorCollection GetProperties 
(ITypeDescriptorContext context, object val, Attribute[] attribs)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to