Avoid using std::list

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index 52b087490d21b58612219952ec89844ad06c0e2a..64033661360741443185bc9fe004d1da85953dfb 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,8 +1,10 @@
+#include "imageloader.h"
+#include <msp/core/algorithm.h>
 #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"
 #endif
@@ -21,16 +23,20 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-ImageLoader::ImageLoader():
-       source(0),
-       state(INITIAL)
-{ }
-
 ImageLoader::~ImageLoader()
 {
        delete source;
 }
 
+bool ImageLoader::detect_signature(const string &sig)
+{
+       Registry &registry = get_registry();
+       for(const RegisterBase *r: registry.loaders)
+               if(r->detect(sig))
+                       return true;
+       return false;
+}
+
 ImageLoader *ImageLoader::open_file(const string &fn)
 {
        try
@@ -52,18 +58,17 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        if(registry.changed)
        {
                registry.changed = false;
-               registry.loaders.sort(signature_size_compare);
+               sort(registry.loaders, 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());
+       string signature(registry.loaders.back()->get_signature_size(), 0);
+       unsigned sig_len = io.read(&signature[0], signature.size());
 
-       ImageLoader *loader = 0;
-       for(list<RegisterBase *>::const_iterator i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
+       ImageLoader *loader = nullptr;
+       for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
                if((*i)->detect(signature))
                        loader = (*i)->create(io);
 
@@ -73,11 +78,7 @@ 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>(signature[i])));
                throw unsupported_image_format(sig_hex);
        }
 
@@ -136,14 +137,10 @@ bool ImageLoader::signature_size_compare(RegisterBase *r1, RegisterBase *r2)
 }
 
 
-ImageLoader::Registry::Registry():
-       changed(false)
-{ }
-
 ImageLoader::Registry::~Registry()
 {
-       for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
-               delete *i;
+       for(auto l: loaders)
+               delete l;
 }
 
 } // namespace Graphics