X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fquartz%2Fquartzloader.cpp;h=5493e45bace18709d00084fbc69d4a5ab0a6e6ae;hb=b74b0945b2e19c32f05d8bcb016cc9434c99979d;hp=1fc93ad2b3d36252a1e487e40ac82ad04d80c676;hpb=03f5e11e6bcf9487e396403041f84009ff4eb900;p=libs%2Fgui.git

diff --git a/source/graphics/quartz/quartzloader.cpp b/source/graphics/quartz/quartzloader.cpp
index 1fc93ad..5493e45 100644
--- a/source/graphics/quartz/quartzloader.cpp
+++ b/source/graphics/quartz/quartzloader.cpp
@@ -1,7 +1,5 @@
 #include <algorithm>
-#include <CoreGraphics/CGColorSpace.h>
-#include <CoreGraphics/CGImage.h>
-#include <ImageIO/CGImageSource.h>
+#include <ApplicationServices/ApplicationServices.h>
 // Avoid messing up sigc++ headers
 #undef nil
 #include "quartzloader.h"
@@ -57,8 +55,6 @@ struct QuartzLoader::Private
 };
 
 
-ImageLoader::Register<QuartzLoader> QuartzLoader::reg;
-
 QuartzLoader::QuartzLoader(IO::Seekable &io):
 	priv(new Private)
 {
@@ -116,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);