1 files changed, 75 insertions, 0 deletions

diff --git a/linden/indra/llwindow/llwindowmacosx-objc.mm b/linden/indra/llwindow/llwindowmacosx-objc.mm
index bc47164..abe8c5d 100644
--- a/linden/indra/llwindow/llwindowmacosx-objc.mm
+++ b/linden/indra/llwindow/llwindowmacosx-objc.mm
@@ -32,6 +32,8 @@
  */
 
 #include <AppKit/AppKit.h>
+#include <Accelerate/Accelerate.h>
+#include <Quartz/Quartz.h>
 
 /*
  * These functions are broken out into a separate file because the
@@ -42,6 +44,79 @@
 
 #include "llwindowmacosx-objc.h"
 
+BOOL decodeImageQuartz(const UInt8* data, int len, LLImageRaw *raw_image)
+{
+        CFDataRef theData = CFDataCreate(kCFAllocatorDefault, data, len);
+        CGImageSourceRef srcRef = CGImageSourceCreateWithData(theData, NULL);
+        CGImageRef image_ref = CGImageSourceCreateImageAtIndex(srcRef, 0, NULL);
+
+        size_t width = CGImageGetWidth(image_ref);
+        size_t height = CGImageGetHeight(image_ref);
+        size_t comps = CGImageGetBitsPerPixel(image_ref) / 8;
+        size_t bytes_per_row = CGImageGetBytesPerRow(image_ref);
+        CFDataRef result = CGDataProviderCopyData(CGImageGetDataProvider(image_ref));
+        UInt8* bitmap = (UInt8*)CFDataGetBytePtr(result);
+
+        CGImageAlphaInfo format = CGImageGetAlphaInfo(image_ref);
+        if (format != kCGImageAlphaNone)
+        {
+                vImage_Buffer vb;
+                vb.data = bitmap;
+                vb.height = height;
+                vb.width = width;
+                vb.rowBytes = bytes_per_row;
+
+                if (format & kCGImageAlphaPremultipliedFirst)
+                {
+                        // Ele: ARGB -> BGRA on Intel, need to first reorder the bytes, then unpremultiply as RGBA :)
+                        llinfos << "Unpremultiplying BGRA8888" << llendl;
+
+                        for (int i=0; i<height; i++)
+                        {
+                                for (int j=0; j<bytes_per_row; j+=4)
+                                {
+                                        unsigned char tmp[4];
+
+                                        tmp[0] = bitmap[j*height+3];
+                                        tmp[1] = bitmap[j*height+2];
+                                        tmp[2] = bitmap[j*height+1];
+                                        tmp[3] = bitmap[j*height];
+
+                                        memcpy(&bitmap[j*height], &tmp, 4);
+                                }
+                        }
+
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
+                else if (format & kCGImageAlphaPremultipliedLast)
+                {
+                        llinfos << "Unpremultiplying RGBA8888" << llendl;
+                        vImageUnpremultiplyData_RGBA8888(&vb, &vb, 0);
+                }
+        }
+
+        raw_image->resize(width, height, comps);
+        memcpy(raw_image->getData(), bitmap, height * bytes_per_row);
+        raw_image->verticalFlip();
+
+        CFRelease(theData);
+        CFRelease(srcRef);
+        CGImageRelease(image_ref);
+        CFRelease(result);
+
+        return TRUE;
+}
+
+BOOL decodeImageQuartz(std::string filename, LLImageRaw *raw_image)
+{
+        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+        NSURL *url = [[NSURL alloc] initFileURLWithPath:[NSString stringWithCString:filename.c_str()]];
+        NSData *data = [NSData dataWithContentsOfURL:url];
+        BOOL result = decodeImageQuartz((UInt8*)[data bytes], [data length], raw_image);
+        [pool release];
+        return result;
+}
+
 void setupCocoa()
 {
         static bool inited = false;