X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.h;h=9645f116ffd4228a1098c425339fe7a0f39f3ec3;hb=43d31e73c4b97a37017757232c4ef1db355fee3a;hp=1ad6cc8c895aad812264df8663920cd6a56f6528;hpb=054fca09f0bbd64fdbd6406a0643de938a9cd4fb;p=libs%2Fgui.git diff --git a/source/graphics/imageloader.h b/source/graphics/imageloader.h index 1ad6cc8..9645f11 100644 --- a/source/graphics/imageloader.h +++ b/source/graphics/imageloader.h @@ -10,14 +10,12 @@ class unsupported_image_format: public std::runtime_error { public: unsupported_image_format(const std::string &w): std::runtime_error(w) { } - virtual ~unsupported_image_format() throw() { } }; class bad_image_data: public std::runtime_error { public: bad_image_data(const std::string &w): std::runtime_error(w) { } - virtual ~bad_image_data() throw() { } }; @@ -48,9 +46,9 @@ protected: class RegisteredLoader: public RegisterBase { public: - virtual unsigned get_signature_size() const { return T::get_signature_size(); } - virtual bool detect(const std::string &s) const { return T::detect(s); } - virtual ImageLoader *create(IO::Seekable &io) const { return new T(io); } + unsigned get_signature_size() const override { return T::get_signature_size(); } + bool detect(const std::string &s) const override { return T::detect(s); } + ImageLoader *create(IO::Seekable &io) const override { return new T(io); } }; struct Registry @@ -71,6 +69,7 @@ protected: public: virtual ~ImageLoader(); + static bool detect_signature(const std::string &); static ImageLoader *open_file(const std::string &); static ImageLoader *open_io(IO::Seekable &);