Changeset 2926 for libpipi/trunk/pipi-sharp/Picture.cs

Timestamp:

10/11/08 23:56:21 (5 years ago)

Author:

sam

Message:

ThePimp?: make image loading more robust.

File:

• libpipi/trunk/pipi-sharp/Picture.cs (modified) (2 diffs)

libpipi/trunk/pipi-sharp/Picture.cs

@@ -22 +22 @@
     {
         private IntPtr _picture;
+        private string _filename;
 
-        public readonly string FileName;
+        public string FileName
+        {
+            get { return _filename; }
+        }
 
-        [DllImport("libpipi.dll", CallingConvention=CallingConvention.Cdecl),
-         SuppressUnmanagedCodeSecurity]
-        private static extern IntPtr pipi_load(string s);
-        public Picture(string s)
+        private Picture(IntPtr p)
         {
-            _picture = pipi_load(s);
-            FileName = s;
+            _picture = p;
         }
 
@@ -40 +40 @@
         {
             pipi_free(_picture);
+        }
+
+        [DllImport("libpipi.dll", CallingConvention=CallingConvention.Cdecl),
+         SuppressUnmanagedCodeSecurity]
+        private static extern IntPtr pipi_load(string s);
+        public static Picture Load(string s)
+        {
+            IntPtr p = pipi_load(s);
+            if(p == IntPtr.Zero)
+                return null;
+
+            Picture ret = new Picture(p);
+            ret._filename = s;
+            return ret;
         }