[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing ColorTranslator.cs,1.1,1.2 Font.cs,1.3,1.4 Graphics.cs,1.4,1.5

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing
In directory subversions:/tmp/cvs-serv29918/System.Drawing

Modified Files:
        ColorTranslator.cs Font.cs Graphics.cs 
Log Message:


Fix some compilation issues for csc (Neil Cawse <address@hidden>).


Index: ColorTranslator.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/ColorTranslator.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ColorTranslator.cs  7 Jun 2003 22:40:57 -0000       1.1
--- ColorTranslator.cs  13 Jun 2003 21:55:55 -0000      1.2
***************
*** 86,90 ****
        public static Color FromWin32(int win32Color)
                        {
!                               if((win32Color & (int)0xFF000000) != 
(int)0x80000000)
                                {
                                        return Color.FromArgb(win32Color & 0xFF,
--- 86,91 ----
        public static Color FromWin32(int win32Color)
                        {
!                               if((win32Color & unchecked((int)0xFF000000))
!                                               != unchecked((int)0x80000000))
                                {
                                        return Color.FromArgb(win32Color & 0xFF,

Index: Font.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Font.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Font.cs     9 Jun 2003 22:15:09 -0000       1.3
--- Font.cs     13 Jun 2003 21:55:55 -0000      1.4
***************
*** 234,237 ****
--- 234,238 ----
                                                case GraphicsUnit.World:
                                                case GraphicsUnit.Pixel:
+                                               default:
                                                {
                                                        adjust = 72.0f / 
Graphics.DefaultScreenDpi;

Index: Graphics.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Graphics.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Graphics.cs 12 Jun 2003 02:55:48 -0000      1.4
--- Graphics.cs 13 Jun 2003 21:55:55 -0000      1.5
***************
*** 2382,2385 ****
--- 2382,2390 ----
                                        newY = (float)y;
                                }
+                               else
+                               {
+                                       newX = (float)x;
+                                       newY = (float)y;
+                               }
  
                                // Apply the page scale factor.