X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FImage.cc;fp=src%2FMoof%2FImage.cc;h=2237c88bf1bb059b208907c41e48ca3bb590d12e;hp=54e9972d6264be65021286e3e2068340794527f7;hb=90b2c7fb10b244b781b84965a0d36f1f323ee94d;hpb=8148b51f1bec8f662672d3ca36eea1784991e5cc

diff --git a/src/Moof/Image.cc b/src/Moof/Image.cc
index 54e9972..2237c88 100644
--- a/src/Moof/Image.cc
+++ b/src/Moof/Image.cc
@@ -70,13 +70,13 @@ public:
 	}
 
 
-	bool init(const std::string& name, bool flipped = false)
+	void init(const std::string& name, bool flipped = false)
 	{
-		std::string path = Image::getPath(name);
+		std::string path(name);
 
 		logInfo << "opening image file " << path << std::endl;
-		FILE* fp = fopen(path.c_str(), "rb");
-		if (!fp) return false;
+		FILE* fp = Image::openFile(path);
+		if (!fp) return;
 
 		png_byte	signature[8];
 		size_t		bytesRead;
@@ -217,8 +217,6 @@ public:
 								pngInfo    ? &pngInfo    : 0,
 								pngInfoEnd ? &pngInfoEnd : 0);
 		fclose(fp);
-
-		return mContext;
 	}
 
 
@@ -300,19 +298,14 @@ void Image::setAsIcon() const
 }
 
 
-std::string Image::getPath(const std::string& name)
+bool Image::getPath(std::string& name)
 {
-	if (boost::find_last(name, ".png"))
-	{
-		return Resource::getPath(name);
-	}
-	else
-	{
-		std::string path("images/");
-		path += name;
-		path += ".png";
-		return Resource::getPath(path);
-	}
+	return Resource::getPath(name, "images/", "png");
+}
+
+FILE* Image::openFile(std::string& name)
+{
+	return Resource::openFile(name, "images/", "png");
 }