+#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
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 ®istry = get_registry();
- for(list<RegisterBase *>::const_iterator i=registry.loaders.begin(); i!=registry.loaders.end(); ++i)
- if((*i)->detect(sig))
+ for(const RegisterBase *r: registry.loaders)
+ if(r->detect(sig))
return true;
return false;
}
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())
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);
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()
{
- for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
- delete *i;
+ for(auto l: loaders)
+ delete l;
}
} // namespace Graphics