Use the append function to build hex dump

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index fbba25cd75ae59ce6e194134caea9141e79a2177..e224af63cd161495a7e13a7ee795c92273864678 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,6 +1,8 @@
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
+#include <msp/strings/utils.h>
+#include "bmploader.h"
 #include "imageloader.h"
 #ifdef WITH_LIBPNG
 #include "png/pngloader.h"
@@ -20,10 +22,9 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-bool ImageLoader::registered_loaders_changed = false;
-
 ImageLoader::ImageLoader():
-       source(0)
+       source(0),
+       state(INITIAL)
 { }
 
 ImageLoader::~ImageLoader()
@@ -48,35 +49,22 @@ ImageLoader *ImageLoader::open_file(const string &fn)
 
 ImageLoader *ImageLoader::open_io(IO::Seekable &io)
 {
-#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);
 
@@ -86,29 +74,57 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        {
                string sig_hex;
                for(unsigned i=0; i<sig_len; ++i)
-               {
-                       if(i)
-                               sig_hex += ' ';
-                       sig_hex += format("%02X", static_cast<unsigned char>(sig_buf[i]));
-               }
+                       append(sig_hex, " ", format("%02X", static_cast<unsigned char>(sig_buf[i])));
                throw unsupported_image_format(sig_hex);
        }
 
        return loader;
 }
 
-
-ImageLoader::RegisterBase::RegisterBase()
+void ImageLoader::load(Image::Data &data)
 {
-       get_registered_loaders().push_back(this);
-       registered_loaders_changed = true;
+       if(state>=FINISHED)
+               throw logic_error("already loaded");
+
+       if(state<HEADERS_LOADED)
+               load_headers_(data);
+       if(!data.pixels)
+               data.pixels = data.owned_pixels = new char[data.stride*data.height];
+       load_pixels_(data);
+       state = FINISHED;
 }
 
+void ImageLoader::load_headers(Image::Data &data)
+{
+       if(state>=HEADERS_LOADED)
+               throw logic_error("headers already loaded");
 
-list<ImageLoader::RegisterBase *> &ImageLoader::get_registered_loaders()
+       load_headers_(data);
+       state = HEADERS_LOADED;
+}
+
+ImageLoader::Registry &ImageLoader::get_registry()
 {
-       static list<RegisterBase *> regs;
-       return regs;
+       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)
@@ -116,5 +132,16 @@ 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