X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.cpp;h=06b70d16862e890997fd274b91cb0da7ff3e273a;hb=2c21eefd7cb9369bc3d9b801d49379d6c09a4eab;hp=daedab6c5b57e80539c580602dcc5c07a3f923f5;hpb=8e403dbbcde6efee1862f6d501ce30a3e7ba81c4;p=libs%2Fgui.git

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index daedab6..06b70d1 100644
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -2,18 +2,14 @@
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
 #include "imageloader.h"
-#ifdef WITH_LIBPNG
-#include "png/pngloader.h"
-#endif
-#ifdef WITH_DEVIL
-#include "devil/devilloader.h"
-#endif
 
 using namespace std;
 
 namespace Msp {
 namespace Graphics {
 
+bool ImageLoader::registered_loaders_changed = false;
+
 ImageLoader::ImageLoader():
 	source(0)
 { }
@@ -27,7 +23,7 @@ ImageLoader *ImageLoader::open_file(const string &fn)
 {
 	try
 	{
-		RefPtr<IO::File> file = new IO::BufferedFile(fn);
+		RefPtr<IO::BufferedFile> file = new IO::BufferedFile(fn);
 		ImageLoader *loader = open_io(*file);
 		loader->source = file.release();
 		return loader;
@@ -40,24 +36,28 @@ ImageLoader *ImageLoader::open_file(const string &fn)
 
 ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 {
-	char sig_buf[8];
-	unsigned sig_len = io.read(sig_buf, sizeof(sig_buf));
-	string sig(sig_buf, sig_len);
-	io.seek(0, IO::S_BEG);
+	list<RegisterBase *> &loaders = get_registered_loaders();
+	if(registered_loaders_changed)
+	{
+		registered_loaders_changed = false;
+		loaders.sort(signature_size_compare);
+	}
+
+	if(loaders.empty())
+		throw unsupported_image_format("no loaders");
+
+	vector<char> sig_buf(loaders.back()->get_signature_size());
+	unsigned sig_len = io.read(&sig_buf[0], sig_buf.size());
+	string signature(sig_buf.begin(), sig_buf.end());
 
-	// TODO register loader classes automatically
 	ImageLoader *loader = 0;
-	if(0)
-		;
-#ifdef WITH_LIBPNG
-	else if(PngLoader::detect(sig))
-		loader = new PngLoader(io);
-#endif
-#ifdef WITH_DEVIL
-	else if(DevilLoader::detect(sig))
-		loader = new DevilLoader(io);
-#endif
-	else
+	for(list<RegisterBase *>::const_iterator i=loaders.begin(); (!loader && i!=loaders.end()); ++i)
+		if((*i)->detect(signature))
+			loader = (*i)->create(io);
+
+	io.seek(0, IO::S_BEG);
+
+	if(!loader)
 	{
 		string sig_hex;
 		for(unsigned i=0; i<sig_len; ++i)
@@ -72,5 +72,24 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 	return loader;
 }
 
+
+ImageLoader::RegisterBase::RegisterBase()
+{
+	get_registered_loaders().push_back(this);
+	registered_loaders_changed = true;
+}
+
+
+list<ImageLoader::RegisterBase *> &ImageLoader::get_registered_loaders()
+{
+	static list<RegisterBase *> regs;
+	return regs;
+}
+
+bool ImageLoader::signature_size_compare(RegisterBase *r1, RegisterBase *r2)
+{
+	return r1->get_signature_size()<r2->get_signature_size();
+}
+
 } // namespace Graphics
 } // namespace Msp