X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fbmploader.cpp;h=39629f714e776e3a8d1bfa954fe60007c1a3be3f;hb=2ebdf45974a0a7649b3488f9da4b8cf90a1db584;hp=71de507d1f8b2681a76ddf3bf861a8677a4990e8;hpb=5715968065256daa4c43d5365cf5e268d75e007a;p=libs%2Fgui.git

diff --git a/source/graphics/bmploader.cpp b/source/graphics/bmploader.cpp
index 71de507..39629f7 100644
--- a/source/graphics/bmploader.cpp
+++ b/source/graphics/bmploader.cpp
@@ -38,13 +38,13 @@ BmpLoader::BmpLoader(IO::Base &i, unsigned sb):
 
 bool BmpLoader::detect(const std::string &sig)
 {
-	static const char bmp_sig[] = "BM";
+	static const char bmp_sig[] = { 'B', 'M' };
 	if(sig.size()<sizeof(bmp_sig))
 		return false;
-	return !sig.compare(0, 2, bmp_sig);
+	return !sig.compare(0, sizeof(bmp_sig), bmp_sig, sizeof(bmp_sig));
 }
 
-void BmpLoader::load(Image::Data &data)
+void BmpLoader::load_(Image::Data &data)
 {
 	char bm_header[14];
 	read_full(io, bm_header+sig_bytes, sizeof(bm_header)-sig_bytes);
@@ -92,16 +92,16 @@ void BmpLoader::load(Image::Data &data)
 		skip -= size;
 	}
 
-	data.data = new char[data.stride*data.height];
+	data.pixels = new char[data.stride*data.height];
 	if(height<0)
 	{
 		for(unsigned y=0; y<data.height; ++y)
-			read_full(io, data.data+(data.height-1-y)*data.stride, data.stride);
+			read_full(io, data.pixels+(data.height-1-y)*data.stride, data.stride);
 	}
 	else
 	{
 		for(unsigned y=0; y<data.height; ++y)
-			read_full(io, data.data+y*data.stride, data.stride);
+			read_full(io, data.pixels+y*data.stride, data.stride);
 	}
 }