[dotgnu-pnet-commits] pnetlib ./ChangeLog System.Drawing/ColorConvert...

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Branch:         
Changes by:     Heiko Weiss <address@hidden>    06/04/24 13:38:34

Modified files:
        .              : ChangeLog 
        System.Drawing : ColorConverter.cs 

Log message:
        fixed problems with ConvertFrom( "#AABBCC" );

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/ChangeLog.diff?tr1=1.2383&tr2=1.2384&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Drawing/ColorConverter.cs.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: pnetlib/ChangeLog
diff -u pnetlib/ChangeLog:1.2383 pnetlib/ChangeLog:1.2384
--- pnetlib/ChangeLog:1.2383    Thu Apr 13 15:18:08 2006
+++ pnetlib/ChangeLog   Mon Apr 24 13:38:33 2006
@@ -1,3 +1,7 @@
+2006-04-24  Heiko Weiss  <address@hidden>
+
+       * pnetlib/System.Drawing/ColorConverter.cs: fixed ConvertFrom.
+       
 2006-04-13  Heiko Weiss  <address@hidden>
 
        * pnetlib/runtime/System/Collections/ArrayList.cs: fixed memory leak.
Index: pnetlib/System.Drawing/ColorConverter.cs
diff -u pnetlib/System.Drawing/ColorConverter.cs:1.4 
pnetlib/System.Drawing/ColorConverter.cs:1.5
--- pnetlib/System.Drawing/ColorConverter.cs:1.4        Wed Sep 15 16:08:16 2004
+++ pnetlib/System.Drawing/ColorConverter.cs    Mon Apr 24 13:38:33 2006
@@ -180,9 +180,9 @@
                                if(str[0] == '#' && str.Length == 7)
                                {
                                        // Web color 
-                                       return Color.FromArgb(
-                                                       
Int32.Parse(str.Substring(1), 
-                                                                               
        NumberStyles.HexNumber));
+                                       uint val = 
UInt32.Parse(str.Substring(1), NumberStyles.HexNumber);
+                                       val |= 0xFF000000;
+                                       return Color.FromArgb((int)val);
                                }
 
                                // Parse "[A,] R, G, B" components from the 
string.