diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-17 22:56:36 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-10-17 22:56:36 +0400 |
| commit | fec7585190187ba6c8509620b83addfcaa225be0 (patch) | |
| tree | 94f124b947a146268efde6f5488d79b807e83a46 /source/blender/quicktime | |
| parent | 0069c521042766a75c6e5fefce9b4a7a1f0e8142 (diff) | |
Fix [#24294] IMB_allocImBuf changes in r32517 missed a couple of files
Reported and patched by Shane Ambler
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_export.c | 4 | ||||
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c index c1291fc6949..9664a5b16f8 100644 --- a/source/blender/quicktime/apple/quicktime_export.c +++ b/source/blender/quicktime/apple/quicktime_export.c @@ -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, diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index f9793f04b88..699b2c4f6e3 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -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, |