X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fjpeg%2Fjpegloader.cpp;h=45689cf65725a032b3020ed62d546be46db4b345;hb=917c43de100807f4397e36b66b1a748dbf44370e;hp=39866c18aaabaee7351f6fb2f419e8e3d4ab47ed;hpb=2ce0c7fc1c33de76b816144df2978518ec6738f6;p=libs%2Fgui.git

diff --git a/source/graphics/jpeg/jpegloader.cpp b/source/graphics/jpeg/jpegloader.cpp
index 39866c1..45689cf 100644
--- a/source/graphics/jpeg/jpegloader.cpp
+++ b/source/graphics/jpeg/jpegloader.cpp
@@ -113,13 +113,13 @@ JpegLoader::~JpegLoader()
 
 bool JpegLoader::detect(const string &sig)
 {
-	static const char jpeg_sig[] = "\xFF\xD8\xFF";
+	static const char jpeg_sig[] = { '\xFF', '\xD8', '\xFF' };
 	if(sig.size()<sizeof(jpeg_sig))
 		return false;
-	return !sig.compare(0, 3, jpeg_sig);
+	return !sig.compare(0, sizeof(jpeg_sig), jpeg_sig, sizeof(jpeg_sig));
 }
 
-void JpegLoader::load(Image::Data &data)
+void JpegLoader::load_headers_(Image::Data &data)
 {
 	if(setjmp(priv->err_mgr.jmp))
 		throw bad_image_data(priv->err_mgr.message);
@@ -132,15 +132,17 @@ void JpegLoader::load(Image::Data &data)
 	data.height = priv->jpeg.output_height;
 	data.stride = priv->jpeg.output_width*priv->jpeg.output_components;
 	data.fmt = RGB;
+}
 
-	data.data = new char[data.stride*data.height];
+void JpegLoader::load_pixels_(Image::Data &data)
+{
 	JSAMPROW rows[8];
 	while(priv->jpeg.output_scanline<data.height)
 	{
 		unsigned y = data.height-priv->jpeg.output_scanline;
 		unsigned count = min(y, 8U);
 		for(unsigned i=0; i<count; ++i)
-			rows[i] = reinterpret_cast<JSAMPROW>(data.data+(y-i-1)*data.stride);
+			rows[i] = reinterpret_cast<JSAMPROW>(data.pixels+(y-i-1)*data.stride);
 		jpeg_read_scanlines(&priv->jpeg, rows, count);
 	}