From 7672cbffb3efd3cce448f85a5e0acd4bed7ec0dd Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 7 Feb 2021 16:23:20 +0200 Subject: [PATCH] Revert some changes which accidentally got included in d3bc6c9 --- source/graphics/imageloader.cpp | 6 ------ source/graphics/imageloader.h | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/source/graphics/imageloader.cpp b/source/graphics/imageloader.cpp index da89798..b2a126e 100644 --- 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 f0b8d52..9dc1726 100644 --- 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 static void register_loader(); -- 2.45.2