X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FImage.cc;h=54e9972d6264be65021286e3e2068340794527f7;hp=31d6b0287926e38e35f7fc51c58be55571cfdba5;hb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c;hpb=b357615aba1dbde81e3c6999366604e6001010a7

diff --git a/src/Moof/Image.cc b/src/Moof/Image.cc
index 31d6b02..54e9972 100644
--- a/src/Moof/Image.cc
+++ b/src/Moof/Image.cc
@@ -1,56 +1,39 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <cstdio>		// FILE
 #include <cstring>		// strncmp
 
-#include <SDL/SDL.h>
+#include <boost/algorithm/string.hpp>
+
 #include <png.h>
+#include <SDL/SDL.h>
 
+#include "Backend.hh"
+#include "Error.hh"
 #include "Image.hh"
-#include "Library.hh"
 #include "Log.hh"
+#include "Manager.hh"
 
 
 namespace Mf {
 
 
-class Image::Impl : public Library<Impl>
+class Image::Impl : public Manager<Impl>
 {
 public:
 
-	explicit Impl(const std::string& name, bool flipped = false) :
-		Library<Impl>(name),
+	explicit Impl() :
 		mContext(0),
-		mPixels(0)
-	{
-		init(getName(), flipped);
-	}
+		mPixels(0) {}
 
 	~Impl()
 	{
@@ -87,21 +70,12 @@ public:
 	}
 
 
-	SDL_Surface*	mContext;
-	char*			mPixels;
-
-	unsigned		mDepth;
-	GLuint			mColorMode;
-
-	std::string		mComment;
-
-
-private:
-
-	bool init(const std::string& filePath, bool flipped)
+	bool init(const std::string& name, bool flipped = false)
 	{
-		logInfo("opening image file...");
-		FILE* fp = fopen(filePath.c_str(), "rb");
+		std::string path = Image::getPath(name);
+
+		logInfo << "opening image file " << path << std::endl;
+		FILE* fp = fopen(path.c_str(), "rb");
 		if (!fp) return false;
 
 		png_byte	signature[8];
@@ -125,7 +99,8 @@ private:
 
 		logInfo("checking signature...");
 		bytesRead = fread(signature, 1, sizeof(signature), fp);
-		logInfo << "reading " << bytesRead << " bytes of signature" << std::endl;
+		logInfo << "reading " << bytesRead << " bytes of signature"
+				<< std::endl;
 		if (bytesRead < sizeof(signature) ||
 			png_sig_cmp(signature, 0, sizeof(signature)) != 0) goto cleanup;
 
@@ -156,7 +131,7 @@ private:
 				break;
 
 			case PNG_COLOR_TYPE_GRAY:
-				if (bpp < 8) png_set_gray_1_2_4_to_8(pngObj);
+				if (bpp < 8) png_set_expand(pngObj);
 				break;
 
 			case PNG_COLOR_TYPE_GRAY_ALPHA:
@@ -181,7 +156,7 @@ private:
 		logInfo << "num texts: " << numTexts << std::endl;
 		for (int i = 0; i < numTexts; ++i)
 		{
-			if (strncmp(texts[i].key, "Comment", 7) == 0)
+			if (strncmp(texts[i].key, "TextureInfo", 11) == 0)
 			{
 				mComment = texts[i].text;
 				break;
@@ -199,7 +174,8 @@ private:
 		{
 			for (int i = 0; i < height; ++i)
 			{
-				rows[height - 1 - i] = (png_bytep)(mPixels + i * channels * width);
+				rows[height - 1 - i] = (png_bytep)(mPixels +
+												   i * channels * width);
 			}
 		}
 		else
@@ -244,6 +220,19 @@ private:
 
 		return mContext;
 	}
+
+
+	SDL_Surface*	mContext;
+	char*			mPixels;
+
+	unsigned		mDepth;
+	GLuint			mColorMode;
+
+	std::string		mComment;
+
+private:
+
+	Backend			mBackend;
 };
 
 
@@ -277,7 +266,7 @@ unsigned Image::getPitch() const
 	return mImpl->mContext->pitch;
 }
 
-GLuint Image::getColorMode() const
+GLuint Image::getMode() const
 {
 	return mImpl->mColorMode;
 }
@@ -311,15 +300,21 @@ void Image::setAsIcon() const
 }
 
 
-
 std::string Image::getPath(const std::string& name)
 {
-	std::string path = Resource::getPath("images/" + name + ".png");
-	return path;
+	if (boost::find_last(name, ".png"))
+	{
+		return Resource::getPath(name);
+	}
+	else
+	{
+		std::string path("images/");
+		path += name;
+		path += ".png";
+		return Resource::getPath(path);
+	}
 }
 
 
 } // namespace Mf
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-