X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.cpp;h=55d2dfb1b8f8c3f4cab2ebd3c9bcd93a0a0e547e;hb=b99a9eb342d0f6ba5509c6d9f8ab0b0b5d5d2979;hp=fa6fcf802b2a57eb6d852e34c6363d375e521ba4;hpb=054fca09f0bbd64fdbd6406a0643de938a9cd4fb;p=libs%2Fgui.git

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index fa6fcf8..55d2dfb 100644
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,8 +1,10 @@
+#include "imageloader.h"
+#include <msp/core/algorithm.h>
 #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
 #include "png/pngloader.h"
 #endif
@@ -21,16 +23,20 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-ImageLoader::ImageLoader():
-	source(0),
-	state(INITIAL)
-{ }
-
 ImageLoader::~ImageLoader()
 {
 	delete source;
 }
 
+bool ImageLoader::detect_signature(const 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
@@ -52,18 +58,19 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 	if(registry.changed)
 	{
 		registry.changed = false;
-		registry.loaders.sort(signature_size_compare);
+		sort(registry.loaders,  [](RegisterBase *r1, RegisterBase *r2){
+			return r1->get_signature_size()<r2->get_signature_size();
+		});
 	}
 
 	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)
+	ImageLoader *loader = nullptr;
+	for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
 		if((*i)->detect(signature))
 			loader = (*i)->create(io);
 
@@ -73,11 +80,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);
 	}
 
@@ -91,6 +94,8 @@ void ImageLoader::load(Image::Data &data)
 
 	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;
 }
@@ -128,20 +133,11 @@ ImageLoader::Registry &ImageLoader::get_registry()
 	return registry;
 }
 
-bool ImageLoader::signature_size_compare(RegisterBase *r1, RegisterBase *r2)
-{
-	return r1->get_signature_size()<r2->get_signature_size();
-}
-
-
-ImageLoader::Registry::Registry():
-	changed(false)
-{ }
 
 ImageLoader::Registry::~Registry()
 {
-	for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
-		delete *i;
+	for(auto l: loaders)
+		delete l;
 }
 
 } // namespace Graphics