use Interface.GetStreamFromPath to handle either file or resource in

every loading places

1 files changed, 1 insertions, 19 deletions

diff --git a/src/BmpPicture.cs b/src/BmpPicture.cs
index 053c8fbf..2f6d11d6 100644
--- a/src/BmpPicture.cs
+++ b/src/BmpPicture.cs
@@ -32,32 +32,14 @@ namespace go
 		{}
 		public BmpPicture (string path) : base(path)
 		{}
-
-		protected override void loadFromRessource (string resId)
+		protected override void loadFromStream (Stream stream)
 		{
-			Stream stream = null;
-
-			//first, search for ressource in main executable assembly
-			stream = System.Reflection.Assembly.GetEntryAssembly().GetManifestResourceStream(resId);
-			if (stream == null)//try to find ressource in golib assembly				
-				stream = System.Reflection.Assembly.GetExecutingAssembly().GetManifestResourceStream(resId);
-			if (stream == null)
-				return;
-
 			using (MemoryStream ms = new MemoryStream ()) {
 				stream.CopyTo (ms);
 				loadBitmap (new System.Drawing.Bitmap (ms));	
 			}
 		}
 
-		protected override void loadFromFile (string path)
-		{
-			if (!File.Exists(path))
-				return;
-
-			loadBitmap (new System.Drawing.Bitmap (path));
-		}
-
 		//load image via System.Drawing.Bitmap, cairo load png only
 		void loadBitmap (System.Drawing.Bitmap bitmap)
 		{