3 files changed, 90 insertions, 0 deletions

diff --git a/cocoa/PlatCocoa.h b/cocoa/PlatCocoa.h
index 0653bc728..0e3c5f2e2 100644
--- a/cocoa/PlatCocoa.h
+++ b/cocoa/PlatCocoa.h
@@ -93,6 +93,7 @@ public:
   void RoundedRectangle(PRectangle rc, ColourAllocated fore, ColourAllocated back);
   void AlphaRectangle(PRectangle rc, int cornerSize, ColourAllocated fill, int alphaFill,
                      ColourAllocated outline, int alphaOutline, int flags);
+  void DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage);
   void Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back);
   void Copy(PRectangle rc, Scintilla::Point from, Surface &surfaceSource);
   void DrawTextNoClip(PRectangle rc, Font &font_, int ybase, const char *s, int len, ColourAllocated fore,
diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 9397e9fbd..1e81fb6e1 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -639,6 +639,73 @@ void Scintilla::SurfaceImpl::AlphaRectangle(PRectangle rc, int /*cornerSize*/, C
   }
 }
 
+static CGImageRef ImageFromRGBA(int width, int height, const unsigned char *pixelsImage, bool invert) {
+	CGImageRef image = 0;
+
+	// Create an RGB color space.
+	CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
+	if (colorSpace) {
+		const int bitmapBytesPerRow = ((int) width * 4);
+		const int bitmapByteCount = (bitmapBytesPerRow * (int) height);
+		
+		// Create a data provider.
+		CGDataProviderRef dataProvider = 0;
+		unsigned char *pixelsUpsideDown = 0;
+		if (invert) {
+			pixelsUpsideDown = new unsigned char[bitmapByteCount];
+		
+			for (int y=0; y<height; y++) {
+				int yInverse = height - y - 1;
+				memcpy(pixelsUpsideDown + y * bitmapBytesPerRow,
+				       pixelsImage + yInverse * bitmapBytesPerRow,
+				       bitmapBytesPerRow);
+			}
+			
+			dataProvider = CGDataProviderCreateWithData(
+								NULL, pixelsUpsideDown, bitmapByteCount, NULL);
+		} else {
+			dataProvider = CGDataProviderCreateWithData(
+								NULL, pixelsImage, bitmapByteCount, NULL);
+			
+		}
+		if (dataProvider) {
+			// Create the CGImage.
+			image = CGImageCreate(width,
+							 height,
+							 8,
+							 8 * 4,
+							 bitmapBytesPerRow,
+							 colorSpace,
+							 kCGImageAlphaLast,
+							 dataProvider,
+							 NULL,
+							 0,
+							 kCGRenderingIntentDefault);
+
+			CGDataProviderRelease(dataProvider);
+		}
+		delete []pixelsUpsideDown;
+		
+		// The image retains the color space, so we can release it.
+		CGColorSpaceRelease(colorSpace);
+	}
+	return image;
+}
+
+void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsigned char *pixelsImage) {
+	CGImageRef image = ImageFromRGBA(width, height, pixelsImage, true);
+	if (image) {
+		//CGContextSaveGState(gc);
+		//CGRect dst = PRectangleToCGRect(rc);
+		//CGContextClipToRect(gc, dst);
+		CGRect drawRect = CGRectMake (0, 0, width, height);
+		CGContextDrawImage(gc, drawRect, image);
+		//CGContextRestoreGState (gc);
+		
+		CGImageRelease(image);
+	}
+}
+
 void SurfaceImpl::Ellipse(PRectangle rc, ColourAllocated fore, ColourAllocated back) {
   // Drawing an ellipse with bezier curves. Code modified from:
   // http://www.codeguru.com/gdi/ellipse.shtml
@@ -1410,6 +1477,7 @@ public:
   int Find(const char* prefix);
   void GetValue(int n, char* value, int len);
   void RegisterImage(int type, const char* xpm_data);
+  void RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage);
   void ClearRegisteredImages();
   void SetDoubleClickAction(CallBackAction action, void* data)
   {
@@ -1721,6 +1789,26 @@ void ListBoxImpl::RegisterImage(int type, const char* xpm_data)
   }
 }
 
+void ListBoxImpl::RegisterRGBAImage(int type, int width, int height, const unsigned char *pixelsImage) {
+	NSImage *img = [NSImage alloc];
+	[img autorelease];
+	CGImageRef imageRef = ImageFromRGBA(width, height, pixelsImage, false);
+	NSSize sz = {width, height};
+	[img initWithCGImage:imageRef size:sz];
+	CGImageRelease(imageRef);
+	[img retain];
+	ImageMap::iterator it=images.find(type);
+	if (it == images.end())
+	{
+		images[type] = img;
+	}
+	else
+	{
+		[it->second release];
+		it->second = img;
+	}
+}
+
 void ListBoxImpl::ClearRegisteredImages()
 {
   for (ImageMap::iterator it=images.begin();
diff --git a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
index b24938d05..80a483b06 100644
--- a/cocoa/ScintillaCocoa.h
+++ b/cocoa/ScintillaCocoa.h
@@ -20,6 +20,7 @@
 #include <time.h>
 
 #include <vector>
+#include <map>
 
 #include "ILexer.h"