diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-10-19 04:45:37 +0400 |
| commit | a377a7edf67869722c585086ac6ab1f295cbff87 (patch) | |
| tree | 1736de08fe9174761607dce5d54a16af25eba049 /source/blender/quicktime/apple/qtkit_import.m | |
| parent | 08232350d5797302e3638e69ec78657d853976aa (diff) | |
| parent | b743454ce1c361e6161da8ae5f840c2befe3a081 (diff) | |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r32300:32571soc-2010-nicolasbishop
Diffstat (limited to 'source/blender/quicktime/apple/qtkit_import.m')
| -rw-r--r-- | source/blender/quicktime/apple/qtkit_import.m | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/quicktime/apple/qtkit_import.m b/source/blender/quicktime/apple/qtkit_import.m index 41c4e0cc5a3..f067d717a7c 100644 --- a/source/blender/quicktime/apple/qtkit_import.m +++ b/source/blender/quicktime/apple/qtkit_import.m @@ -149,7 +149,7 @@ static ImBuf * nsImageToiBuf(NSImage *sourceImage, int width, int height) 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 @@ 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); qtTimeDuration = [[anim->qtime->media attributeForKey:QTMediaDurationAttribute] QTTimeValue]; anim->qtime->durationTime = qtTimeDuration.timeValue; @@ -450,7 +450,7 @@ ImBuf *imb_quicktime_decode(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 " \ |