X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.h;h=f0b8d52c36412ec6cf3e9901d5b2a43c51aefdd6;hb=d3bc6c9c2cfaaedaabfd4b5b7bf4e1da2de51331;hp=c06a7592fcf75bc1cf9ea918ceae470424ad785d;hpb=21b0c47700f1b570b6129384ce0b96a0c6b48ffd;p=libs%2Fgui.git

diff --git a/source/graphics/imageloader.h b/source/graphics/imageloader.h
index c06a759..f0b8d52 100644
--- a/source/graphics/imageloader.h
+++ b/source/graphics/imageloader.h
@@ -23,11 +23,11 @@ public:
 
 class ImageLoader
 {
-private:
+protected:
 	class RegisterBase
 	{
 	protected:
-		RegisterBase();
+		RegisterBase() { }
 	public:
 		virtual ~RegisterBase() { }
 
@@ -36,23 +36,27 @@ private:
 		virtual ImageLoader *create(IO::Seekable &) const = 0;
 	};
 
-protected:
 	template<typename T>
-	class Register: RegisterBase
+	class RegisteredLoader: public RegisterBase
 	{
 	public:
 		virtual unsigned get_signature_size() const { return T::get_signature_size(); }
 		virtual bool detect(const std::string &s) const { return T::detect(s); }
-		virtual T *create(IO::Seekable &io) const { return new T(io); }
+		virtual ImageLoader *create(IO::Seekable &io) const { return new T(io); }
+	};
+
+	struct Registry
+	{
+		std::list<RegisterBase *> loaders;
+		bool changed;
+
+		Registry();
+		~Registry();
 	};
 
 private:
 	IO::Base *source;
 
-	static std::list<RegisterBase *> &get_registered_loaders();
-	static bool registered_loaders_changed;
-	static bool signature_size_compare(RegisterBase *, RegisterBase *);
-
 protected:
 	ImageLoader();
 public:
@@ -61,9 +65,26 @@ public:
 	static ImageLoader *open_file(const std::string &);
 	static ImageLoader *open_io(IO::Seekable &);
 
-	virtual void load(Image::Data &) = 0;
+	virtual void load(Image::Data &);
+	virtual void load_headers(Image::Data &) { }
+	virtual void load_data(Image::Data &) { }
+
+	template<typename T>
+	static void register_loader();
+private:
+	static Registry &get_registry();
+
+	static bool signature_size_compare(RegisterBase *, RegisterBase *);
 };
 
+template<typename T>
+void ImageLoader::register_loader()
+{
+	Registry &registry = get_registry();
+	registry.loaders.push_back(new RegisteredLoader<T>);
+	registry.changed = true;
+}
+
 } // namespace Graphics
 } // namespace Msp