diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-09-20 19:12:53 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-09-20 19:12:53 +0400 |
| commit | 67367a22cf12f678d30079f4b1d8b8ff23aecd49 (patch) | |
| tree | 2bd5a197b4b58009889792a9808ba99372ce0ff2 /source/blender/quicktime | |
| parent | b859d355c8dae6ea778f700a412b2eb8ce0417ad (diff) | |
Some fixes for warnings found while investigating quicktime-related bug reports.
Diffstat (limited to 'source/blender/quicktime')
| -rw-r--r-- | source/blender/quicktime/apple/quicktime_import.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/quicktime/apple/quicktime_import.c b/source/blender/quicktime/apple/quicktime_import.c index 75f77dccbfa..d92dbe910a5 100644 --- a/source/blender/quicktime/apple/quicktime_import.c +++ b/source/blender/quicktime/apple/quicktime_import.c @@ -32,6 +32,7 @@ #if defined(_WIN32) || defined(__APPLE__) #ifndef USE_QTKIT +#include "MEM_guardedalloc.h" #include "IMB_anim.h" #include "BLO_sys_types.h" #include "BKE_global.h" @@ -89,15 +90,21 @@ typedef struct _QuicktimeMovie { void quicktime_init(void) { #ifdef _WIN32 - if (InitializeQTML(0) != noErr) + OSErr nerr; + QTLoadLibrary("QTCF.dll"); + nerr = InitializeQTML(0); + if (nerr != noErr) { G.have_quicktime = FALSE; + printf("Error initializing quicktime\n"); + } else G.have_quicktime = TRUE; #endif /* _WIN32 */ /* Initialize QuickTime */ #if defined(_WIN32) || defined (__APPLE__) - if (EnterMovies() != noErr) + nerr = EnterMovies(); + if (nerr != noErr) G.have_quicktime = FALSE; else #endif /* _WIN32 || __APPLE__ */ @@ -317,7 +324,9 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) ImBuf *ibuf = NULL; unsigned int *rect; +#ifdef __APPLE__ unsigned char *from, *to; +#endif #ifdef _WIN32 unsigned char *crect; #endif @@ -373,7 +382,7 @@ ImBuf * qtime_fetchibuf (struct anim *anim, int position) } #endif - ibuf->profile == IB_PROFILE_SRGB; + ibuf->profile = IB_PROFILE_SRGB; IMB_flipy(ibuf); return ibuf; |