X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fquartz%2Fquartzloader.cpp;h=9a74862c590d04b53b0548f5a38b05742e91369c;hb=bc1a38d6d2c966a6aee74e483ca7a7d37a56909e;hp=e025b66cf4786b852ed2a176ed0ee49b7e7d977c;hpb=054fca09f0bbd64fdbd6406a0643de938a9cd4fb;p=libs%2Fgui.git

diff --git a/source/graphics/quartz/quartzloader.cpp b/source/graphics/quartz/quartzloader.cpp
index e025b66..9a74862 100644
--- a/source/graphics/quartz/quartzloader.cpp
+++ b/source/graphics/quartz/quartzloader.cpp
@@ -1,8 +1,6 @@
+#include "quartzloader.h"
 #include <algorithm>
 #include <ApplicationServices/ApplicationServices.h>
-// Avoid messing up sigc++ headers
-#undef nil
-#include "quartzloader.h"
 
 using namespace std;
 
@@ -121,7 +119,6 @@ void QuartzLoader::load_(Image::Data &data)
 {
 	CGDataProviderRef dp = CGImageGetDataProvider(image);
 	CFDataRef image_data = CGDataProviderCopyData(dp);
-	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.pixels));