Add decorations for things which should be exported from the library

[libs/gui.git] / source / graphics / imageloader.h

diff --git a/source/graphics/imageloader.h b/source/graphics/imageloader.h
index f0b8d52c36412ec6cf3e9901d5b2a43c51aefdd6..345068cdc34a36bf41795f7a88059facd6c40516 100644 (file)
--- a/source/graphics/imageloader.h
+++ b/source/graphics/imageloader.h
@@ -2,27 +2,34 @@
 #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
+       };
+
 protected:
        class RegisterBase
        {
@@ -40,41 +47,45 @@ 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;
+       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 &) { }
-       virtual void load_data(Image::Data &) { }
+       virtual void load_headers(Image::Data &);
+protected:
+       virtual void load_headers_(Image::Data &) = 0;
+       virtual void load_pixels_(Image::Data &) = 0;
+
+public:
+       State get_state() const { return state; }
 
        template<typename T>
        static void register_loader();
 private:
        static Registry &get_registry();
-
-       static bool signature_size_compare(RegisterBase *, RegisterBase *);
 };
 
 template<typename T>