open a correct stream.

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

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.jvm.cs b/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.jvm.cs
index aac79fd1f2668f5b148610d06c2bcaa24225eed6..1f67bc1a326ba01600026811d0cec76e7f7b64ed 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Text/PrivateFontCollection.jvm.cs
@@ -27,6 +27,7 @@
 //\r
 \r
 using System;\r
+using System.IO;\r
 using awt = java.awt;\r
 using io = java.io;\r
 using vmw.common;\r
@@ -43,15 +44,11 @@ namespace System.Drawing.Text
                }\r
 \r
                public void AddFontFile(string filename) {\r
-                       io.File file = IOUtils.getJavaFile(filename);\r
-                       io.FileInputStream stream = new io.FileInputStream(file);\r
-                       try {\r
+                       using(FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read)) {\r
+                               io.InputStream stream = vmw.common.IOUtils.ToInputStream (fs);\r
                                awt.Font font = awt.Font.createFont(awt.Font.TRUETYPE_FONT, stream);\r
                                AddFont(font);\r
                        }\r
-                       finally {\r
-                               stream.close();\r
-                       }\r
                }\r
 #if INTPTR_SUPPORT\r
                public void AddMemoryFont(IntPtr memory, int length) {\r

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/changelog b/mcs/class/System.Drawing/System.Drawing.Text/changelog
index 54aa038afaa41dc29956c86032b62c3620a54ccc..00db62345da164da4c6fd0eb1a2362c5fb4b26a3 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Text/changelog
+++ b/mcs/class/System.Drawing/System.Drawing.Text/changelog
@@ -1,3 +1,7 @@
+2005-11-16 Konstantin Triger <kostat@mainsoft.com>
+
+        * PrivateFontCollection.jvm.cs: open a correct stream.
+
 2005-11-13 Konstantin Triger <kostat@mainsoft.com>
 
        * Added LineLayout.jvm.cs, TextLineIterator.jvm.cs for text support

diff --git a/mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs b/mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
index d57b4fad31fdaeb619072b5054211d71309ec0bf..5e9f830dc1e8d9d9ddda7f5c2b2447f4c4839826 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing/Bitmap.jvm.cs
@@ -86,11 +86,11 @@ namespace System.Drawing
                }
 
                internal Bitmap (string filename, bool useIcm, ImageFormat format) {
-                       // TBD: useIcm param
-                       java.io.File file = vmw.common.IOUtils.getJavaFile (filename);
-                       if (!file.exists ())
-                                throw new System.IO.FileNotFoundException (filename);
-                       Initialize (new stream.FileImageInputStream (file), format);
+                       using(FileStream stream = new FileStream(filename, FileMode.Open, FileAccess.Read)) {
+                               // TBD: useIcm param
+                               io.InputStream jis = vmw.common.IOUtils.ToInputStream (stream);
+                               Initialize (new stream.MemoryCacheImageInputStream (jis), format);
+                       }
                }
 
                public Bitmap (Type type, string resource) {

diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 93580385e938884792d3d4c3a16ba87b212fe4b4..4c5ab7f599ced3fe7fe1518bdfec3f0eedca1c72 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16 Konstantin Triger <kostat@mainsoft.com>
+
+        * Bitmap.jvm.cs: open a correct stream.
+
 2005-11-16 Konstantin Triger <kostat@mainsoft.com>
 
         * FontFamily.jvm.cs, Font.jvm.cs: throw exception if invalid params.