[Dotgnu-pnet-commits] pnetlib/System.Drawing Bitmap.cs, 1.10, 1.11 Icon.cs, 1.5, 1.6 Image.cs, 1.9, 1.10

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        Bitmap.cs Icon.cs Image.cs 
Log Message:


Fix some profile-related build issues.


Index: Icon.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Icon.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Icon.cs     25 Nov 2003 22:33:55 -0000      1.5
--- Icon.cs     26 Nov 2003 01:07:10 -0000      1.6
***************
*** 85,89 ****
        public Icon(Type type, String resource)
                        {
!                               Stream stream = 
type.Module.Assembly.GetManifestResourceStream
                                        (type, resource);
                                if(stream == null)
--- 85,89 ----
        public Icon(Type type, String resource)
                        {
!                               Stream stream = Bitmap.GetManifestResourceStream
                                        (type, resource);
                                if(stream == null)

Index: Bitmap.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Bitmap.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Bitmap.cs   25 Nov 2003 22:33:55 -0000      1.10
--- Bitmap.cs   26 Nov 2003 01:07:10 -0000      1.11
***************
*** 82,87 ****
        public Bitmap(Type type, String resource)
                        {
!                               Stream stream = 
type.Module.Assembly.GetManifestResourceStream
!                                       (type, resource);
                                if(stream == null)
                                {
--- 82,86 ----
        public Bitmap(Type type, String resource)
                        {
!                               Stream stream = GetManifestResourceStream(type, 
resource);
                                if(stream == null)
                                {
***************
*** 117,120 ****
--- 116,135 ----
                        : base(info, context) {}
  #endif
+ 
+       // Get a manifest resource stream.  Profile-safe version.
+       internal static Stream GetManifestResourceStream(Type type, String name)
+                       {
+                       #if !ECMA_COMPAT
+                               return 
type.Module.Assembly.GetManifestResourceStream
+                                               (type, name);
+                       #else
+                               if(type.Namespace != null && type.Namespace != 
String.Empty)
+                               {
+                                       return 
type.Module.Assembly.GetManifestResourceStream
+                                               (type.Namespace + "." + name);
+                               }
+                               return 
type.Module.Assembly.GetManifestResourceStream(name);
+                       #endif
+                       }
  
        // Clone this bitmap and transform it into a new pixel format

Index: Image.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Image.cs,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Image.cs    22 Nov 2003 23:34:27 -0000      1.9
--- Image.cs    26 Nov 2003 01:07:10 -0000      1.10
***************
*** 468,472 ****
                                }
                                frameDimensionsList = new Guid [0];
-                       #endif
                                this.dgImage = dgImage;
                                // If we are loading an icon, set the size of 
the image
--- 468,471 ----
***************
*** 482,485 ****
--- 481,489 ----
                                        height = dgImage.Height;
                                }
+                       #else
+                               this.dgImage = dgImage;
+                               width = dgImage.GetFrame(0).Width;
+                               height = dgImage.GetFrame(0).Height;
+                       #endif
                                horizontalResolution = 
Graphics.DefaultScreenDpi;
                                verticalResolution = Graphics.DefaultScreenDpi;