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

Fix [#24294] IMB_allocImBuf changes in r32517 missed a couple of files

Browse Source 
Reported and patched by Shane Ambler
This commit is contained in:
Nathan Letwory
2010-10-17 18:56:36 +00:00
parent 0069c52104
commit fec7585190
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/imbuf/intern/imbuf_cocoa.m
View 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 " \

4
source/blender/quicktime/apple/quicktime_export.c
View 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,

12
source/blender/quicktime/apple/quicktime_import.c
View 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,