X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fquartz%2Fquartzloader.cpp;h=472e066f49665a64356cf1c50d93fba878589487;hb=2ebdf45974a0a7649b3488f9da4b8cf90a1db584;hp=d1baaef549761aac2b50157ab0f4392dc3f09249;hpb=6ede8137c8247f1f7d82ed7dcaad50d3f4baae0c;p=libs%2Fgui.git

diff --git a/source/graphics/quartz/quartzloader.cpp b/source/graphics/quartz/quartzloader.cpp
index d1baaef..472e066 100644
--- a/source/graphics/quartz/quartzloader.cpp
+++ b/source/graphics/quartz/quartzloader.cpp
@@ -55,8 +55,6 @@ struct QuartzLoader::Private
 };
 
 
-ImageLoader::Register<QuartzLoader> QuartzLoader::reg;
-
 QuartzLoader::QuartzLoader(IO::Seekable &io):
 	priv(new Private)
 {
@@ -83,7 +81,7 @@ bool QuartzLoader::detect(const string &sig)
 	return status==kCGImageStatusIncomplete || status==kCGImageStatusReadingHeader;
 }
 
-void QuartzLoader::load(Image::Data &data)
+void QuartzLoader::load_(Image::Data &data)
 {
 	CGImageRef image = CGImageSourceCreateImageAtIndex(priv->source, 0, 0);
 	if(!image)
@@ -114,10 +112,10 @@ void QuartzLoader::load(Image::Data &data)
 
 		CGDataProviderRef dp = CGImageGetDataProvider(image);
 		CFDataRef image_data = CGDataProviderCopyData(dp);
-		data.data = new char[data.height*data.stride];
+		data.pixels = new char[data.height*data.stride];
 		unsigned offset = (alpha==kCGImageAlphaNoneSkipFirst);
 		CFRange range = CFRangeMake(offset, CFDataGetLength(image_data)-offset);
-		CFDataGetBytes(image_data, range, reinterpret_cast<UInt8 *>(data.data));
+		CFDataGetBytes(image_data, range, reinterpret_cast<UInt8 *>(data.pixels));
 		CFRelease(image_data);
 
 		CFRelease(image);