+#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 string &sig)
+{
+ Registry ®istry = get_registry();
+ for(const RegisterBase *r: registry.loaders)
+ if(r->detect(sig))
+ return true;
+ return false;
+}
+
ImageLoader *ImageLoader::open_file(const string &fn)
{
try
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())
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);
{
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);
}
if(state>=FINISHED)
throw logic_error("already loaded");
- load_(data);
+ 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");
+
+ load_headers_(data);
+ state = HEADERS_LOADED;
+}
+
ImageLoader::Registry &ImageLoader::get_registry()
{
static Registry 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()
{
- for(list<RegisterBase *>::iterator i=loaders.begin(); i!=loaders.end(); ++i)
- delete *i;
+ for(auto l: loaders)
+ delete l;
}
} // namespace Graphics