[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32030] trunk/blender/source/blender/ quicktime/apple/quicktime_import.c: Some fixes for warnings found while investigating quicktime-related bug reports .

[Nathan Letwory]

Revision: 32030
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32030
Author:   jesterking
Date:     2010-09-20 17:12:53 +0200 (Mon, 20 Sep 2010)

Log Message:
-----------
Some fixes for warnings found while investigating quicktime-related bug reports.

Modified Paths:
--------------
    trunk/blender/source/blender/quicktime/apple/quicktime_import.c

Modified: trunk/blender/source/blender/quicktime/apple/quicktime_import.c
===================================================================
--- trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2010-09-20 13:35:55 UTC (rev 32029)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_import.c	2010-09-20 15:12:53 UTC (rev 32030)
@@ -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 @@
 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 *ibuf = NULL;
 	unsigned int *rect;
+#ifdef __APPLE__
 	unsigned char *from, *to;
+#endif
 #ifdef _WIN32
 	unsigned char *crect;
 #endif
@@ -373,7 +382,7 @@
 	}
 #endif
 
-	ibuf->profile == IB_PROFILE_SRGB;
+	ibuf->profile = IB_PROFILE_SRGB;
 	
 	IMB_flipy(ibuf);
 	return ibuf;