FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Eric Wing and Stephan Huber, ImageIO code originally wrote by Eric Wing, and then later conveted into an OSG plugin by Stephan Huber.

Browse Source
This commit is contained in:
Robert Osfield
2009-03-10 10:30:34 +00:00
parent 5059aa808b
commit e7c4cda108
5 changed files with 1292 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/osgDB/CMakeLists.txt
View File

@@ -76,7 +76,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)

13
src/osgDB/Registry.cpp
View File

@@ -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");