X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.h;h=d824291eb65086aefdad641e2d9ef5dbca873a56;hb=b99a9eb342d0f6ba5509c6d9f8ab0b0b5d5d2979;hp=cb3f54ac204f303afe23e5bfc30b111ece28f33a;hpb=2ebdf45974a0a7649b3488f9da4b8cf90a1db584;p=libs%2Fgui.git

diff --git a/source/graphics/imageloader.h b/source/graphics/imageloader.h
index cb3f54a..d824291 100644
--- a/source/graphics/imageloader.h
+++ b/source/graphics/imageloader.h
@@ -2,31 +2,31 @@
 #define MSP_GRAPHICS_IMAGELOADER_H_
 
 #include "image.h"
+#include "mspgui_api.h"
 
 namespace Msp {
 namespace Graphics {
 
-class unsupported_image_format: public std::runtime_error
+class MSPGUI_API unsupported_image_format: public std::runtime_error
 {
 public:
 	unsupported_image_format(const std::string &w): std::runtime_error(w) { }
-	virtual ~unsupported_image_format() throw() { }
 };
 
-class bad_image_data: public std::runtime_error
+class MSPGUI_API bad_image_data: public std::runtime_error
 {
 public:
 	bad_image_data(const std::string &w): std::runtime_error(w) { }
-	virtual ~bad_image_data() throw() { }
 };
 
 
-class ImageLoader
+class MSPGUI_API ImageLoader
 {
 public:
 	enum State
 	{
 		INITIAL,
+		HEADERS_LOADED,
 		FINISHED
 	};
 
@@ -34,9 +34,9 @@ protected:
 	class RegisterBase
 	{
 	protected:
-		RegisterBase() { }
+		RegisterBase() = default;
 	public:
-		virtual ~RegisterBase() { }
+		virtual ~RegisterBase() = default;
 
 		virtual unsigned get_signature_size() const = 0;
 		virtual bool detect(const std::string &) const = 0;
@@ -47,35 +47,37 @@ protected:
 	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 ImageLoader *create(IO::Seekable &io) const { return new T(io); }
+		unsigned get_signature_size() const override { return T::get_signature_size(); }
+		bool detect(const std::string &s) const override { return T::detect(s); }
+		ImageLoader *create(IO::Seekable &io) const override { return new T(io); }
 	};
 
 	struct Registry
 	{
-		std::list<RegisterBase *> loaders;
-		bool changed;
+		std::vector<RegisterBase *> loaders;
+		bool changed = false;
 
-		Registry();
 		~Registry();
 	};
 
 private:
-	IO::Base *source;
-	State state;
+	IO::Base *source = nullptr;
+	State state = INITIAL;
 
 protected:
-	ImageLoader();
+	ImageLoader() = default;
 public:
 	virtual ~ImageLoader();
 
+	static bool detect_signature(const std::string &);
 	static ImageLoader *open_file(const std::string &);
 	static ImageLoader *open_io(IO::Seekable &);
 
 	virtual void load(Image::Data &);
+	virtual void load_headers(Image::Data &);
 protected:
-	virtual void load_(Image::Data &) = 0;
+	virtual void load_headers_(Image::Data &) = 0;
+	virtual void load_pixels_(Image::Data &) = 0;
 
 public:
 	State get_state() const { return state; }
@@ -84,8 +86,6 @@ public:
 	static void register_loader();
 private:
 	static Registry &get_registry();
-
-	static bool signature_size_compare(RegisterBase *, RegisterBase *);
 };
 
 template<typename T>