Revert some changes which accidentally got included in d3bc6c9

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index 965c7b3cb78dbaa76c659efd0ff3be60a9a00787..b2a126e79df5de3f64864fc5942f6f51a13ffc5b 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -21,8 +21,6 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-bool ImageLoader::registered_loaders_changed = false;
-
 ImageLoader::ImageLoader():
        source(0)
 { }
@@ -49,36 +47,22 @@ ImageLoader *ImageLoader::open_file(const string &fn)
 
 ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 {
-       (void)RegisteredImageLoader<BmpLoader>::reg;
-#ifdef WITH_LIBPNG
-       (void)RegisteredImageLoader<PngLoader>::reg;
-#endif
-#ifdef WITH_LIBJPEG
-       (void)RegisteredImageLoader<JpegLoader>::reg;
-#endif
-#ifdef WITH_DEVIL
-       (void)RegisteredImageLoader<DevilLoader>::reg;
-#endif
-#ifdef WITH_QUARTZ
-       (void)RegisteredImageLoader<QuartzLoader>::reg;
-#endif
-
-       list<RegisterBase *> &loaders = get_registered_loaders();
-       if(registered_loaders_changed)
+       Registry &registry = get_registry();
+       if(registry.changed)
        {
-               registered_loaders_changed = false;
-               loaders.sort(signature_size_compare);
+               registry.changed = false;
+               registry.loaders.sort(signature_size_compare);
        }
 
-       if(loaders.empty())
+       if(registry.loaders.empty())
                throw unsupported_image_format("no loaders");
 
-       vector<char> sig_buf(loaders.back()->get_signature_size());
+       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());
 
        ImageLoader *loader = 0;
-       for(list<RegisterBase *>::const_iterator i=loaders.begin(); (!loader && i!=loaders.end()); ++i)
+       for(list<RegisterBase *>::const_iterator i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
                if((*i)->detect(signature))
                        loader = (*i)->create(io);
 
@@ -99,23 +83,44 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        return loader;
 }
 
-
-ImageLoader::RegisterBase::RegisterBase()
+ImageLoader::Registry &ImageLoader::get_registry()
 {
-       get_registered_loaders().push_back(this);
-       registered_loaders_changed = true;
+       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;
 }
 
-
-list<ImageLoader::RegisterBase *> &ImageLoader::get_registered_loaders()
+bool ImageLoader::signature_size_compare(RegisterBase *r1, RegisterBase *r2)
 {
-       static list<RegisterBase *> regs;
-       return regs;
+       return r1->get_signature_size()<r2->get_signature_size();
 }
 
-bool ImageLoader::signature_size_compare(RegisterBase *r1, RegisterBase *r2)
+
+ImageLoader::Registry::Registry():
+       changed(false)
+{ }
+
+ImageLoader::Registry::~Registry()
 {
-       return r1->get_signature_size()<r2->get_signature_size();
+       for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
+               delete *i;
 }
 
 } // namespace Graphics