Add some state checking to ImageLoader

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index 679f797adcc2bae5d7499c7cc41f6254ef3bb723..2c6ce217381f4dcbf1f33bec50104eeee6c1987c 100644 (file)
--- 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()
@@ -27,7 +35,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;
@@ -38,25 +46,30 @@ ImageLoader *ImageLoader::open_file(const string &fn)
        }
 }
 
-ImageLoader *ImageLoader::open_io(IO::Base &io)
+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);
+       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, sig);
-#endif
-#ifdef WITH_DEVIL
-       else if(DevilLoader::detect(sig))
-               loader = new DevilLoader(io, sig);
-#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)
@@ -71,5 +84,54 @@ ImageLoader *ImageLoader::open_io(IO::Base &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