X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.cpp;h=9b8a42def04a6928162000a967bbefe2e71cb226;hb=43d31e73c4b97a37017757232c4ef1db355fee3a;hp=da897984449993b56e3163b5ffd8830da06e22a9;hpb=d3bc6c9c2cfaaedaabfd4b5b7bf4e1da2de51331;p=libs%2Fgui.git

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index da89798..9b8a42d 100644
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,6 +1,7 @@
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "bmploader.h"
 #include "imageloader.h"
 #ifdef WITH_LIBPNG
@@ -22,7 +23,8 @@ namespace Msp {
 namespace Graphics {
 
 ImageLoader::ImageLoader():
-	source(0)
+	source(0),
+	state(INITIAL)
 { }
 
 ImageLoader::~ImageLoader()
@@ -30,6 +32,15 @@ ImageLoader::~ImageLoader()
 	delete source;
 }
 
+bool ImageLoader::detect_signature(const std::string &sig)
+{
+	Registry &registry = get_registry();
+	for(const RegisterBase *r: registry.loaders)
+		if(r->detect(sig))
+			return true;
+	return false;
+}
+
 ImageLoader *ImageLoader::open_file(const string &fn)
 {
 	try
@@ -57,12 +68,11 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 	if(registry.loaders.empty())
 		throw unsupported_image_format("no loaders");
 
-	vector<char> sig_buf(registry.loaders.back()->get_signature_size());
-	unsigned sig_len = io.read(&sig_buf[0], sig_buf.size());
-	string signature(sig_buf.begin(), sig_buf.end());
+	string signature(registry.loaders.back()->get_signature_size(), 0);
+	unsigned sig_len = io.read(&signature[0], signature.size());
 
 	ImageLoader *loader = 0;
-	for(list<RegisterBase *>::const_iterator i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
+	for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
 		if((*i)->detect(signature))
 			loader = (*i)->create(io);
 
@@ -72,11 +82,7 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 	{
 		string sig_hex;
 		for(unsigned i=0; i<sig_len; ++i)
-		{
-			if(i)
-				sig_hex += ' ';
-			sig_hex += format("%02X", static_cast<unsigned char>(sig_buf[i]));
-		}
+			append(sig_hex, " ", format("%02X", static_cast<unsigned char>(signature[i])));
 		throw unsupported_image_format(sig_hex);
 	}
 
@@ -85,8 +91,24 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 
 void ImageLoader::load(Image::Data &data)
 {
-	load_headers(data);
-	load_data(data);
+	if(state>=FINISHED)
+		throw logic_error("already loaded");
+
+	if(state<HEADERS_LOADED)
+		load_headers_(data);
+	if(!data.pixels)
+		data.pixels = data.owned_pixels = new char[data.stride*data.height];
+	load_pixels_(data);
+	state = FINISHED;
+}
+
+void ImageLoader::load_headers(Image::Data &data)
+{
+	if(state>=HEADERS_LOADED)
+		throw logic_error("headers already loaded");
+
+	load_headers_(data);
+	state = HEADERS_LOADED;
 }
 
 ImageLoader::Registry &ImageLoader::get_registry()
@@ -125,8 +147,8 @@ ImageLoader::Registry::Registry():
 
 ImageLoader::Registry::~Registry()
 {
-	for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
-		delete *i;
+	for(auto l: loaders)
+		delete l;
 }
 
 } // namespace Graphics