Mac / COCOA : Imbuf

- replace libtiff by calls to Cocoa services to load/save tiff files
(Libtiff, dynamically linked is not distributed with OS X, and would have had to be shipped for all four architectures)

The imb_cocoaLoadImage & imb_cocoaSaveImage are generic towards the bitmap format, and thus can handle TIFF, GIF, JPG, JP2000, BMP and raw camera formats (read-only for these), even if today only TIFF is used as the other formats are already handled.

- CMake updated
- scons updated (Thx to Jens Verwiebe)

1 files changed, 7 insertions, 0 deletions

diff --git a/source/creator/creator.c b/source/creator/creator.c
index 6f90c2ffe84..9749b724672 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -368,8 +368,10 @@ int main(int argc, char **argv)
 			switch(argv[a][1]) {
 			case 'a': /* -b was not given, play an animation */
 				
+#if !(defined(__APPLE__) && defined(GHOST_COCOA))
 				/* exception here, see below, it probably needs happens after qt init? */
 				libtiff_init();
+#endif
 
 // XXX				playanim(argc-1, argv+1);
 				exit(0);
@@ -538,6 +540,10 @@ int main(int argc, char **argv)
 
 #endif /* WITH_QUICKTIME */
 
+#if defined(__APPLE__) && defined(GHOST_COCOA)
+	/* libtiff is not used, Cocoa services are used instead for tiff I/O */
+	G.have_libtiff = 1;
+#else
 	/* dynamically load libtiff, if available */
 	libtiff_init();
 	if (!G.have_libtiff && (G.f & G_DEBUG)) {
@@ -545,6 +551,7 @@ int main(int argc, char **argv)
 		printf("Try setting the BF_TIFF_LIB environment variable if you want this support.\n");
 		printf("Example: setenv BF_TIFF_LIB /usr/lib/libtiff.so\n");
 	}
+#endif
 
 	/* OK we are ready for it */