archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Mac / COCOA :

Browse Source 
- fix imbuf Cocoa resolution handling issue
This commit is contained in:
Damien Plisson
2009-11-01 08:23:53 +00:00
parent 69feedf139
commit 95fbca7dc9
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/imbuf/intern/imbuf_cocoa.m
View File

@@ -66,7 +66,7 @@
struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags) struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
{ {
struct ImBuf *ibuf = NULL; struct ImBuf *ibuf = NULL;
uint32_t width, height; NSSize bitmapSize;
uchar *rasterRGB = NULL; uchar *rasterRGB = NULL;
uchar *rasterRGBA = NULL; uchar *rasterRGBA = NULL;
uchar *toIBuf = NULL; uchar *toIBuf = NULL;
@@ -87,11 +87,14 @@ struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
return NULL; return NULL;
} }
width = [bitmapImage pixelsWide]; bitmapSize.width = [bitmapImage pixelsWide];
height = [bitmapImage pixelsHigh]; bitmapSize.height = [bitmapImage pixelsHigh];
/* Tell cocoa image resolution is same as current system one */
[bitmapImage setSize:bitmapSize];
/* allocate the image buffer */ /* allocate the image buffer */
ibuf = IMB_allocImBuf(width, height, 32/*RGBA*/, 0, 0); ibuf = IMB_allocImBuf(bitmapSize.width, bitmapSize.height, 32/*RGBA*/, 0, 0);
if (!ibuf) { if (!ibuf) {
fprintf(stderr, fprintf(stderr,
"imb_cocoaLoadImage: could not allocate memory for the " \ "imb_cocoaLoadImage: could not allocate memory for the " \
@@ -113,12 +116,12 @@ struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
/* First get RGB values w/o Alpha to avoid pre-multiplication, 32bit but last byte is unused */ /* First get RGB values w/o Alpha to avoid pre-multiplication, 32bit but last byte is unused */
blBitmapFormatImageRGB = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL blBitmapFormatImageRGB = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
pixelsWide:width pixelsWide:bitmapSize.width
pixelsHigh:height pixelsHigh:bitmapSize.height
bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO bitsPerSample:8 samplesPerPixel:3 hasAlpha:NO isPlanar:NO
colorSpaceName:NSCalibratedRGBColorSpace colorSpaceName:NSCalibratedRGBColorSpace
bitmapFormat:0 bitmapFormat:0
bytesPerRow:4*width bytesPerRow:4*bitmapSize.width
bitsPerPixel:32/*RGB format padded to 32bits*/]; bitsPerPixel:32/*RGB format padded to 32bits*/];
[NSGraphicsContext saveGraphicsState]; [NSGraphicsContext saveGraphicsState];
@@ -136,12 +139,12 @@ struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
/* Then get Alpha values by getting the RGBA image (that is premultiplied btw) */ /* Then get Alpha values by getting the RGBA image (that is premultiplied btw) */
blBitmapFormatImageRGBA = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL blBitmapFormatImageRGBA = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL
pixelsWide:width pixelsWide:bitmapSize.width
pixelsHigh:height pixelsHigh:bitmapSize.height
bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO
colorSpaceName:NSCalibratedRGBColorSpace colorSpaceName:NSCalibratedRGBColorSpace
bitmapFormat:0 bitmapFormat:0
bytesPerRow:4*width bytesPerRow:4*bitmapSize.width
bitsPerPixel:32/* RGBA */]; bitsPerPixel:32/* RGBA */];
[NSGraphicsContext saveGraphicsState]; [NSGraphicsContext saveGraphicsState];
@@ -160,10 +163,10 @@ struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
/*Copy the image to ibuf, flipping it vertically*/ /*Copy the image to ibuf, flipping it vertically*/
toIBuf = (uchar*)ibuf->rect; toIBuf = (uchar*)ibuf->rect;
for (x = 0; x < width; x++) { for (x = 0; x < bitmapSize.width; x++) {
for (y = 0; y < height; y++) { for (y = 0; y < bitmapSize.height; y++) {
to_i = (height-y-1)*width + x; to_i = (bitmapSize.height-y-1)*bitmapSize.width + x;
from_i = y*width + x; from_i = y*bitmapSize.width + x;
toIBuf[4*to_i] = rasterRGB[4*from_i]; /* R */ toIBuf[4*to_i] = rasterRGB[4*from_i]; /* R */
toIBuf[4*to_i+1] = rasterRGB[4*from_i+1]; /* G */ toIBuf[4*to_i+1] = rasterRGB[4*from_i+1]; /* G */