2.8 branch: Backport latest ImageIO plugin from trunk. This commit includes the following svn trunk revisions: 9880, 10623, 10854, and 10855.

src/osgDB/CMakeLists.txt

@@ -75,7 +75,16 @@ ADD_LIBRARY(${LIB_NAME}
 IF(APPLE)
     # Needs CoreFoundation calls and a Carbon function
     SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY})
-    ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
+ 
+    SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "standard image plugin for os x, options are quicktime, imageio")
+
+
+    IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+        ADD_DEFINITIONS(-DDARWIN_QUICKTIME)
+    ELSE(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+        ADD_DEFINITIONS(-DDARWIN_IMAGEIO)
+    ENDIF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
+
 ENDIF(APPLE)
 
 IF(QUICKTIME_FOUND)

src/osgDB/Registry.cpp

@@ -239,6 +239,19 @@ Registry::Registry()
     addFileExtensionAlias("vert",   "glsl");
     addFileExtensionAlias("frag",   "glsl");
 
+
+#if defined(DARWIN_IMAGEIO)
+    addFileExtensionAlias("jpg",  "imageio");
+    addFileExtensionAlias("jpe",  "imageio");
+    addFileExtensionAlias("jpeg", "imageio");
+    addFileExtensionAlias("tif",  "imageio");
+    addFileExtensionAlias("tiff", "imageio");
+    addFileExtensionAlias("gif",  "imageio");
+    addFileExtensionAlias("png",  "imageio");
+    addFileExtensionAlias("psd",  "imageio");
+    addFileExtensionAlias("tga",  "imageio");
+#endif
+
 #if defined(DARWIN_QUICKTIME)
     addFileExtensionAlias("jpg",  "qt");
     addFileExtensionAlias("jpe",  "qt");

src/osgPlugins/CMakeLists.txt

@@ -200,6 +200,10 @@ IF(XINE_FOUND)
     ADD_SUBDIRECTORY(xine)
 ENDIF(XINE_FOUND)
 
+IF(APPLE)
+    ADD_SUBDIRECTORY(imageio)
+ENDIF(APPLE)
+
 IF(QUICKTIME_FOUND)
     ADD_SUBDIRECTORY(quicktime)
 ENDIF(QUICKTIME_FOUND)

src/osgPlugins/imageio/CMakeLists.txt

@@ -0,0 +1,9 @@
+SET(TARGET_SRC ReaderWriterImageIO.cpp )
+
+SET(TARGET_ADDED_LIBRARIES)
+SET(TARGET_LIBRARIES_VARS IMAGEIO_LIBRARY )
+SET(TARGET_EXTERNAL_LIBRARIES "/System/Library/Frameworks/Accelerate.framework" )
+
+#### end var setup  ###
+SETUP_PLUGIN(imageio)
+