[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32525] trunk/blender: Adapt OSX code for IMB_allocImBuf param changes.

[Nathan Letwory]

Revision: 32525
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32525
Author:   jesterking
Date:     2010-10-16 17:53:01 +0200 (Sat, 16 Oct 2010)

Log Message:
-----------
Adapt OSX code for IMB_allocImBuf param changes.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    trunk/blender/source/blender/quicktime/apple/qtkit_import.m

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2010-10-16 15:21:55 UTC (rev 32524)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2010-10-16 15:53:01 UTC (rev 32525)
@@ -1163,7 +1163,7 @@
 					NSEnumerator *enumerator;
 					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) {
 						[droppedImg release];
 						return GHOST_kFailure;

Modified: trunk/blender/source/blender/quicktime/apple/qtkit_import.m
===================================================================
--- trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2010-10-16 15:21:55 UTC (rev 32524)
+++ trunk/blender/source/blender/quicktime/apple/qtkit_import.m	2010-10-16 15:53:01 UTC (rev 32525)
@@ -149,7 +149,7 @@
 	NSEnumerator *enumerator;
 	NSImageRep *representation;
 	
-	ibuf = IMB_allocImBuf (width, height, 32, IB_rect, 0);
+	ibuf = IMB_allocImBuf (width, height, 32, IB_rect);
 	if (!ibuf) {
 		if(QTIME_DEBUG) printf("quicktime_import: could not allocate memory for the " \
 				"image.\n");
@@ -359,7 +359,7 @@
 		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];
 	anim->qtime->durationTime = qtTimeDuration.timeValue;
@@ -450,7 +450,7 @@
 	[bitmapImage setSize:bitmapSize];
 	
 	/* 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) {
 		fprintf(stderr, 
 				"imb_cocoaLoadImage: could not allocate memory for the " \