X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fbmploader.cpp;h=d88e2aa6435f36f3c908bf3c274a9799a5b2339e;hb=054fca09f0bbd64fdbd6406a0643de938a9cd4fb;hp=086648bfe7b3eb26bb4f079ad95281a1b151fc9d;hpb=2effe9b416302914a8b8d88c815e20bd874d8100;p=libs%2Fgui.git

diff --git a/source/graphics/bmploader.cpp b/source/graphics/bmploader.cpp
index 086648b..d88e2aa 100644
--- a/source/graphics/bmploader.cpp
+++ b/source/graphics/bmploader.cpp
@@ -29,7 +29,8 @@ namespace Graphics {
 
 BmpLoader::BmpLoader(IO::Base &i, unsigned sb):
 	io(i),
-	sig_bytes(sb)
+	sig_bytes(sb),
+	invert_row_order(false)
 {
 	// Image data location is stored at offset 10 and can't be skipped
 	if(sig_bytes>10)
@@ -38,13 +39,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, sizeof(bmp_sig), bmp_sig, sizeof(bmp_sig));
 }
 
-void BmpLoader::load(Image::Data &data)
+void BmpLoader::load_headers_(Image::Data &data)
 {
 	char bm_header[14];
 	read_full(io, bm_header+sig_bytes, sizeof(bm_header)-sig_bytes);
@@ -92,16 +93,21 @@ void BmpLoader::load(Image::Data &data)
 		skip -= size;
 	}
 
-	data.data = new char[data.stride*data.height];
-	if(height<0)
+	invert_row_order = (height<0);
+}
+
+void BmpLoader::load_pixels_(Image::Data &data)
+{
+	data.pixels = new char[data.stride*data.height];
+	if(invert_row_order)
 	{
 		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);
 	}
 }