Revert some changes which accidentally got included in d3bc6c9

diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp
index da897984449993b56e3163b5ffd8830da06e22a9..b2a126e79df5de3f64864fc5942f6f51a13ffc5b 100644 (file)
--- a/source/graphics/imageloader.cpp
+++ b/source/graphics/imageloader.cpp
@@ -83,12 +83,6 @@ ImageLoader *ImageLoader::open_io(IO::Seekable &io)
        return loader;
 }
 
-void ImageLoader::load(Image::Data &data)
-{
-       load_headers(data);
-       load_data(data);
-}
-
 ImageLoader::Registry &ImageLoader::get_registry()
 {
        static Registry registry;

diff --git a/source/graphics/imageloader.h b/source/graphics/imageloader.h
index f0b8d52c36412ec6cf3e9901d5b2a43c51aefdd6..9dc17269ef7d8054224492ad792795f0ad133afd 100644 (file)
--- a/source/graphics/imageloader.h
+++ b/source/graphics/imageloader.h
@@ -65,9 +65,7 @@ public:
        static ImageLoader *open_file(const std::string &);
        static ImageLoader *open_io(IO::Seekable &);
 
-       virtual void load(Image::Data &);
-       virtual void load_headers(Image::Data &) { }
-       virtual void load_data(Image::Data &) { }
+       virtual void load(Image::Data &) = 0;
 
        template<typename T>
        static void register_loader();