Fix [#24294] IMB_allocImBuf changes in r32517 missed a couple of files
authorNathan Letwory <nathan@letworyinteractive.com>
Sun, 17 Oct 2010 18:56:36 +0000 (18:56 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Sun, 17 Oct 2010 18:56:36 +0000 (18:56 +0000)
Reported and patched by Shane Ambler

source/blender/imbuf/intern/imbuf_cocoa.m
source/blender/quicktime/apple/quicktime_export.c
source/blender/quicktime/apple/quicktime_import.c

index 02c90c5..9b62761 100644 (file)
@@ -93,7 +93,7 @@ struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
        [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 " \
index c1291fc..9664a5b 100644 (file)
@@ -379,8 +379,8 @@ static void QT_StartAddVideoSamplesToMedia (const Rect *trackFrame, int rectx, i
        SCTemporalSettings gTemporalSettings;
        OSErr err = noErr;
 
-       qtexport->ibuf = IMB_allocImBuf (rectx, recty, 32, IB_rect, 0);
-       qtexport->ibuf2 = IMB_allocImBuf (rectx, recty, 32, IB_rect, 0);
+       qtexport->ibuf = IMB_allocImBuf (rectx, recty, 32, IB_rect);
+       qtexport->ibuf2 = IMB_allocImBuf (rectx, recty, 32, IB_rect);
 
        err = NewGWorldFromPtr( &qtexport->theGWorld,
                                                        k32ARGBPixelFormat,
index f9793f0..699b2c4 100644 (file)
@@ -335,7 +335,7 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position)
                return (NULL);
        }
 
-       ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect, 0);
+       ibuf = IMB_allocImBuf (anim->x, anim->y, 32, IB_rect);
        rect = ibuf->rect;
 
        SetMovieTimeValue(anim->qtime->movie, anim->qtime->frameIndex[position]);
@@ -496,7 +496,7 @@ int startquicktime (struct anim *anim)
                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);
 
 #ifdef _WIN32
        err = NewGWorldFromPtr(&anim->qtime->offscreenGWorld,
@@ -676,7 +676,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
        depth = (**desc).depth;
 
        if (flags & IB_test) {
-               ibuf = IMB_allocImBuf(x, y, depth, 0, 0);
+               ibuf = IMB_allocImBuf(x, y, depth, 0);
                ibuf->ftype = QUICKTIME;
                DisposeHandle((Handle)dataref);
                if (gImporter != NULL)  CloseComponent(gImporter);
@@ -684,8 +684,8 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
        }
 
 #ifdef __APPLE__
-       ibuf = IMB_allocImBuf (x, y, 32, IB_rect, 0);
-       wbuf = IMB_allocImBuf (x, y, 32, IB_rect, 0);
+       ibuf = IMB_allocImBuf (x, y, 32, IB_rect);
+       wbuf = IMB_allocImBuf (x, y, 32, IB_rect);
 
        err = NewGWorldFromPtr(&offGWorld,
                                                k32ARGBPixelFormat,
@@ -693,7 +693,7 @@ ImBuf  *imb_quicktime_decode(unsigned char *mem, int size, int flags)
                                                (unsigned char *)wbuf->rect, x * 4);
 #else
 
-       ibuf = IMB_allocImBuf (x, y, 32, IB_rect, 0);   
+       ibuf = IMB_allocImBuf (x, y, 32, IB_rect);      
 
        err = NewGWorldFromPtr(&offGWorld,
                                                        k32RGBAPixelFormat,