Changeset 9880

Show
Ignore:
Timestamp:
03/10/09 11:30:34 (6 years ago)
Author:
robert
Message:

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

Location:
OpenSceneGraph/trunk/src
Files:
3 added
3 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgDB/CMakeLists.txt

    r9671 r9880  
    7777    # Needs CoreFoundation calls and a Carbon function 
    7878    SET(OSGDB_PLATFORM_SPECIFIC_LIBRARIES ${CARBON_LIBRARY}) 
    79     ADD_DEFINITIONS(-DDARWIN_QUICKTIME) 
     79  
     80    SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "standard image plugin for os x, options are quicktime, imageio") 
     81 
     82 
     83    IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime") 
     84        ADD_DEFINITIONS(-DDARWIN_QUICKTIME) 
     85    ELSE(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime") 
     86        ADD_DEFINITIONS(-DDARWIN_IMAGEIO) 
     87    ENDIF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime") 
     88 
    8089ENDIF(APPLE) 
    8190 
  • OpenSceneGraph/trunk/src/osgDB/Registry.cpp

    r9717 r9880  
    239239    addFileExtensionAlias("vert",   "glsl"); 
    240240    addFileExtensionAlias("frag",   "glsl"); 
     241 
     242 
     243#if defined(DARWIN_IMAGEIO) 
     244    addFileExtensionAlias("jpg",  "imageio"); 
     245    addFileExtensionAlias("jpe",  "imageio"); 
     246    addFileExtensionAlias("jpeg", "imageio"); 
     247    addFileExtensionAlias("tif",  "imageio"); 
     248    addFileExtensionAlias("tiff", "imageio"); 
     249    addFileExtensionAlias("gif",  "imageio"); 
     250    addFileExtensionAlias("png",  "imageio"); 
     251    addFileExtensionAlias("psd",  "imageio"); 
     252    addFileExtensionAlias("tga",  "imageio"); 
     253#endif 
    241254 
    242255#if defined(DARWIN_QUICKTIME) 
  • OpenSceneGraph/trunk/src/osgPlugins/CMakeLists.txt

    r9855 r9880  
    205205# ENDIF(OPENAL_FOUND) 
    206206 
     207IF(APPLE) 
     208    ADD_SUBDIRECTORY(imageio) 
     209ENDIF(APPLE) 
     210 
    207211IF(QUICKTIME_FOUND) 
    208212    ADD_SUBDIRECTORY(quicktime)