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

Adapt OSX code for IMB_allocImBuf param changes.

Browse Source
This commit is contained in:
Nathan Letwory
2010-10-16 15:53:01 +00:00
parent c52e7c1370
commit ac03fbe4c9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_SystemCocoa.mm
View File

@@ -1163,7 +1163,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType
NSEnumerator *enumerator; NSEnumerator *enumerator;
NSImageRep *representation; NSImageRep *representation;
ibuf = IMB_allocImBuf (imgSize.width , imgSize.height, 32, IB_rect, 0); ibuf = IMB_allocImBuf (imgSize.width , imgSize.height, 32, IB_rect);
if (!ibuf) { if (!ibuf) {
[droppedImg release]; [droppedImg release];
return GHOST_kFailure; return GHOST_kFailure;

6
source/blender/quicktime/apple/qtkit_import.m
View File

@@ -149,7 +149,7 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height)
NSEnumerator *enumerator; NSEnumerator *enumerator;
NSImageRep *representation; NSImageRep *representation;
ibuf = IMB_allocImBuf (width, height, 32, IB_rect, 0); ibuf = IMB_allocImBuf (width, height, 32, IB_rect);
if (!ibuf) { if (!ibuf) {
if(QTIME_DEBUG) printf("quicktime_import: could not allocate memory for the " \ if(QTIME_DEBUG) printf("quicktime_import: could not allocate memory for the " \
"image.\n"); "image.\n");
@@ -359,7 +359,7 @@ int startquicktime (struct anim *anim)
return -1; return -1;
} }
anim->qtime->ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect, 0); anim->qtime->ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect);
qtTimeDuration = [[anim->qtime->media attributeForKey:QTMediaDurationAttribute] QTTimeValue]; qtTimeDuration = [[anim->qtime->media attributeForKey:QTMediaDurationAttribute] QTTimeValue];
anim->qtime->durationTime = qtTimeDuration.timeValue; anim->qtime->durationTime = qtTimeDuration.timeValue;
@@ -450,7 +450,7 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags)
[bitmapImage setSize:bitmapSize]; [bitmapImage setSize:bitmapSize];
/* allocate the image buffer */ /* allocate the image buffer */
ibuf = IMB_allocImBuf(bitmapSize.width, bitmapSize.height, 32/*RGBA*/, 0, 0); ibuf = IMB_allocImBuf(bitmapSize.width, bitmapSize.height, 32/*RGBA*/, 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 " \