Use lambdas for comparison functions

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

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index 0746f6fdef5c3bfe07ed486567622996a30033ea..55d2dfb1b8f8c3f4cab2ebd3c9bcd93a0a0e547e 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -1,4 +1,5 @@
 #include "imageloader.h"
+#include <msp/core/algorithm.h>
 #include <msp/core/refptr.h>
 #include <msp/io/file.h>
 #include <msp/strings/format.h>
@@ -22,17 +23,12 @@ using namespace std;
 namespace Msp {
 namespace Graphics {
 
-ImageLoader::ImageLoader():
-       source(0),
-       state(INITIAL)
-{ }
-
 ImageLoader::~ImageLoader()
 {
        delete source;
 }
 
-bool ImageLoader::detect_signature(const std::string &sig)
+bool ImageLoader::detect_signature(const string &sig)
 {
        Registry &registry = get_registry();
        for(const RegisterBase *r: registry.loaders)
@@ -62,7 +58,9 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        if(registry.changed)
        {
                registry.changed = false;
-               registry.loaders.sort(signature_size_compare);
+               sort(registry.loaders,  [](RegisterBase *r1, RegisterBase *r2){
+                       return r1->get_signature_size()<r2->get_signature_size();
+               });
        }
 
        if(registry.loaders.empty())
@@ -71,7 +69,7 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        string signature(registry.loaders.back()->get_signature_size(), 0);
        unsigned sig_len = io.read(&signature[0], signature.size());
 
-       ImageLoader *loader = 0;
+       ImageLoader *loader = nullptr;
        for(auto i=registry.loaders.begin(); (!loader && i!=registry.loaders.end()); ++i)
                if((*i)->detect(signature))
                        loader = (*i)->create(io);
@@ -135,15 +133,6 @@ ImageLoader::Registry &ImageLoader::get_registry()
        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()
 {