X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fbmploader.h;h=926516d8ca080d0eecfffc2b80f664537a6fa873;hb=6222d13e2790bdaa1013444f1221841397834cdd;hp=db9af1db4b28405616cf5f64c8735e99cae97c74;hpb=5715968065256daa4c43d5365cf5e268d75e007a;p=libs%2Fgui.git

diff --git a/source/graphics/bmploader.h b/source/graphics/bmploader.h
index db9af1d..926516d 100644
--- a/source/graphics/bmploader.h
+++ b/source/graphics/bmploader.h
@@ -6,11 +6,12 @@
 namespace Msp {
 namespace Graphics {
 
-class BmpLoader: public RegisteredImageLoader<BmpLoader>
+class BmpLoader: public ImageLoader
 {
 private:
 	IO::Base &io;
-	unsigned sig_bytes;
+	unsigned sig_bytes = 0;
+	bool invert_row_order = false;
 
 public:
 	BmpLoader(IO::Base &, unsigned = 0);
@@ -18,7 +19,8 @@ public:
 	static unsigned get_signature_size() { return 2; }
 	static bool detect(const std::string &);
 
-	virtual void load(Image::Data &);
+	void load_headers_(Image::Data &) override;
+	void load_pixels_(Image::Data &) override;
 };
 
 } // namespace Graphics