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

minor code cleanups

Browse Source
This commit is contained in:
Rob Haarsma
2003-05-09 12:45:59 +00:00
parent 1e7e0633cf
commit 6670ad7bec
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/quicktime/apple/quicktime_export.c
View File

@@ -361,7 +361,6 @@ static void QT_DoAddVideoSamplesToMedia (int frame)
static void QT_EndAddVideoSamplesToMedia (void) static void QT_EndAddVideoSamplesToMedia (void)
{ {
SCCompressSequenceEnd(qcdx->theComponent); SCCompressSequenceEnd(qcdx->theComponent);
UnlockPixels(qte->thePixMap); UnlockPixels(qte->thePixMap);
@@ -568,16 +567,15 @@ static void check_renderbutton_framerate(void) {
int get_qtcodec_settings(void) int get_qtcodec_settings(void)
{ {
OSErr err = noErr; OSErr err = noErr;
Component c = 0; // Component c = 0;
ComponentDescription cd; // ComponentDescription cd;
CodecInfo ci; CodecInfo ci;
cd.componentType = StandardCompressionType; // cd.componentType = StandardCompressionType;
cd.componentSubType = StandardCompressionSubType; // cd.componentSubType = StandardCompressionSubType;
cd.componentManufacturer = 0; // cd.componentManufacturer = 0;
cd.componentFlags = 0; // cd.componentFlags = 0;
cd.componentFlagsMask = 0; // cd.componentFlagsMask = 0;
if(qcdx == NULL) { if(qcdx == NULL) {
qcdx = MEM_callocN(sizeof(QuicktimeCodecDataExt), "QuicktimeCodecDataExt"); qcdx = MEM_callocN(sizeof(QuicktimeCodecDataExt), "QuicktimeCodecDataExt");
@@ -587,9 +585,9 @@ int get_qtcodec_settings(void)
// configure the standard image compression dialog box // configure the standard image compression dialog box
if (qcdx->theComponent == NULL) { if (qcdx->theComponent == NULL) {
// qcdx->theComponent = OpenDefaultComponent(StandardCompressionType, StandardCompressionSubType); qcdx->theComponent = OpenDefaultComponent(StandardCompressionType, StandardCompressionSubType);
c = FindNextComponent(c, &cd); // c = FindNextComponent(c, &cd);
qcdx->theComponent = OpenComponent(c); // qcdx->theComponent = OpenComponent(c);
// qcdx->gSpatialSettings.codecType = nil; // qcdx->gSpatialSettings.codecType = nil;
qcdx->gSpatialSettings.codec = anyCodec; qcdx->gSpatialSettings.codec = anyCodec;
@@ -619,9 +617,8 @@ int get_qtcodec_settings(void)
// put up the dialog box // put up the dialog box
err = SCRequestSequenceSettings(qcdx->theComponent); err = SCRequestSequenceSettings(qcdx->theComponent);
if (err == scUserCancelled) { if (err == scUserCancelled) {
G.afbreek = 1; G.afbreek = 1;
return 0; return 0;
} }

4
source/blender/quicktime/apple/quicktime_import.c
View File

@@ -489,7 +489,7 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags)
(**dataref).data = mem; (**dataref).data = mem;
(**dataref).dataLength = size; (**dataref).dataLength = size;
err = OpenADataHandler(dataref, err = OpenADataHandler((Handle)dataref,
PointerDataHandlerSubType, PointerDataHandlerSubType,
nil, nil,
(OSType)0, (OSType)0,
@@ -501,7 +501,7 @@ ImBuf *imb_quicktime_decode(unsigned char *mem, int size, int flags)
goto bail; goto bail;
} }
err = GetGraphicsImporterForDataRef(dataref, PointerDataHandlerSubType, &gImporter); err = GetGraphicsImporterForDataRef((Handle)dataref, PointerDataHandlerSubType, &gImporter);
if (err != noErr) { if (err != noErr) {
if(QTIME_DEBUG) printf("no graphimport\n"); if(QTIME_DEBUG) printf("no graphimport\n");
goto bail; goto bail;