Streamline iterators and loop constructs

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index e224af63cd161495a7e13a7ee795c92273864678..9b8a42def04a6928162000a967bbefe2e71cb226 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -32,6 +32,15 @@ ImageLoader::~ImageLoader()
        delete source;
 }
 
+bool ImageLoader::detect_signature(const std::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
@@ -59,12 +68,11 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        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)
+       for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
                if((*i)->detect(signature))
                        loader = (*i)->create(io);
 
@@ -74,7 +82,7 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        {
                string sig_hex;
                for(unsigned i=0; i<sig_len; ++i)
-                       append(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);
        }
 
@@ -139,8 +147,8 @@ ImageLoader::Registry::Registry():
 
 ImageLoader::Registry::~Registry()
 {
-       for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
-               delete *i;
+       for(auto l: loaders)
+               delete l;
 }
 
 } // namespace Graphics