X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.cpp;h=2c6ce217381f4dcbf1f33bec50104eeee6c1987c;hb=2ebdf45974a0a7649b3488f9da4b8cf90a1db584;hp=6cdaef912e65062740c284559b3851c742bd102b;hpb=0466fc5fe92ae03189f45f8872fb070ef7022290;p=libs%2Fgui.git

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index 6cdaef9..2c6ce21 100644
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,13 +1,20 @@
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
+#include "bmploader.h"
 #include "imageloader.h"
 #ifdef WITH_LIBPNG
 #include "png/pngloader.h"
 #endif
+#ifdef WITH_LIBJPEG
+#include "jpeg/jpegloader.h"
+#endif
 #ifdef WITH_DEVIL
 #include "devil/devilloader.h"
 #endif
+#ifdef WITH_QUARTZ
+#include "quartz/quartzloader.h"
+#endif
 
 using namespace std;
 
@@ -15,7 +22,8 @@ namespace Msp {
 namespace Graphics {
 
 ImageLoader::ImageLoader():
-	source(0)
+	source(0),
+	state(INITIAL)
 { }
 
 ImageLoader::~ImageLoader()
@@ -40,24 +48,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);
+	Registry &registry = get_registry();
+	if(registry.changed)
+	{
+		registry.changed = false;
+		registry.loaders.sort(signature_size_compare);
+	}
+
+	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());
 
-	// 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=registry.loaders.begin(); (!loader && i!=registry.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 +84,54 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 	return loader;
 }
 
+void ImageLoader::load(Image::Data &data)
+{
+	if(state>=FINISHED)
+		throw logic_error("already loaded");
+
+	load_(data);
+	state = FINISHED;
+}
+
+ImageLoader::Registry &ImageLoader::get_registry()
+{
+	static Registry registry;
+	static bool initialized = false;
+	if(!initialized)
+	{
+		initialized = true;
+		register_loader<BmpLoader>();
+#ifdef WITH_LIBPNG
+		register_loader<PngLoader>();
+#endif
+#ifdef WITH_LIBJPEG
+		register_loader<JpegLoader>();
+#endif
+#ifdef WITH_DEVIL
+		register_loader<DevilLoader>();
+#endif
+#ifdef WITH_QUARTZ
+		register_loader<QuartzLoader>();
+#endif
+	}
+	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;
+}
+
 } // namespace Graphics
 } // namespace Msp