diff -Nru opencolorio-1.0.9~dfsg0/.appveyor.yml opencolorio-1.1.0~dfsg0/.appveyor.yml
--- opencolorio-1.0.9~dfsg0/.appveyor.yml	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/.appveyor.yml	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,37 @@
+version: '{branch}-{build}'
+image: Visual Studio 2013
+clone_folder: C:\source\ocio
+test: auto
+configuration:
+    - Release
+platform:
+    - x64
+   
+environment:
+  global:
+      CMAKE_PREFIX_PATH: C:/Libraries/boost
+      BOOST_ROOT: 'C:\Libraries\boost'
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      CMAKE_PLATFORM: "Visual Studio 12 2013 Win64"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      CMAKE_PLATFORM: "Visual Studio 14 2015 Win64"
+
+install:
+  - cinstall: python
+  
+build_script:
+  - echo Running cmake...
+  - mkdir _build
+  - cd _build
+  - cmake 
+    -G "%CMAKE_PLATFORM%"
+    -DCMAKE_INSTALL_PREFIX=..\_install
+    -DOCIO_USE_BOOST_PTR=ON
+    -DCMAKE_BUILD_TYPE=%CONFIGURATION%
+    ..
+  - cmake --build . --target install --config %CONFIGURATION%
+  - cmake --build . --target MainTests --config %CONFIGURATION%
+
+matrix:
+    fast_finish: true
diff -Nru opencolorio-1.0.9~dfsg0/ChangeLog opencolorio-1.1.0~dfsg0/ChangeLog
--- opencolorio-1.0.9~dfsg0/ChangeLog	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/ChangeLog	2018-01-05 01:38:27.000000000 +0000
@@ -1,3 +1,27 @@
+**Version 1.1.0 (Jan 5 2018):**
+    * libc++ build fixes
+    * Added support for YAML > 5.0.1
+    * YAML and TinyXML patch fixes
+    * Clang visibility fix
+    * Added write support for Truelight LUTs
+    * Improved OCIOYaml
+    * Python string corruption fix
+    * Added support for CDL
+    * Updated documentation
+    * Added args/kwargs support to Python MatrixTransform
+    * Added description field to Look objects
+    * Improved Python 3 compatibility
+    * CSP file read fix
+    * Added Linux, MacOS, and Windows continuos integration
+    * Improved 1D LUT extrapolation
+    * Improved 1D LUT negative handling
+    * Improved Windows build system
+    * Improved cross-platform build system
+    * Undefined role crash fix
+    * After Effects plugin updated
+    * Added reference Photoshop plugin
+    * Added reference Docker image
+
 **Version 1.0.9 (Sep 2 2013):**
     * CDL cccid supports both named id and index lookups
     * ociobakelut / ocioconvert updates
diff -Nru opencolorio-1.0.9~dfsg0/CMakeLists.txt opencolorio-1.1.0~dfsg0/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -1,7 +1,7 @@
 project(OpenColorIO)
 set(OCIO_VERSION_MAJOR 1)
-set(OCIO_VERSION_MINOR 0)
-set(OCIO_VERSION_PATCH 9)
+set(OCIO_VERSION_MINOR 1)
+set(OCIO_VERSION_PATCH 0)
 
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/share/cmake)
@@ -12,18 +12,20 @@
 ###############################################################################
 ### GLOBAL ###
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 option(OCIO_BUILD_SHARED "Set to OFF to disable building the shared core library" ON)
 option(OCIO_BUILD_STATIC "Set to OFF to disable building the static core library" ON)
 option(OCIO_BUILD_TRUELIGHT "Set to OFF to disable truelight" ON)
 option(OCIO_BUILD_APPS "Set to OFF to disable command-line apps" ON)
 option(OCIO_BUILD_NUKE "Set to OFF to disable building nuke plugins" ON)
-option(OCIO_BUILD_DOCS "Specify whether to build documentation" OFF)
-option(OCIO_BUILD_TESTS "Specify whether to build unittests" OFF)
+option(OCIO_BUILD_DOCS "Specify whether to build documentation" UNIX)
+option(OCIO_BUILD_TESTS "Specify whether to build unittests" ON)
 option(OCIO_BUILD_PYGLUE "Specify whether to build python bindings" ON)
 option(OCIO_BUILD_JNIGLUE "Specify whether to build java bindings" OFF)
 option(OCIO_STATIC_JNIGLUE "Specify whether to statically link ocio to the java bindings" ON)
 
 option(OCIO_USE_SSE "Specify whether to enable SSE CPU performance optimizations" ON)
+option(OCIO_INLINES_HIDDEN "Specify whether to build with -fvisibility-inlines-hidden" UNIX)
 
 # Use boost's shared_ptr by default on Windows (as <VS2010 doesn't have it),
 # Use std::tr1::shared_ptr by default on other platforms
@@ -49,7 +51,10 @@
 endif()
 
 ###############################################################################
-
+if(POLICY CMP0054)
+    ## Only interpret if() arguments as variables or keywords when unquoted
+    cmake_policy(SET CMP0054 NEW)
+endif()
 
 include(ParseArguments)
 include(OCIOMacros)
@@ -116,6 +121,17 @@
     set(OCIO_USE_BOOST_PTR 0)
 endif()
 
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+    if(OCIO_INLINES_HIDDEN)
+        execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
+                        OUTPUT_VARIABLE GCC_VERSION)
+        if (GCC_VERSION VERSION_LESS 4.2)
+            message(STATUS "WARNING: GCC Version < 4.2 - disabling hidden inlines")
+            set(OCIO_INLINES_HIDDEN OFF)
+        endif()
+    endif()
+endif()
+
 if(CMAKE_COMPILER_IS_GNUCXX)
     # Enable a bunch of compiler warnings...
     # http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
@@ -123,23 +139,25 @@
     # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-if(WIN32)
-    if(PYTHON_VERSION AND PYTHON_INCLUDE AND PYTHON_LIB)
-        set(EXTDIST_PYTHONPATH ${PYTHON_LIB}/python${PYTHON_VARIANT_PATH}/site-packages)
-        set(PYTHONPATH ${EXTDIST_PYTHONPATH};$ENV{PYTHONPATH})
-        set(PYTHON_OK YES)
-        message(STATUS "Setting Python path to: ${PYTHONPATH}")
-    endif()
-else()
-    # Find Python, used for (possibly) building pyglue, and now to
-    # construct the external project path
-    OCIOFindPython()
+###############################################################################
+### Python ###
 
-    set(EXTDIST_ROOT ${CMAKE_BINARY_DIR}/ext/dist)
-    set(EXTDIST_BINPATH ${EXTDIST_ROOT}/bin)
-    if(PYTHON_OK)
-        set(EXTDIST_PYTHONPATH ${EXTDIST_ROOT}/lib/python${PYTHON_VERSION}/site-packages)
+OCIOFindPython()
+
+# Find Python, used for (possibly) building pyglue, and now to
+# construct the external project path
+set(EXTDIST_ROOT ${CMAKE_BINARY_DIR}/ext/dist)
+set(EXTDIST_BINPATH ${EXTDIST_ROOT}/bin)
+if(PYTHON_OK)
+    set(EXTDIST_PYTHONPATH ${EXTDIST_ROOT}/${PYTHON_VARIANT_PATH})
+    if(UNIX)
         set(PYTHONPATH ${EXTDIST_PYTHONPATH}:$ENV{PYTHONPATH})
+    else()
+        # The line below should work but ';' is always replaced by a space
+        #   which breaks the build. Anyway in the worst scenario, no expected
+        #   modules are present in the local python so install them.
+        #set(PYTHONPATH ${EXTDIST_PYTHONPATH}\\;$ENV{PYTHONPATH})
+        set(PYTHONPATH ${EXTDIST_PYTHONPATH})
     endif()
 endif()
 
@@ -148,6 +166,7 @@
 
 ###############################################################################
 ### tinyxml ###
+##TODO: yaml and tinyxml : when there are not USE_EXTERNAL_TINYXML, use the same cmake schema/instructions => maybe refactorize in a cmake functions/macros ?
 
 if(USE_EXTERNAL_TINYXML)
     set(TINYXML_VERSION_MIN "2.6.1")
@@ -165,22 +184,65 @@
 
 else(USE_EXTERNAL_TINYXML)
     set(TINYXML_VERSION 2_6_1)
-    set(TINYXML_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist)
+    set(TINYXML_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist -DOCIO_INLINES_HIDDEN:BOOL=${OCIO_INLINES_HIDDEN})
     if(CMAKE_TOOLCHAIN_FILE)
         set(TINYXML_CMAKE_ARGS ${TINYXML_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
     endif()
-    ExternalProject_Add(tinyxml
-        URL ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.tar.gz
-        PATCH_COMMAND patch -f -p1 < ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.patch
-        BINARY_DIR ext/build/tinyxml
-        INSTALL_DIR ext/dist
-        CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
-    )
-    if(WIN32)
-        set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
-    else()
-        set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libtinyxml.a)
+    set(TINYXML_CMAKE_ARGS ${TINYXML_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+    set(TINYXML_ZIPFILE     "${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.tar.gz")
+    set(TINYXML_PATCHFILE   "${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.patch")
+    set(TINYXML_SOURCE_DIR  "${CMAKE_BINARY_DIR}/ext")
+    ## Create our TINYXML_LIB target
+    if(CMAKE_VERSION VERSION_GREATER "2.8.7")
+        option(TINYXML_OBJECT_LIB_EMBEDDED ${OCIO_BUILD_STATIC} "directly embedded tinyxml 3rdParty object lib into our resulting static lib, no link needed anymore")
+    else()
+        set(TINYXML_OBJECT_LIB_EMBEDDED OFF CACHE BOOL "directly embedded tinyxml 3rdParty object lib into our resulting static lib, no link needed anymore" FORCE)
+        message("Force disable TINYXML_OBJECT_LIB_EMBEDDED feature due to CMake Version less than 2.8.8")
+    endif()
+    mark_as_advanced(TINYXML_OBJECT_LIB_EMBEDDED) ## two way to build with tinyxml (objects embedded or static transitive link)
+    if(TINYXML_OBJECT_LIB_EMBEDDED)
+        set(tinyxml_sources ${TINYXML_SOURCE_DIR}/tinyxml/tinystr.cpp       ${TINYXML_SOURCE_DIR}/tinyxml/tinyxml.cpp 
+                            ${TINYXML_SOURCE_DIR}/tinyxml/tinyxmlerror.cpp  ${TINYXML_SOURCE_DIR}/tinyxml/tinyxmlparser.cpp )
+        set(tinyxml_headers ${TINYXML_SOURCE_DIR}/tinyxml/tinystr.h         ${TINYXML_SOURCE_DIR}/tinyxml/tinyxml.h )
+        add_custom_command(                                 ## will be done at build time
+            OUTPUT ${tinyxml_sources} ${tinyxml_headers}    ## expected output files
+            COMMAND ${CMAKE_COMMAND} -E tar xzf ${TINYXML_ZIPFILE}
+            DEPENDS ${TINYXML_ZIPFILE}
+            WORKING_DIRECTORY ${TINYXML_SOURCE_DIR}
+            COMMENT "Unpacking ${TINYXML_ZIPFILE} to ${TINYXML_SOURCE_DIR}"
+            VERBATIM
+        )
+        include_directories(BEFORE ${TINYXML_SOURCE_DIR}/tinyxml) ## needed to build correctly
+        add_library(TINYXML_LIB OBJECT ${tinyxml_sources})
+        ## embedded tinyxml objects files (no static link needed anymore) 
+        ## => great news when build staticaly since we do not want another client project have to link also with tinyxml when he want to use this project
+        ## => could be problematic if the client project use another version of tinyxml... In this case build tinyxml as shared lib with all projects could be a solution
+        ## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
+        set_target_properties(TINYXML_LIB PROPERTIES COMPILE_FLAGS "-DTIXML_USE_STL -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
+        add_definitions(-DTIXML_USE_STL) ## needed to build correctly, and also need to be propagated in child projects (client projects)
+        list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:TINYXML_LIB>)
+    else()
+        find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
+        ExternalProject_Add(tinyxml
+            URL             ${TINYXML_ZIPFILE}
+            SOURCE_DIR      ${TINYXML_SOURCE_DIR}/tinyxml
+            PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${TINYXML_PATCHFILE}
+            BINARY_DIR      ext/build/tinyxml
+            INSTALL_DIR     ext/dist
+            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS}
+        )
+        if(WIN32)
+            set(TINYXML_STATIC_LIBRARIES  ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
+        else()
+            set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libtinyxml.a)
+        endif()
+        add_library(TINYXML_LIB STATIC IMPORTED)
+        ## static is the .lib location, shared is the .dll/.so location (see IMPORTED_IMPLIB for the associated .lib archive location on windows)
+        set_property(TARGET TINYXML_LIB PROPERTY IMPORTED_LOCATION ${TINYXML_STATIC_LIBRARIES})
+        add_dependencies(TINYXML_LIB tinyxml)
+        list(APPEND EXTERNAL_LIBRARIES TINYXML_LIB)
     endif()
+    set_target_properties(TINYXML_LIB PROPERTIES FOLDER External)
 endif(USE_EXTERNAL_TINYXML)
     
 ###############################################################################
@@ -190,67 +252,149 @@
     # Set minimum yaml version for non-patched sources.
     set(YAML_VERSION_MIN "0.3.0")
     include(FindPkgConfig)
-    pkg_check_modules(YAML_CPP yaml-cpp)
+    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
+    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
+        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
+    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
+        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
+    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
+    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
+    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
+
+    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
+        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
+    endif()
+
+    find_package_handle_standard_args(yaml-cpp
+                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
+    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
+    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
+
     if(YAML_CPP_FOUND)
-        if(YAML_CPP_VERSION VERSION_EQUAL ${YAML_VERSION_MIN} OR
-           YAML_CPP_VERSION VERSION_GREATER ${YAML_VERSION_MIN})
-            message(STATUS "System yaml-cpp library will be used.")
-            include_directories(BEFORE ${YAML_CPP_INCLUDE_DIRS})
-        else()
-            message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
+        if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
+            # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
+            # Don't bother doing this step if we are already including the boost headers for shared_ptr
+            if(NOT OCIO_USE_BOOST_PTR)
+                set(Boost_ADDITIONAL_VERSIONS "1.49" "1.45" "1.44" "1.43" "1.43.0" "1.42"
+                                              "1.42.0" "1.41" "1.41.0" "1.40"
+                                              "1.40.0" "1.39" "1.39.0" "1.38"
+                                              "1.38.0" "1.37" "1.37.0" "1.34.1"
+                                              "1_34_1")
+                set(Boost_USE_MULTITHREADED ON)
+                find_package(Boost 1.34)
+                if(NOT Boost_FOUND)
+                    message(FATAL_ERROR "Error: Detected system yaml-cpp version ${YAML_CPP_VERSION} is greater than 0.5.0, and therefore requires boost, but a boost installation could not be found.")
+                endif()
+
+                set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
+            endif()
         endif()
+        set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${YAML_CPP_INCLUDE_DIRS})
     else(YAML_CPP_FOUND)
         message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.")
     endif(YAML_CPP_FOUND)
-else(USE_EXTERNAL_YAML)
+else(USE_EXTERNAL_YAML) ## provide 2 ways to build this dependency
     set(YAML_CPP_VERSION 0.3.0)
-    set(YAML_CPP_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist -DYAML_CPP_BUILD_TOOLS:BOOL=FALSE)
+    set(YAML_CPP_CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${PROJECT_BINARY_DIR}/ext/dist -DYAML_CPP_BUILD_TOOLS:BOOL=FALSE -DOCIO_INLINES_HIDDEN:BOOL=${OCIO_INLINES_HIDDEN})
     if(CMAKE_TOOLCHAIN_FILE)
         set(YAML_CPP_CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
     endif()
-    ExternalProject_Add(YAML_CPP_LOCAL
-        URL ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.tar.gz
-        BINARY_DIR ext/build/yaml-cpp
-        PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.patch
-        INSTALL_DIR ext/dist
-        CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS}
-    )
-    set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
-    set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
-    if(WIN32)
-        set(YAML_CPP_STATIC_DEBUG_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmdd.lib)
-        set(YAML_CPP_STATIC_OPTIMIZED_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmd.lib)
-    else()
-        set(YAML_CPP_STATIC_GENERAL_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cpp.a)
+    set(YAML_CPP_CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+    set(YAML_CPP_ZIPFILE        "${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.tar.gz")
+    set(YAML_CPP_SOURCE_DIR     "${CMAKE_BINARY_DIR}/ext")
+    set(YAML_CPP_PATCHFILE      "${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.patch")
+    set(YAML_CPP_SRCLISTFILE    "${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}-sourcesList.txt") ## see cmd line for this generated file bellow
+    ## Create our YAML_CPP_LIB target
+    if(CMAKE_VERSION VERSION_GREATER "2.8.7")
+        option(YAML_CPP_OBJECT_LIB_EMBEDDED ${OCIO_BUILD_STATIC} "directly embedded yaml-cpp 3rdParty lib into our resulting static lib, no link needed anymore")
+    else()
+        set(YAML_CPP_OBJECT_LIB_EMBEDDED OFF CACHE BOOL "directly embedded yaml-cpp 3rdParty object lib into our resulting static lib, no link needed anymore" FORCE)
+        message("Force disable YAML_CPP_OBJECT_LIB_EMBEDDED feature due to CMake Version less than 2.8.8")
+    endif()
+    mark_as_advanced(YAML_CPP_OBJECT_LIB_EMBEDDED)
+    if(YAML_CPP_OBJECT_LIB_EMBEDDED)        
+        ## generated at extraction level dir, with (use git bash or cygwin under windows): 
+        ## find yaml-cpp -type f \( -name "*.h" -o -name "*.cpp" \) -not \( -path "*/test/*" -o -path "*/util/*" \) > yaml-cpp-sourcesList.txt
+        ## this will exclude test and util paths since we want YAML_CPP_BUILD_TOOLS:BOOL=OFF (see externalProject cmake args)
+        file(STRINGS ${YAML_CPP_SRCLISTFILE} YAML_CPP_SRCLISTFILE_CONTENT)
+        foreach(yamlsrc ${YAML_CPP_SRCLISTFILE_CONTENT})
+            list(APPEND yamlcpp_sources ${YAML_CPP_SOURCE_DIR}/${yamlsrc})  ## get absolute filepath
+        endforeach()
+        include_directories(BEFORE ${YAML_CPP_SOURCE_DIR}/yaml-cpp/include) ## needed to build correctly
+        add_custom_command(             ## will be done at build time
+            OUTPUT ${yamlcpp_sources}   ## expected output files
+            COMMAND ${CMAKE_COMMAND} -E tar xzf ${YAML_CPP_ZIPFILE}
+            DEPENDS ${YAML_CPP_ZIPFILE}
+            WORKING_DIRECTORY ${YAML_CPP_SOURCE_DIR}
+            COMMENT "Unpacking ${YAML_CPP_ZIPFILE} to ${YAML_CPP_SOURCE_DIR}"
+            VERBATIM
+        )
+        add_library(YAML_CPP_LIB OBJECT ${yamlcpp_sources})
+        ## embedded yaml-cpp objects files (no static link needed anymore)
+        ## => great news when build statically since we do not want another client project have to link also with yaml-cpp when he want to use this project
+        ## => could be problematic if the client project use another version of yaml-cpp... In this case build yaml-cpp as shared lib with all projects could be a solution 
+        ## => TODO: so maybe provide a simple cmake way to build 3rdParty as shared and auto install with this project ?
+        list(APPEND EXTERNAL_OBJECTS $<TARGET_OBJECTS:YAML_CPP_LIB>) 
+    else()
+        find_package(Git REQUIRED) ## in order to apply patch (for crossplateform compatibility)
+        ExternalProject_Add(YAML_CPP_LOCAL
+            URL             ${YAML_CPP_ZIPFILE}
+            SOURCE_DIR      ${YAML_CPP_SOURCE_DIR}/yaml-cpp
+            PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${YAML_CPP_PATCHFILE}
+            BINARY_DIR      ext/build/yaml-cpp
+            INSTALL_DIR     ext/dist
+            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS}
+        )
+        set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
+        set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
+        add_library(YAML_CPP_LIB STATIC IMPORTED)
+        if(WIN32)
+            set(YAML_CPP_STATIC_DEBUG_LIBRARIES     ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmdd.lib)
+            set(YAML_CPP_STATIC_OPTIMIZED_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cppmd.lib)
+            set_property(TARGET YAML_CPP_LIB PROPERTY IMPORTED_LOCATION_DEBUG   ${YAML_CPP_STATIC_DEBUG_LIBRARIES})
+            set_property(TARGET YAML_CPP_LIB PROPERTY IMPORTED_LOCATION_RELEASE ${YAML_CPP_STATIC_OPTIMIZED_LIBRARIES})
+        else()
+            set(YAML_CPP_STATIC_GENERAL_LIBRARIES           ${PROJECT_BINARY_DIR}/ext/dist/lib/libyaml-cpp.a)
+            set_property(TARGET YAML_CPP_LIB PROPERTY IMPORTED_LOCATION ${YAML_CPP_STATIC_GENERAL_LIBRARIES})
+        endif()
+        add_dependencies(YAML_CPP_LIB  YAML_CPP_LOCAL)
+        list(APPEND EXTERNAL_LIBRARIES YAML_CPP_LIB)
     endif()
+    set_target_properties(YAML_CPP_LIB PROPERTIES FOLDER External)
 endif(USE_EXTERNAL_YAML)
 
-
+if(YAML_CPP_VERSION VERSION_LESS "0.5.0")
+    set(YAML_CPP_COMPILE_FLAGS "-DOLDYAML")
+endif()
 
 ###############################################################################
 ### Externals ###
 
 set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/ext/dist/include)
-set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL")
 
-if(CMAKE_COMPILER_IS_GNUCXX)
-    
-    execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
-                    OUTPUT_VARIABLE GCC_VERSION)
-                    
-    if (GCC_VERSION VERSION_LESS 4.2)
-        message(STATUS "GCC Version < 4.2 - symbol visibility hiding disabled")
-        set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -fPIC")
-    else()
-        set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -fPIC -fvisibility-inlines-hidden -fvisibility=hidden")
+## maybe better to separate too general COMPILE_FLAGS (which are compiler specific) and split with specific COMPILE_DEFINITIONS
+## so we can easily export it from cmake for the installation and be used easily in child projects ?
+
+if(UNIX)
+    set(GCC_COMPILE_FLAGS "${GCC_COMPILE_FLAGS} -fPIC -fvisibility=hidden")
+    if(OCIO_INLINES_HIDDEN)
+        set(GCC_COMPILE_FLAGS "${GCC_COMPILE_FLAGS} -fvisibility-inlines-hidden")
     endif()
+else()
+    set(OCIO_INLINES_HIDDEN OFF)
 endif()
 
+set(EXTERNAL_COMPILE_FLAGS "-DTIXML_USE_STL ${YAML_CPP_COMPILE_FLAGS} ${GCC_COMPILE_FLAGS}")
+
 set(EXTERNAL_LINK_FLAGS "")
 set(EXTERNAL_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
-set(EXTERNAL_DEBUG_LIBRARIES ${YAML_CPP_STATIC_DEBUG_LIBRARIES})
-set(EXTERNAL_OPTIMIZED_LIBRARIES ${YAML_CPP_STATIC_OPTIMIZED_LIBRARIES})
-set(EXTERNAL_GENERAL_LIBRARIES ${TINYXML_STATIC_LIBRARIES} ${YAML_CPP_STATIC_GENERAL_LIBRARIES})
+## EXTERNAL_OBJECTS (used with add_library) or EXTERNAL_LIBRARIES (used with target_link_libraries) are available
+## One will be empty (no effect) whereas the other will contain external dep to use (as object to incorporate or static lib to link)
+if(EXTERNAL_OBJECTS)
+    list(REMOVE_DUPLICATES EXTERNAL_OBJECTS)
+elseif(EXTERNAL_LIBRARIES)
+    list(REMOVE_DUPLICATES EXTERNAL_LIBRARIES)
+endif()
 
 ###############################################################################
 ### Documentation ###
@@ -313,7 +457,8 @@
 ###############################################################################
 ### APPS ###
 
-if(OCIO_BUILD_APPS)
+if(OCIO_BUILD_APPS AND (OCIO_BUILD_STATIC OR OCIO_BUILD_SHARED) )
+
     # Try to find OpenImageIO (OIIO) and OpenGL stuff
     OCIOFindOpenImageIO()
     
@@ -330,6 +475,8 @@
     if(OPENGL_FOUND AND GLUT_FOUND AND GLEW_FOUND AND OIIO_FOUND)
         add_subdirectory(src/apps/ociodisplay)
     else()
+        ## GLEW : http://glew.sourceforge.net/install.html
+        ## on windows, if you use STATIC version, do not forget to use : GEW_BUILD=GLEW_STATIC preprocessor definition
         messageonce("Not building ociodisplay. Requirement(s) found, OpenGL:${OPENGL_FOUND}, GLUT:${GLUT_FOUND}, GLEW:${GLEW_FOUND}, OIIO:${OIIO_FOUND}")
     endif()
     
@@ -338,6 +485,9 @@
     
     # ociobakelut writes out luts
     add_subdirectory(src/apps/ociobakelut)
+    
+else()
+    message(STATUS "Disable build of apps. See cmake options : OCIO_BUILD_APPS and OCIO_BUILD_SHARED/OCIO_BUILD_STATIC (requiered)")
 endif()
 
 ###############################################################################
@@ -356,7 +506,7 @@
 ###############################################################################
 ### PYGLUE ###
 
-if(OCIO_BUILD_PYGLUE)
+if(OCIO_BUILD_PYGLUE AND NOT ${CMAKE_BUILD_TYPE} MATCHES "Debug")
     if(PYTHON_OK)
         add_subdirectory(src/pyglue)
     else()
@@ -404,3 +554,96 @@
 
 # Log CMake first run done
 SET(CMAKE_FIRST_RUN 0 CACHE INTERNAL "")
+
+
+
+## Export install
+## Example of usage by another project :
+##  set(OpenColorIO_DIR "" CACHE PATH "the installation dir of OpenColorIO (Where to find OpenColorIOConfig.cmake)")
+##  option(OpenColorIO_USE_STATIC OFF "use static target version of OpenColorIO")
+##  find_package(OpenColorIO)
+##  if(OPENCOLORIO_FOUND)
+##      include_directories(${OpenColorIO_INCLUDE_DIR})
+##      foreach(OCIO_DEF ${OCIO_COMPILE_DEFINITIONS})
+##          add_definitions(-D${OCIO_DEF})
+##      endforeach()
+##  endif()
+## <Then use latter in your project>
+## Target_link_library(<myTarget> ${OpenColorIO_LIBRARIES})
+get_property(OCIO_DIR_COMPILE_DEFINITIONS DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+if(NOT OCIO_DIR_COMPILE_DEFINITIONS)
+    set(OCIO_DIR_COMPILE_DEFINITIONS )
+endif()
+if(TARGET OpenColorIO)
+    get_target_property(OCIO_SHARED_COMPILE_DEFINITIONS OpenColorIO COMPILE_DEFINITIONS)
+    if(OCIO_SHARED_COMPILE_DEFINITIONS)
+        set(OCIO_SHARED_COMPILE_DEFINITIONS ${OCIO_SHARED_COMPILE_DEFINITIONS} ${OCIO_DIR_COMPILE_DEFINITIONS})
+        list(REMOVE_DUPLICATES OCIO_SHARED_COMPILE_DEFINITIONS)
+    elseif(OCIO_DIR_COMPILE_DEFINITIONS)
+        set(OCIO_SHARED_COMPILE_DEFINITIONS ${OCIO_DIR_COMPILE_DEFINITIONS})
+    else()
+        set(OCIO_SHARED_COMPILE_DEFINITIONS )
+    endif()
+endif()
+if(TARGET OpenColorIO_STATIC)
+    get_target_property(OCIO_STATIC_COMPILE_DEFINITIONS OpenColorIO_STATIC COMPILE_DEFINITIONS)
+    if(OCIO_STATIC_COMPILE_DEFINITIONS)
+        set(OCIO_STATIC_COMPILE_DEFINITIONS ${OCIO_STATIC_COMPILE_DEFINITIONS} ${OCIO_DIR_COMPILE_DEFINITIONS})
+        list(REMOVE_DUPLICATES OCIO_STATIC_COMPILE_DEFINITIONS)
+    elseif(OCIO_DIR_COMPILE_DEFINITIONS)
+        set(OCIO_STATIC_COMPILE_DEFINITIONS ${OCIO_DIR_COMPILE_DEFINITIONS})
+    else()
+        set(OCIO_STATIC_COMPILE_DEFINITIONS )
+    endif()
+endif()
+install(EXPORT OpenColorIO DESTINATION cmake)
+file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
+    "
+    get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
+    
+    ## include
+    set(OpenColorIO_INCLUDE_DIR     \"\${OpenColorIO_DIR}/include\")
+    set(OpenColorIO_INCLUDE_DIRS    \"\${OpenColorIO_INCLUDE_DIR}\")
+    message(STATUS OpenColorIO_INCLUDE_DIRS=\${OpenColorIO_INCLUDE_DIRS})
+    
+    ## targets libraries + associated definitions
+    if(NOT TARGET OpenColorIO)
+        include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
+        if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
+            message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
+            set(OpenColorIO_LIBRARY         OpenColorIO)
+            set(OCIO_COMPILE_DEFINITIONS    ${OCIO_SHARED_COMPILE_DEFINITIONS})
+        endif()
+        if(NOT TARGET OpenColorIO AND TARGET OpenColorIO_STATIC)
+            message(STATUS \"static target OpenColorIO_STATIC : see OpenColorIO_LIBRARY\")
+            set(OpenColorIO_LIBRARY         OpenColorIO_STATIC)
+            set(OCIO_COMPILE_DEFINITIONS    ${OCIO_STATIC_COMPILE_DEFINITIONS})
+        elseif(TARGET OpenColorIO_STATIC AND OpenColorIO_USE_STATIC)
+            message(STATUS \"static target OpenColorIO_STATIC : see OpenColorIO_LIBRARY\")
+            set(OpenColorIO_LIBRARY OpenColorIO_STATIC)
+            set(OCIO_COMPILE_DEFINITIONS    ${OCIO_STATIC_COMPILE_DEFINITIONS})
+        endif()
+    endif()
+    set(OpenColorIO_LIBRARIES \${OpenColorIO_LIBRARY})
+    message(STATUS OpenColorIO_LIBRARIES=\${OpenColorIO_LIBRARIES})
+    
+    ## display available preprocessor definition to use
+    if(OCIO_COMPILE_DEFINITIONS)
+        message(STATUS \"OCIO_COMPILE_DEFINITIONS=\")
+        foreach(OCIO_DEF \${OCIO_COMPILE_DEFINITIONS})
+            message(STATUS \"   \${OCIO_DEF}\")
+        endforeach()
+    endif()
+    
+    ## found
+    if(OpenColorIO_INCLUDE_DIRS AND OpenColorIO_LIBRARIES)
+        set(OpenColorIO_FOUND ON)
+        set(OPENCOLORIO_FOUND ON)
+    else()
+        set(OpenColorIO_FOUND OFF)
+        set(OPENCOLORIO_FOUND OFF)
+    endif()
+    message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
+    "
+)
+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
diff -Nru opencolorio-1.0.9~dfsg0/debian/changelog opencolorio-1.1.0~dfsg0/debian/changelog
--- opencolorio-1.0.9~dfsg0/debian/changelog	2017-11-30 20:07:32.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/changelog	2018-01-19 13:30:25.000000000 +0000
@@ -1,3 +1,14 @@
+opencolorio (1.1.0~dfsg0-1) unstable; urgency=medium
+
+  * New upstream release
+    - debian/patches/: patchset updated against v1.1.0
+      - 0003-Fix_FTBFS_on_Linux.patch added
+  * debian/control: bump libyaml-cpp build-dependency
+  * debian/control: S-V bump 4.1.1 -> 4.1.3 (no changes needed)
+  * debian/copyright: http:// -> https:// for copyright format
+
+ -- Matteo F. Vescovi <mfv@debian.org>  Fri, 19 Jan 2018 14:30:25 +0100
+
 opencolorio (1.0.9~dfsg0-12) unstable; urgency=medium
 
   * debian/: dh bump 9 -> 10
diff -Nru opencolorio-1.0.9~dfsg0/debian/control opencolorio-1.1.0~dfsg0/debian/control
--- opencolorio-1.0.9~dfsg0/debian/control	2017-11-13 14:54:49.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/control	2018-01-16 16:23:33.000000000 +0000
@@ -14,7 +14,7 @@
  libopenimageio-dev [!powerpcspe !sh4],
  libqt5opengl5-dev,
  libtinyxml-dev,
- libyaml-cpp0.3-dev,
+ libyaml-cpp-dev,
  pkg-config,
  python-dev,
  python-docutils,
@@ -28,7 +28,7 @@
  texlive-latex-extra,
  texlive-latex-recommended
 X-Python-Version: >= 2.7
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Homepage: http://opencolorio.org
 Vcs-Git: https://anonscm.debian.org/git/pkg-phototools/opencolorio.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-phototools/opencolorio.git
diff -Nru opencolorio-1.0.9~dfsg0/debian/copyright opencolorio-1.1.0~dfsg0/debian/copyright
--- opencolorio-1.0.9~dfsg0/debian/copyright	2016-03-10 15:29:29.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/copyright	2018-01-19 13:28:55.000000000 +0000
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: opencolorio
 Source: https://github.com/imageworks/OpenColorIO
 
diff -Nru opencolorio-1.0.9~dfsg0/debian/patches/0001-Fix_built-in_documentation_dependencies.patch opencolorio-1.1.0~dfsg0/debian/patches/0001-Fix_built-in_documentation_dependencies.patch
--- opencolorio-1.0.9~dfsg0/debian/patches/0001-Fix_built-in_documentation_dependencies.patch	2016-12-09 21:27:40.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/patches/0001-Fix_built-in_documentation_dependencies.patch	2018-01-18 21:59:18.000000000 +0000
@@ -1,26 +1,29 @@
-From: "Matteo F. Vescovi" <mfvescovi@gmail.com>
-Date: Mon, 30 Dec 2013 10:14:49 +0100
+From: "Matteo F. Vescovi" <mfv@debian.org>
+Date: Thu, 18 Jan 2018 22:53:34 +0100
 Subject: Fix_built-in_documentation_dependencies
 
 ---
- CMakeLists.txt      |  5 +---
- docs/CMakeLists.txt | 67 ++---------------------------------------------------
- 2 files changed, 3 insertions(+), 69 deletions(-)
+ CMakeLists.txt      |  5 +--
+ docs/CMakeLists.txt | 92 ++---------------------------------------------------
+ 2 files changed, 4 insertions(+), 93 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 13e2d64..e1561c7 100644
+index b05c7e4..124f3de 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -135,15 +135,12 @@ else()
-     # construct the external project path
-     OCIOFindPython()
- 
--    set(EXTDIST_ROOT ${CMAKE_BINARY_DIR}/ext/dist)
--    set(EXTDIST_BINPATH ${EXTDIST_ROOT}/bin)
-     if(PYTHON_OK)
--        set(EXTDIST_PYTHONPATH ${EXTDIST_ROOT}/lib/python${PYTHON_VERSION}/site-packages)
-+        set(EXTDIST_PYTHONPATH /usr/lib/python${PYTHON_VERSION}/dist-packages)
+@@ -146,10 +146,8 @@ OCIOFindPython()
+ 
+ # Find Python, used for (possibly) building pyglue, and now to
+ # construct the external project path
+-set(EXTDIST_ROOT ${CMAKE_BINARY_DIR}/ext/dist)
+-set(EXTDIST_BINPATH ${EXTDIST_ROOT}/bin)
+ if(PYTHON_OK)
+-    set(EXTDIST_PYTHONPATH ${EXTDIST_ROOT}/${PYTHON_VARIANT_PATH})
++    set(EXTDIST_PYTHONPATH /usr/lib/python${PYTHON_VERSION}/dist-packages)
+     if(UNIX)
          set(PYTHONPATH ${EXTDIST_PYTHONPATH}:$ENV{PYTHONPATH})
+     else()
+@@ -161,7 +159,6 @@ if(PYTHON_OK)
      endif()
  endif()
  
@@ -29,23 +32,42 @@
  
  ###############################################################################
 diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index db42c2f..b1eac58 100644
+index 3fd0299..6dca5aa 100644
 --- a/docs/CMakeLists.txt
 +++ b/docs/CMakeLists.txt
-@@ -1,68 +1,5 @@
+@@ -1,90 +1,4 @@
  
- ###############################################################################
+-###############################################################################
 -### External Doc Apps ###
 -
+-if (WIN32)
+-    # Workaround to mimic *nix '> PYTHONPATH=XXX CMD' 
+-    #  on windows, it becomes  '> set PYTHONPATH=XXX \n call CMD'
+-    #   '\n' is here because '\\&' does not work.
+-    set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
+-    # Unfortunately some windows tools require to have
+-    #  the paths with the '\' (not working with '//').
+-    set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+-    string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
+-    set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-    string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
+-else()
+-    set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
+-    set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+-    set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-endif()
+-
 -# setuptools
 -# https://pypi.python.org/pypi/setuptools
 -set(SETUPTOOLS_VERSION 1.1.6)
+-
 -ExternalProject_Add(setuptools
 -    URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
 -    BUILD_IN_SOURCE 1
 -    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
 -)
 -
 -# docutils
@@ -56,8 +78,9 @@
 -    URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
 -    BUILD_IN_SOURCE 1
 -    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
 -)
 -
 -# jinja2
@@ -68,8 +91,9 @@
 -    URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
 -    BUILD_IN_SOURCE 1
 -    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
 -)
 -
 -# Pygments
@@ -80,8 +104,9 @@
 -    URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
 -    BUILD_IN_SOURCE 1
 -    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
 -)
 -
 -# sphinx
@@ -93,29 +118,32 @@
 -    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
 -    BUILD_IN_SOURCE 1
 -    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
 -)
 -
--###############################################################################
+ ###############################################################################
  ### Create Doc Targets ###
  
- message(STATUS "Create sphinx conf.py from conf.py.in")
-@@ -93,7 +30,7 @@ ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTransforms.h devel
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
+@@ -122,7 +36,7 @@ else()
+ endif()
  
  add_custom_target(doc ALL
--    COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-+    COMMAND PYTHONPATH=${PYTHONPATH} sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+-    COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
++    COMMAND ${PYT_PRE_CMD} sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
      DEPENDS
-         OpenColorIO
-         PyOpenColorIO
-@@ -118,7 +55,7 @@ find_package(LATEX)
+         ${DEPLIBS}
+         ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -144,9 +58,9 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+ 
+ find_package(LATEX)
  if(PDFLATEX_COMPILER)
-     
+-    
++
      add_custom_target(latex
--        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+        COMMAND PYTHONPATH=${PYTHONPATH} sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+-        COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++        COMMAND ${PYT_PRE_CMD} sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
          DEPENDS
              OpenColorIO
              ${CMAKE_BINARY_DIR}/docs/conf.py
diff -Nru opencolorio-1.0.9~dfsg0/debian/patches/0002-Fix_FTBFS_on_non-Linux_platforms.patch opencolorio-1.1.0~dfsg0/debian/patches/0002-Fix_FTBFS_on_non-Linux_platforms.patch
--- opencolorio-1.0.9~dfsg0/debian/patches/0002-Fix_FTBFS_on_non-Linux_platforms.patch	2016-12-09 21:27:40.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/patches/0002-Fix_FTBFS_on_non-Linux_platforms.patch	2018-01-18 21:59:18.000000000 +0000
@@ -1,66 +1,18 @@
 From: "Matteo F. Vescovi" <mfv@debian.org>
-Date: Fri, 9 Dec 2016 22:26:37 +0100
+Date: Thu, 18 Jan 2018 22:58:51 +0100
 Subject: Fix_FTBFS_on_non-Linux_platforms
 
 ---
- export/OpenColorIO/OpenColorABI.h.in |  2 +-
- src/core/PathUtils.cpp               | 15 ++++++++++++---
- src/core/Platform.h                  |  2 +-
- 3 files changed, 14 insertions(+), 5 deletions(-)
+ src/core/Platform.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/export/OpenColorIO/OpenColorABI.h.in b/export/OpenColorIO/OpenColorABI.h.in
-index 28e8006..99994bb 100644
---- a/export/OpenColorIO/OpenColorABI.h.in
-+++ b/export/OpenColorIO/OpenColorABI.h.in
-@@ -65,7 +65,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
- // If supported, define OCIOEXPORT, OCIOHIDDEN
- // (used to choose which symbols to export from OpenColorIO)
--#if defined __linux__ || __APPLE__ || __FreeBSD__
-+#if defined __GNUC__
-     #if __GNUC__ >= 4
-         #define OCIOEXPORT __attribute__ ((visibility("default")))
-         #define OCIOHIDDEN __attribute__ ((visibility("hidden")))
-diff --git a/src/core/PathUtils.cpp b/src/core/PathUtils.cpp
-index 3f18d97..00352b0 100644
---- a/src/core/PathUtils.cpp
-+++ b/src/core/PathUtils.cpp
-@@ -31,6 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <limits>
- #include <sstream>
- #include <sys/stat.h>
-+#include <errno.h>
- 
- #include <OpenColorIO/OpenColorIO.h>
- 
-@@ -150,9 +151,17 @@ OCIO_NAMESPACE_ENTER
-             _getcwd(path, MAXPATHLEN);
-             return path;
- #else
--            char path[MAXPATHLEN];
--            ::getcwd(path, MAXPATHLEN);
--            return path;
-+            std::vector<char> current_dir;
-+#ifdef PATH_MAX
-+            current_dir.resize(PATH_MAX);
-+#else
-+            current_dir.resize(1024);
-+#endif
-+            while (::getcwd(&current_dir[0], current_dir.size()) == NULL && errno == ERANGE) {
-+                current_dir.resize(current_dir.size() + 1024);
-+            }
-+
-+            return std::string(&current_dir[0]);
- #endif
-         }
-         
 diff --git a/src/core/Platform.h b/src/core/Platform.h
-index d2d3f30..c2b2833 100644
+index c1796e8..2155252 100644
 --- a/src/core/Platform.h
 +++ b/src/core/Platform.h
 @@ -85,7 +85,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ // assume linux/unix/posix
  
- // linux/unix/posix
  #include <stdlib.h>
 -#if !defined(__FreeBSD__)
 +#if !defined(__FreeBSD__) || !defined(__FreeBSD_kernel__)
diff -Nru opencolorio-1.0.9~dfsg0/debian/patches/0003-Fix_FTBFS_on_Linux.patch opencolorio-1.1.0~dfsg0/debian/patches/0003-Fix_FTBFS_on_Linux.patch
--- opencolorio-1.0.9~dfsg0/debian/patches/0003-Fix_FTBFS_on_Linux.patch	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/patches/0003-Fix_FTBFS_on_Linux.patch	2018-01-19 13:25:34.000000000 +0000
@@ -0,0 +1,86 @@
+From f39552d70098a98f7c1fb3b4f020b550ce2dd75a Mon Sep 17 00:00:00 2001
+From: Patrick Hodoul <patrick.hodoul@autodesk.com>
+Date: Mon, 27 Nov 2017 17:29:57 -0500
+Subject: Fix_Linux_compilation
+
+---
+ src/core/Lut1DOp.cpp                 |  4 +++-
+ src/core/MathUtils.cpp               | 23 ++++++++++++-----------
+ src/pyglue/PyAllocationTransform.cpp |  1 -
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp
+index 404ee0bc..180e30fc 100644
+--- a/src/core/Lut1DOp.cpp
++++ b/src/core/Lut1DOp.cpp
+@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
+         {
+             return simple_lut[clamp(index, 0.0f, maxIndex)];
+         }
+-        
++
++#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
+         void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & lut)
+         {
+             float maxIndex[3];
+@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
+                 rgbaBuffer += 4;
+             }
+         }
++#endif
+ #ifdef USE_SSE
+         void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D & lut)
+         {
+diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp
+index e1a26c0a..73f6edab 100644
+--- a/src/core/MathUtils.cpp
++++ b/src/core/MathUtils.cpp
+@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
+         GetV4Sum(vout, vout, v2);
+     }
+     
+-    namespace
+-    {
+-    
+-    void GetMxbResult(float* vout, float* m, float* x, float* v)
+-    {
+-        GetM44V4Product(vout, m, x);
+-        GetV4Sum(vout, vout, v);
+-    }
+-    
+-    } // anon namespace
+-    
+     bool GetMxbInverse(float* mout, float* vout,
+                        const float* m_, const float* v_)
+     {
+@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
+ 
+ #include "UnitTest.h"
+ 
++namespace
++{
++    
++    void GetMxbResult(float* vout, float* m, float* x, float* v)
++    {
++        GetM44V4Product(vout, m, x);
++        GetV4Sum(vout, vout, v);
++    }
++    
++}
++
++   
+ OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
+ {
+     {
+diff --git a/src/pyglue/PyAllocationTransform.cpp b/src/pyglue/PyAllocationTransform.cpp
+index 20bb50eb..06b418a0 100644
+--- a/src/pyglue/PyAllocationTransform.cpp
++++ b/src/pyglue/PyAllocationTransform.cpp
+@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
+         ///
+         
+         int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
+-        PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  PyObject * args);
+         PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
+         PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  PyObject * args);
+         PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
diff -Nru opencolorio-1.0.9~dfsg0/debian/patches/series opencolorio-1.1.0~dfsg0/debian/patches/series
--- opencolorio-1.0.9~dfsg0/debian/patches/series	2016-12-09 21:27:40.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/debian/patches/series	2018-01-19 13:24:45.000000000 +0000
@@ -1,2 +1,3 @@
 0001-Fix_built-in_documentation_dependencies.patch
 0002-Fix_FTBFS_on_non-Linux_platforms.patch
+0003-Fix_FTBFS_on_Linux.patch
diff -Nru opencolorio-1.0.9~dfsg0/docs/CMakeLists.txt opencolorio-1.1.0~dfsg0/docs/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/docs/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -2,15 +2,34 @@
 ###############################################################################
 ### External Doc Apps ###
 
+if (WIN32)
+    # Workaround to mimic *nix '> PYTHONPATH=XXX CMD' 
+    #  on windows, it becomes  '> set PYTHONPATH=XXX \n call CMD'
+    #   '\n' is here because '\\&' does not work.
+    set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
+    # Unfortunately some windows tools require to have
+    #  the paths with the '\' (not working with '//').
+    set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+    string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
+    set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+    string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
+else()
+    set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
+    set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+    set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+endif()
+
 # setuptools
 # https://pypi.python.org/pypi/setuptools
 set(SETUPTOOLS_VERSION 1.1.6)
+
 ExternalProject_Add(setuptools
     URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
 )
 
 # docutils
@@ -21,8 +40,9 @@
     URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
 )
 
 # jinja2
@@ -33,8 +53,9 @@
     URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
 )
 
 # Pygments
@@ -45,8 +66,9 @@
     URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
 )
 
 # sphinx
@@ -58,8 +80,9 @@
     PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
     BUILD_IN_SOURCE 1
     CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
+    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
 )
 
 ###############################################################################
@@ -80,7 +103,7 @@
     )
 
 message(STATUS "Copy extra doc files to staging area")
-list(APPEND DOCFILES ${CMAKE_SOURCE_DIR}/README)
+list(APPEND DOCFILES ${CMAKE_SOURCE_DIR}/README.md)
 list(APPEND DOCFILES ${CMAKE_SOURCE_DIR}/INSTALL)
 list(APPEND DOCFILES ${CMAKE_SOURCE_DIR}/ChangeLog)
 list(APPEND DOCFILES ${CMAKE_SOURCE_DIR}/LICENSE)
@@ -88,15 +111,20 @@
 CopyFiles(RSTDOC ${DOCFILES})
 
 message(STATUS "Extracting .rst files from C++ headers")
-ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorIO.h developers/api/OpenColorIO.rst)
-ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTransforms.h developers/api/OpenColorTransforms.rst)
-ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst)
+ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorIO.h ${CMAKE_BINARY_DIR}/docs/developers/api/OpenColorIO.rst)
+ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTransforms.h ${CMAKE_BINARY_DIR}/docs/developers/api/OpenColorTransforms.rst)
+ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h ${CMAKE_BINARY_DIR}/docs/developers/api/OpenColorTypes.rst)
+
+if(OCIO_BUILD_PYGLUE)
+    set(DEPLIBS OpenColorIO PyOpenColorIO)
+else()
+    set(DEPLIBS OpenColorIO)
+endif()
 
 add_custom_target(doc ALL
-    COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+    COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
     DEPENDS
-        OpenColorIO
-        PyOpenColorIO
+        ${DEPLIBS}
         ${CMAKE_BINARY_DIR}/docs/conf.py
         developers/api/OpenColorIO.rst
         developers/api/OpenColorTransforms.rst
@@ -118,7 +146,7 @@
 if(PDFLATEX_COMPILER)
     
     add_custom_target(latex
-        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+        COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
         DEPENDS
             OpenColorIO
             ${CMAKE_BINARY_DIR}/docs/conf.py
diff -Nru opencolorio-1.0.9~dfsg0/docs/CompatibleSoftware.rst opencolorio-1.1.0~dfsg0/docs/CompatibleSoftware.rst
--- opencolorio-1.0.9~dfsg0/docs/CompatibleSoftware.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/CompatibleSoftware.rst	2018-01-05 01:38:27.000000000 +0000
@@ -239,20 +239,14 @@
 should choose its profile instead.
 
 
-RV (Beta)
+RV
 *********
 
 `Playback Tool - Tweak Software <http://www.tweaksoftware.com>`__
 
-`OCIO support in RV <https://github.com/imageworks/OpenColorIO/tree/master/src/rv>`__
-is currently being developed by Ben Dickson (dbr).
-
-See this `email thread <http://groups.google.com/group/ocio-dev/browse_thread/thread/955fc6271f89a28e>`__
-for additional details.
-
-This integration is currently considered a work in progress, and should not be
-relied upon for critical production work.
-
+RV has native OCIO support in version 4 onwards. For more details, see
+the OpenColorIO section of the `RV User Manual
+<http://www.tweaksoftware.com/static/documentation/rv/current/html/rv_manual.html#OpenColorIO>`__.
 
 Java (Beta)
 ***********
@@ -264,11 +258,17 @@
 relied upon for critical production work.
 
 
-Ramen (Beta)
-************
-`Open Source Compositor <http://ramencomp.blogspot.com>`__
+Gaffer
+******
+`Open Source VFX Platform <http://gafferhw.org>`__
+
+Gaffer is a node based application for use in CG and VFX production, with a
+particular focus on lighting and look development.
+
 
-Under development, with native OCIO color managment.
+Natron
+******
+'Open Source Compositing Softare <http://natron.fr>'
 
 
 CryEngine3 (Beta)
diff -Nru opencolorio-1.0.9~dfsg0/docs/configurations/aces_1.0.3.rst opencolorio-1.1.0~dfsg0/docs/configurations/aces_1.0.3.rst
--- opencolorio-1.0.9~dfsg0/docs/configurations/aces_1.0.3.rst	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/configurations/aces_1.0.3.rst	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,370 @@
+aces_1.0.3
+==========
+
+ACES 1.0.3 OpenColorIO configuration
+
+Information about ACES
+***********************
+
+The **ACES** project home page is here: 
+
+- http://www.oscars.org/aces
+
+The latest documentation on the ACES transforms and specifications can be found here:
+
+- http://www.oscars.org/science-technology/aces/aces-documentation
+
+
+Colorspaces
+***********
+
+Colorspaces in this configurations are grouped into the following families: 
+ACES, ADX, Look, Output, Input, Utility, Aliases. Descriptions for the 
+colorspaces in the different families are provided below.
+
+For ease of use across a broader number of applications, the family name of each
+colorspace is pre-pended to the colorspace name when the configuration is
+authored. Those prefixes will be omitted in this document, but will show up when
+the configuration is loaded and used.
+
+ACES Colorspaces
+----------------
+
+- ACES2065-1
+- ACEScc
+- ACEScct
+- ACESproxy
+- ACEScg
+
+**Description**
+
+Colorspaces and transforms representing the core ACES working and interchange
+colorspaces.
+
+**Technical information**
+
+Transforms generated based on the `ACES CTL Transforms <https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl>`_
+
+Output Colorspaces
+------------------
+
+- sRGB
+- sRGB (D60 sim.)
+- Rec.709
+- Rec.709 (D60 sim.)
+- Rec.2020
+- Rec.2020 ST2048 (1000 nits)
+- DCDM (P3 gamut clip)
+- DCDM
+- P3-D60 ST2048 (1000 nits)
+- P3-D60 ST2048 (2000 nits)
+- P3-D60 ST2048 (4000 nits)
+- P3-D60
+- P3-DCI
+
+**Description**
+
+Colorspaces and transforms implementing the ACES Output Transforms. These 
+colorspaces produce code values ready for display on hardware devices calibrated
+to the standard used to name the colorspace.
+
+**Technical information**
+
+- Transforms generated based on the `ACES CTL Transforms <https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl>`_
+- All transforms produce full-range output. Host applications should be used to
+  apply an full-to-legal scaling needed.
+
+Input Colorspaces
+-----------------
+
+There are a variety of Input Transforms covering different cameras manufacturers, gamuts, transfer functions and camera settings. See below for specifics.
+
+**Description**
+
+Colorspaces and transforms that implement the ACES Input Transforms. These colorspaces are used to convert from camera-specific formats and encodings to ACES.
+
+**Technical information**
+
+References and descriptions are provided for each group of Input Transforms below.
+- The colorspaces whose names include a transfer function and a gamut name are full implementations of ACES Input Transforms.
+	- Ex. The ARRI 'V3 LogC (EI160) - Wide Gamut' colorspace
+	- Ex. The RED 'REDlogFilm - DRAGONcolor2' colorspace
+	- Ex. The Canon 'Canon-Log - DCI-P3 Daylight' colorspace
+- The colorspaces that start with 'Linear - ' will convert to or from a specific gamut but not apply a transfer function.
+- The colorspaces that start with 'Curve - ' will apply a transfer function but not convert between gamuts.
+
+ADX Colorspaces
+'''''''''''''''
+
+- ADX10
+- ADX16
+
+**Description**
+
+Colorspaces and transforms representing the ACES ADX spaces used for film scanning and printing.
+
+**Technical information**
+
+- Transforms generated based on the `ACES CTL Transforms <https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl>`_
+- `Alex Fry's ACES 0.7.1 OCIO config <https://github.com/imageworks/OpenColorIO-Configs/tree/master/aces_0.7.1>`_ was also a valuable resource.
+
+ARRI
+''''
+
+- `ARRI 'Working with ACES' <http://www.arri.com/camera/alexa_mini/learn/working_with_aces/>`_
+- `ARRI Input Transforms <https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl/idt/vendorSupplied/arri/alexa>`_
+- Conversations with Joseph Goldstone of ARRI
+
+Canon
+'''''
+
+- `Canon ACES landing page <http://usa.canon.com/cusa/professional/standard_display/aces>`_
+- `Clog white paper <http://learn.usa.canon.com/app/pdfs/white_papers/White_Paper_Clog_optoelectronic.pdf>`_
+
+- `C700 Drivers and Software <https://www.usa.canon.com/internet/portal/us/home/support/details/cameras/cinema-eos/eos-c300-mark-ii?tab=drivers#Z7_MQH8HIC0L88RB0AMD0F1Q42K25>`_
+- `C500 Drivers and Software <http://www.usa.canon.com/cusa/professional/products/professional_cameras/cinema_eos_cameras/eos_c500#DriversAndSoftware>`_
+- `C300 Drivers and Software <http://www.usa.canon.com/cusa/professional/products/professional_cameras/cinema_eos_cameras/eos_c300#DriversAndSoftware>`_
+    - Choose *OSX Mountain Lion v10.8* to download the IDTs
+- `C300 Mark II Drivers and Software <https://www.usa.canon.com/internet/portal/us/home/support/details/cameras/cinema-eos/eos-c300-mark-ii>`_
+    - Choose *OSX Mountain Lion v10.8* to download the IDTs, labeled "EOS C300 Mark II Input Transform Version 2.0 (for Cinema Gamut / BT.2020)"
+- `C100 Drivers and Software <http://www.usa.canon.com/cusa/professional/products/professional_cameras/cinema_eos_cameras/eos_c100#DriversAndSoftware>`_
+    - Choose *OSX Mountain Lion v10.8* to download the IDTs
+
+Panasonic
+'''''''''
+
+- `Vlog/V-Gamut white paper <http://pro-av.panasonic.net/en/varicam/common/pdf/VARICAM_V-Log_V-Gamut.pdf>`_
+- `Varicam Drivers and Software <http://pro-av.panasonic.net/en/varicam/35/dl.html>`_
+
+RED
+'''
+
+- `Understanding REDlogFilm and REDgamma <http://www.red.com/learn/red-101/redlogfilm-redgamma>`_
+- Conversations with Graeme Nattress of RED
+
+Sony
+''''
+
+- `Sony Input Transforms <https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl/idt/vendorSupplied/sony>`_
+
+GoPro (Experimental)
+''''''''''''''''''''
+
+- The quality and consistency of these transforms has not been verified.
+- Conversations with David Newman of GoPro
+
+
+Utility
+-------
+
+**Description**
+
+A collection of colorspaces that are used to facilitate the creation of LUTs and other basic functionality.
+
+**Technical information**
+
+- The 'Log2 xx nits Shaper' and 'Dolby PQ xx nits Shaper' spaces cover the linear range centered around 18% grey. The 48 nits spaces cover -6.5 stops (0.0028125) to +6.5 stops(16.291740). The 1000 nits spaces cover -12 stops to +10 stops. The 2000 nits spaces cover -12 stops to +11 stops. The 4000 nits spaces cover -12 stops to +12 stops.
+- The LMT shaper spaces cover the linear range going from 10 stops below 18% grey (0.00017578125) to 6.5 stops above 18% grey (16.291740)
+- The colorspaces starting with 'Linear - ' will convert to or from a specific gamut but not apply a transfer function.
+- The colorspaces starting with 'Curve - ' will apply a transfer function but not convert between gamuts.
+
+Look
+----
+
+**Colorspaces**
+
+- ACES 1.0 to 0.1 emulation
+- ACES 1.0 to 0.2 emulation
+- ACES 1.0 to 0.7 emulation
+
+**Description**
+
+Colorspaces and transforms emulating the look of the ACES 0.1, 0.2 and 0.7 release.
+
+- Should be applied to data in the ACES2065-1 colorspace.
+- Should be used before an ACES Output Transform.
+
+**Technical information**
+
+Transforms generated based on the `ACES CTL Transforms <https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl>`_
+
+Roles
+*****
+
+**Description**
+
+The role colorspaces are aliases to the colorspaces used for the *OCIO* 'roles' functionality.
+
+**Aliases**
+
+**Description**
+
+The alias colorspaces are named with all lower-case letters and no spaces, dashes, parentheses or other characters that would not work well in a filename. They are only references, aliases for the base colorspaces with more user-friendly names. These spaces were added to enable OCIO's token-based colorspace / filename matching.
+
+- These colorspaces should not generally be used by most artists.
+
+
+Roles
+-----
+
+The standard *OCIO* roles are defined. They role assignments are:
+
+- **color_picking**: Output - Rec.709
+- **color_timing**: ACEScc
+- **compositing_log**: ADX10
+- **data**: Raw
+- **default**: ACES2065-1
+- **matte_paint**: ACEScc
+- **reference**: Raw
+- **scene_linear**: ACEScg
+- **texture_paint**: Raw
+
+Additionally, a number of colorspaces that are gaining wider adoption have been added to the config. Their names and assignment are:
+
+- **compositing_linear**:: ACEScg
+- **rendering**:: ACEScg
+
+
+Displays and Views
+******************
+
+The default config has one Display named **ACES**, which contains the following Views / colorspaces:
+
+- sRGB, colorspace: sRGB
+- sRGB D60 sim., colorspace: sRGB (D60 sim.)
+- DCDM, colorspace: DCDM
+- DCDM P3 gamut clip, colorspace: DCDM (P3 gamut clip)
+- P3-D60, colorspace: P3-D60
+- P3-D60 PQ 1000 nits, colorspace: P3-D60 PQ (1000 nits)
+- P3-D60 PQ 2000 nits, colorspace: P3-D60 PQ (2000 nits)
+- P3-D60 PQ 4000 nits, colorspace: P3-D60 PQ (4000 nits)
+- P3-DCI, colorspace: P3-DCI
+- Rec.2020, colorspace: Rec.2020
+- Rec.2020 ST2048 1000 nits, colorspace: Rec.2020 ST2048 (1000 nits)
+- Rec.709, colorspace: Rec.709
+- Rec.709 D60 sim., colorspace: Rec.709 (D60 sim.)
+- Raw, colorspace: Raw
+- Log, colorspace: ACEScc
+
+Considerations for custom config generation:
+
+- The choice of a single Display and many Views may not align well with the implementation of OCIO in an application. 
+	- If you would like to generate a config that contains multiple Displays, with a small number of Views for each, review the config generation script's '--createMultipleDisplays' option.
+- If a Look is added to the config, a new set of Views will be added, one for each of the Views listed above except Raw and Log, that includes the Look. The Views with Looks will be interleaved in the View list with the original Views.
+	- To add a custom Look to the config, review the config generation script's '--addACESLookLUT', '--addACESLookCDL', '--addCustomLookLUT' and '--addCustomLookCDL' options.
+
+
+LUTs
+****
+
+The default resolution is 65x65x65 for the 3D LUTs and 4096 for the 1D LUTs. 
+
+**OCIO LUTs**
+The LUTs used internally by OCIO can be can be retrieved `from the repository here. <https://github.com/hpd/OpenColorIO-Configs/tree/master/aces_1.0.3/luts>`_
+
+**Baked LUTs**
+LUTs that can be used outside of OCIO are included in the `'baked' directory here. <https://github.com/hpd/OpenColorIO-Configs/tree/master/aces_1.0.3/baked>`_
+
+- The LUTs encode the ACES Output Transform for a specific colorspace input and are generally named:
+	- 'Ouput Transform name' for 'Input colorspace name'.extension
+	- Ex. 'sRGB (D60 sim.) for ACEScc.icc'
+
+The LUTs included in the 'baked' directory cover the following formats and applications:
+
+- .3dl for Autodesk Flame
+- .3dl for Autodesk Lustre
+- .lut for SideFX Houdini
+- .csp for Autodesk Maya
+- .icc for Adobe Photoshop
+
+
+Generating Configurations
+*************************
+
+**Python**
+Configurations can be generated by the following *Python* package: `aces_1.0.3/python <https://github.com/hpd/OpenColorIO-Configs/tree/master/aces_1.0.3/python>`_
+
+Usage is described on the command line and in the package root `\_\_init__.py <https://github.com/hpd/OpenColorIO-Configs/blob/master/aces_1.0.3/python/aces_ocio/__init__.py>`_ file.
+
+Features exposed for customization by the user include: 
+
+- The resolution of 1D and 3D LUTs
+- Inclusion of custom Looks
+- Two modes of creating the list of OCIO Displays and Views
+- Selection of shaper function: Log2 or Dolby PQ
+
+**CTL Source**
+The configuration depends on the **ACES 1.0.3** release. The release contains a number of file renames and the new ACEScct color space and a number of minor bug fixes and small additions, but is otherwise very similar as the master **ACES 1.0.2** release. 
+
+The CTL is available here:
+
+- https://github.com/ampas/aces-dev/tree/v1.0.3/transforms/ctl
+
+Clone this repo using the following command:
+
+- git clone --branch v1.0.3 https://github.com/ampas/aces-dev.git
+
+
+Dependencies
+************
+
+The *Python* configuration generation package depends on the following
+libraries:
+
+- **OpenImageIO**: http://openimageio.org
+	- Detailed build instructions can be found here: `OpenImageIO Build Instructions <https://sites.google.com/site/openimageio/checking-out-and-building-openimageio>`_
+- **OpenColorIO**: http://opencolorio.org
+	- Detailed build instructions can be found here: `OpenColorIO Build Instructions <http://opencolorio.org/installation.html>`_
+- **CTL**: https://github.com/ampas/CTL
+
+
+Building on macOS 
+- 
+Use the following commands to build these packages on macOS 
+
+- OpenColorIO
+	- brew install -vd opencolorio --with-python
+- Update the homebrew repository of install scripts to make sure that OpenImageIO is included.
+	- brew tap homebrew/science
+- Optional Dependencies for OpenImageIO
+	- brew install -vd libRaw
+	- brew install -vd OpenCV
+- OpenImageIO
+	- brew install -vd openimageio --with-python
+- CTL
+	- brew install -vd CTL
+- OpenColorIO, a second time. *ociolutimage* will build with *openimageio* installed.
+	- brew uninstall -vd opencolorio
+	- brew install -vd opencolorio --with-python
+
+Thanks
+******
+
+The script used to generate these transforms and the transforms themselves were the product of work and conversations with a number of people. Thanks go to:
+
+- Steve Agland
+- Joe Bogacz
+- Jack Binks
+- Scott Dyer
+- Alex Fry
+- Alex Forsythe
+- Joseph Goldstone
+- Stephen Hill
+- Jim Houston
+- Thomas Mansencal
+- Robert Molholm
+- Nikola Milosevic
+- Will McCown
+- Graeme Nattress
+- David Newman
+- Sam Richards
+- Erik Strauss
+- Doug Walker
+- Kevin Wheatley
+
+Author
+******
+
+The original author of this OCIO config is:
+
+- Haarm-Pieter Duiker
diff -Nru opencolorio-1.0.9~dfsg0/docs/configurations/index.rst opencolorio-1.1.0~dfsg0/docs/configurations/index.rst
--- opencolorio-1.0.9~dfsg0/docs/configurations/index.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/configurations/index.rst	2018-01-05 01:38:27.000000000 +0000
@@ -3,20 +3,28 @@
 Configurations
 ==============
 
-This section gives an overview of what existing (public) OCIO configuration exist,
+This section gives an overview of what existing (public) OCIO configurations exist,
 and how to create new ones.
 
 OCIO Configurations can be downloaded here: `.zip <http://github.com/imageworks/OpenColorIO-Configs/zipball/master>`__ `.tar.gz <http://github.com/imageworks/OpenColorIO-Configs/tarball/master>`__ (OCIO v1.0+)
 
-If you are interested in crafting custom color configurations, and need assistance, please contact: ocio-dev_\ ``@googlegroups.com``
+If you are interested in crafting custom color configurations, and need assistance, please contact: `ocio-dev <http://groups.google.com/group/ocio-dev>`__\.
+
+Public Configs
+**************
 
 .. toctree::
     :maxdepth: 1
 
-    spi_pipeline
-    
     spi_vfx
     spi_anim
     nuke_default
+    aces_1.0.3
     
+Config Creation
+***************
+
+.. toctree::
+    :maxdepth: 1
+
     allocation_vars
diff -Nru opencolorio-1.0.9~dfsg0/docs/configurations/nuke_default.rst opencolorio-1.1.0~dfsg0/docs/configurations/nuke_default.rst
--- opencolorio-1.0.9~dfsg0/docs/configurations/nuke_default.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/configurations/nuke_default.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,4 +1,4 @@
-Nuke default
+nuke-default
 ============
 
 This profile corresponds to the default Nuke color configuration (currently generated from Nuke 6.1).
diff -Nru opencolorio-1.0.9~dfsg0/docs/configurations/spi_pipeline.rst opencolorio-1.1.0~dfsg0/docs/configurations/spi_pipeline.rst
--- opencolorio-1.0.9~dfsg0/docs/configurations/spi_pipeline.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/configurations/spi_pipeline.rst	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-.. _config-spipipeline:
-
-Sony Pictures Imageworks Color Pipeline
-=======================================
-
-This document describes a high-level overview on how to emulate the current color management practice at Sony Imageworks. It applies equally to all profiles used at Imageworks, including both the VFX and Animation profiles.  It's by no means a requirement to follow this workflow at your own facility, this is merely a guideline on how we choose to work.
-
-General Pipeline Observations
-*****************************
-
-* All images, on disk, contain colorspace information as a substring withing the filename.  This is obeyed by all applications that load image, write images, or view images.  File extensions and metadata are ignored with regards to color processing.
-
- Example::
-
-      colorimage_lnf.exr  : lnf
-      dataimage_ncf.exr : ncf
-      plate_lg10.dpx : lg10
-      texture_dt8.tif: dt8
-
- Note: fileformat extension does NOT imply a color space.  Not all dpx files are lg10. Note all tif images are dt8.
-
-* The common file formats we use are exr, tif, dpx.
-
- * render outputs: exr
- * render inputs (mipmapped-textures): exr, tif (txtif)
- * photographic plates (scans): dpx
- * composite outputs: dpx, exr
- * on-set reference: (camera raw) NEF, CR2, etc.
- * painted textures: psd, tif
- * output proxies: jpg
-
-* All pipelines that need to be colorspace aware rely on ``Config.parseColorSpaceFromString``.
-
-* Color configurations are show specific. The $OCIO environment variable is set as part of a 'setshot' process, before other applications are launched.   Artists are not allowed to work across different shows without using a fresh shell + setshot.
-
-* While the list of colorspaces can be show specific, care is taken to maintain similar naming to the greatest extent feasible. This reduces artist confusion.  Even if two color spaces are not identical across shows, if they serve a similar purpose they are named the same.  Example: We label 10-bit scanned film negatives as lg10. Even if two different shows use different acquisition film stocks, and rely on different linearization curves, they are both labelled lg10.
-
-* There is no explicit guarantee that image assets copied across shows will be transferable in a color-correct manner. For example, in the above film scan example, one would not expect that the linearized versions of scans processed on different shows to match. In practice, this is not a problematic issue as the colorspaces which are convenient to copy (such as texture assets) happen to be similarly defined across show profiles.
-
-
-Rendering
-*********
-
-* Rendering and shading occurs in a scene-linear floating point space, typically named "ln".  Half-float (16-bit) images are labelled lnh, full float images (32-bit) are labelled lnf.
-
-
-* All image inputs should be converted to ln prior to render-time.  Typically, this is done when textures are published. (See below) 
-
-* Renderer outputs are always floating-point.  Color outputs are typically stored as lnh (16-bit half float).  Data outputs (normals, depth data, etc) are stored as ncf ("not color" data, 32-bit full float). Lossy compression is never utilized.
-
-* Render outputs are always viewed with an OCIO compatible image viewer.   Thus, for typical color imagery the lnf display transform will be applied.  In Nuke, this can be emulated using the OCIODisplay node.  A standalone image viewer, ociodisplay, is also included with  OpenColorIO src/example.
-
-
-.. _config-spipipeline-texture:
-
-Texture Painting / Matte Painting
-*********************************
-
-* Textures are painted in non-OCIO color-managed environment. (Photoshop, etc).
-
-* At texture publish time, before mipmaps are generated, all color processing is applied.  Internally at SPI we use a modified version of OpenImageIO's maketx that also links to OpenColorIO.  We intend to make this code available as soon as possible.  In the meantime, the OpenColorIO 'ocioconvert' script included in examples can be relied upon.  Color processing (linearization) is applied before mipmap generation in order to assure energy preservation in the render.  If the opposite processing order were used, (mipmap in the original space, color convert in the shader), the apparent intensity of texture values would change as the object approached to receeded to the camera.
-
-* The original texture filenames contain the colorspace information as a substring, to signify processing intent.
-
- * Textures that contain data (bump maps, opacity maps, blend maps, etc) are labelled with the nc colorspaces according to their bitdepth.  Ex: an 8-bit opacity map -> skin_opacity_nc8.tif
-
- * Painted textures that are intended to modulate diffuse color components are labelled dt (standing for "diffuse texture").  The dt8 colorspace is designed such that, when linearized, values will not extend above 1.0.  At texture publishing time these are converted to lnh mipmapped tiffs/exr.  Note that as linear textures have greater allocation requirements, a bit depth promotion is required in this case.  I.e., even if the original texture as painted was only 8-bits, the mipmapped texture will be stored as a 16-bit float image.
-
- * Painted environment maps, which may be emissive as labelled vd (standing for 'video').   These values, when linearized, have the potential to generate specular information well above 1.0.   Note that in the current vd linearization curves, the top code values may be very "sensitive". I.e., very small changes in the initial code value (such as 254->255) may actually result in very large differences in the estimated scene-linear intensity.   All environment maps are store as lnh mipmapped tiffs/exr. The same bit-depth promotion as in the dt8 case is required here.
-
-
-Compositing
-***********
-
-* The majority of compositing operations happen in scene-linear, lnf, colorspace.
-* All image inputs are linearized to lnf as they are loaded.  Customized input nodes make this processing convenient.  Rendered elements, which are stored in linear already, do not require processing.  Photographic plates will typically be linearized according to their source type, (lg10 for film scans, gn10 for genesis sources, etc).
-* All output images are de-linearized from lnf when they are written. A customized output node makes this convenient.
-* On occasion log data is required for certain processing operations.  (Plate resizing, pulling keys, degrain, etc).  For each show, a colorspace is specified as appropriate for this operation.  The artist does not have to keep track of which colorspace is appropriate to use; the OCIOLogConvert node is always intended for this purpose.  (Within the OCIO profile, this is specified using the 'compositing_log' role).
diff -Nru opencolorio-1.0.9~dfsg0/docs/developers/bindings/PythonTransforms.rst opencolorio-1.1.0~dfsg0/docs/developers/bindings/PythonTransforms.rst
--- opencolorio-1.0.9~dfsg0/docs/developers/bindings/PythonTransforms.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/developers/bindings/PythonTransforms.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,3 +1,5 @@
+.. _python-transforms:
+
 Python Transforms
 =================
 
@@ -15,7 +17,7 @@
     
     import PyOpenColorIO as OCIO
     transform = OCIO.AllocationTransform()
-    transform.setAllocation(OCIO.Constants.ALLOCATION)
+    transform.setAllocation(OCIO.Constants.ALLOCATION_LG2)
 
 .. autoclass:: PyOpenColorIO.AllocationTransform
     :members:
diff -Nru opencolorio-1.0.9~dfsg0/docs/developers/getting_started.rst opencolorio-1.1.0~dfsg0/docs/developers/getting_started.rst
--- opencolorio-1.0.9~dfsg0/docs/developers/getting_started.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/developers/getting_started.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,3 +1,5 @@
+.. _getting-started:
+
 Getting started
 ===============
 
@@ -6,19 +8,33 @@
 
 The master code repository is available on Github:  http://github.com/imageworks/OpenColorIO
 
-For those unfamiliar with git, the wonderful part about it is that even though only a limited number people have write access to the master repository, anyone is free to create, and even check in, changes to their own local git repository.  Your local changes will not automatically be pushed back to the master repository, so everyone feel free to informally play around with the codebase.  Also - unlike svn - when you download the git repository you have a full copy of the project's history (including revision history, logs, etc), so the majority of code changes you will make, including commits, do not require network server access.
-
-The first step is to install git on your system.  For those new to the world of git, github has an excellent tutorial stepping you through the process, available at: http://help.github.com/
+For those unfamiliar with git, the wonderful part about it is that even though
+only a limited number people have write access to the master repository, anyone
+is free to create, and even check in, changes to their own local git repository. 
+Your local changes will not automatically be pushed back to the master
+repository, so everyone feel free to informally play around with the codebase.
+Also - unlike svn - when you download the git repository you have a full copy of
+the project's history (including revision history, logs, etc), so the majority
+of code changes you will make, including commits, do not require network server
+access.
+
+The first step is to install git on your system.  For those new to the world of
+git, GitHub has an excellent tutorial stepping you through the process,
+available at: http://help.github.com/
 
-To check out a read-only version of the repository (no github signup required)::
+To check out a read-only version of the repository (no GitHub signup required)::
 
     git clone git://github.com/imageworks/OpenColorIO.git ocio
 
-For write-access, you must first register for a Github account (free).  Then, you must create a local fork of the OpenColorIO repository by visiting http://github.com/imageworks/OpenColorIO and clicking the "Fork" icon. If you get hung up on this, further instructions on this process are available at http://help.github.com/forking/
+For write-access, you must first register for a GitHub account (free).  Then,
+you must create a local fork of the OpenColorIO repository by visiting
+http://github.com/imageworks/OpenColorIO and clicking the "Fork" icon. If you
+get hung up on this, further instructions on this process are available at
+http://help.github.com/forking/
 
-To check out a read-write version of the repository (github acct required)::
+To check out a read-write version of the repository (GitHub acct required)::
 
-    git clone git@github.com:yourgitusername/OpenColorIO.git ocio
+    git clone git@github.com:$USER/OpenColorIO.git ocio
 
     Initialized empty Git repository in /mcp/ocio/.git/
     remote: Counting objects: 2220, done.
@@ -27,16 +43,50 @@
     Receiving objects: 100% (2220/2220), 2.89 MiB | 2.29 MiB/s, done.
     Resolving deltas: 100% (1434/1434), done.
 
-Both read + read/write users should then add the Imageworks (SPI) master branch as a remote. This will allow you to more easily fetch updates as they become available::
+Both read + read/write users should then add the Imageworks (SPI) master branch
+as a remote. This will allow you to more easily fetch updates as they become
+available::
 
     cd ocio
-    git remote add spi git://github.com/imageworks/OpenColorIO.git
+    git remote add upstream git://github.com/imageworks/OpenColorIO.git
 
-Optionally, you may then add any additional users who have individual working forks (just as you've done).  This will allow you to track, view, and potentially merge intermediate changes before they're been pushed into the main trunk. (For really bleeding edge folks).  For example, to add Jeremy Selan's working fork::
+Optionally, you may then add any additional users who have individual working
+forks (just as you've done).  This will allow you to track, view, and
+potentially merge intermediate changes before they're been pushed into the main
+trunk. (For really bleeding edge folks).  For example, to add Jeremy Selan's
+working fork::
 
     git remote add js git://github.com/jeremyselan/OpenColorIO.git
 
-You should then do a git fetch, and git merge (detailed below) to download the remote branches you've just added.
+You should then do a git fetch, and git merge (detailed below) to download the
+remote branches you've just added.
+
+Reference Build Environment
+***************************
+
+To aid new developers to the project and provide a baseline standard,
+OCIO provides a reference build environment through Docker. Docker essentially is a
+container that consits of both a Linux distro and the dependencies needed to run
+a client application. This is typically used for deploying apps and services to
+servers, but we are using it to provide an isolated development environment to build
+and test OCIO with. With this environment you are guaranteed to be able to compile OCIO
+and run its non-GUI command line applications.
+
+For more information on Docker, start here:
+https://docs.docker.com/engine/docker-overview/
+
+In order to run the Docker environment you will have to build it from the Dockerfile
+provided in the repo directory::
+
+    OpenColorIO/shared/docker
+
+Run this command in order to build the Docker image (aprox. 20min)::
+
+    docker build . -t ocio:centos7_gcc48 -f dockerfile_centos7_gcc48
+
+You can then mount the current OCIO directory and compile using the Docker image with::
+
+    docker run --volume $PWD/../../:/src/ociosrc -t ocio:centos7_gcc48 bash -c 'mkdir /build && cd /build && cmake /src/ociosrc && make -j2`
 
 
 Merging changes
diff -Nru opencolorio-1.0.9~dfsg0/docs/developers/index.rst opencolorio-1.1.0~dfsg0/docs/developers/index.rst
--- opencolorio-1.0.9~dfsg0/docs/developers/index.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/developers/index.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,6 +1,6 @@
 .. _developer-guide:
 
-Developer guide
+Developer Guide
 ===============
 
 Some information on contributing to OCIO:
diff -Nru opencolorio-1.0.9~dfsg0/docs/developers/internal_architecture.rst opencolorio-1.1.0~dfsg0/docs/developers/internal_architecture.rst
--- opencolorio-1.0.9~dfsg0/docs/developers/internal_architecture.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/developers/internal_architecture.rst	2018-01-05 01:38:27.000000000 +0000
@@ -16,7 +16,7 @@
 
 Example Configs:
 
-* ACES (Acacdemy's standard color workflow)
+* ACES (Academy's standard color workflow)
 * spi-vfx (Used on some Imageworks VFX shows such as spiderman, etc).
 * and others
 
@@ -151,7 +151,7 @@
 Consider that the FileTransform represents a wide-range of image processing
 operations (basically all of em), many of which are really complex.  For example,
 the houdini lut format in a single file may contain a log convert, a 1d lut, and
-then a 3d lut; all of which need to be applied in a row!  If we dont want the
+then a 3d lut; all of which need to be applied in a row!  If we don't want the
 FileTransform to know how to process all possible pixel operations, it's much
 simpler to make light-weight processing operations, which the transforms can
 create to do the dirty work as needed.
@@ -263,7 +263,7 @@
 
 
 #. Between the first an the second lists (gpu-preops, and gpu-latticeops), we
-anaylze the op-stream metadata and determine the appropriate allocation to use.
+analyze the op-stream metadata and determine the appropriate allocation to use.
 (to minimize clamping, quantization, etc). This is accounted for here by
 interserting a forward allocation to the end of the pre-ops, and the inverse
 allocation to the start of the lattice ops.
diff -Nru opencolorio-1.0.9~dfsg0/docs/developers/issues.rst opencolorio-1.1.0~dfsg0/docs/developers/issues.rst
--- opencolorio-1.0.9~dfsg0/docs/developers/issues.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/developers/issues.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,4 +1,5 @@
 Issues
 ======
 
-Please visit http://github.com/imageworks/OpenColorIO/issues for an up to date listing of bugs, feature requests etc
+Please visit http://github.com/imageworks/OpenColorIO/issues for an up to date
+listing of bugs, feature requests etc
diff -Nru opencolorio-1.0.9~dfsg0/docs/developers/submitting_changes.rst opencolorio-1.1.0~dfsg0/docs/developers/submitting_changes.rst
--- opencolorio-1.0.9~dfsg0/docs/developers/submitting_changes.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/developers/submitting_changes.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,3 +1,5 @@
+.. _submitting-changes:
+
 Submitting Changes
 ==================
 
@@ -12,3 +14,55 @@
 reviews (particularly for non-trivial changes) are typically far simpler if the
 reviewers are aware of a development task beforehand. (And, who knows? Maybe they
 will have implementation suggestions as well!)
+
+GitHub Basics
+*************
+
+This will outline the general mechanics of working with git and GitHub to
+successfully contribute to the project. If any of the terms used are unfamiliar
+to you please do a quick search and then ask any of the contributors for
+assistance.
+
+* Fork the Imageworks OpenColorIO repository
+* Activate Travis-CI and Appveyor for your fork
+* Clone your fork to your local workspace::
+
+    git clone https://github.com/$USER/OpenColorIO.git
+
+* cd into the cloned directory
+* Connect your cloned repo to the original upstream repository as a remote::
+
+    git remote add upstream https://github.com/imageworks/OpenColorIO.git
+
+* You should now have two remotes::
+
+    git remote -v
+    origin https://github.com/$USER/OpenColorIO (fetch)
+    origin https://github.com/$USER/OpenColorIO (fetch)
+    upstream https://github.com/imageworks/OpenColorIO (fetch)
+    upstream https://github.com/imageworks/OpenColorIO (push)
+
+* Pull the latest changes from upstream::
+
+    git checkout master
+    git pull upstream master
+
+* Create a branch for your contribution::
+
+    git checkout -b myFeature
+
+* Check if it successfully compiles and passes all unit tests
+* Commit your changes::
+
+    git add .
+    git commit -m 'Implement my feature'
+
+* Push your changes back to origin (your fork)::
+
+    git push origin myFeature
+
+* Ensure that all CI tests complete on Travis-CI and Appveyor
+* Visit your fork in a web browser on github.com
+* When ready click the "New pull request" button, make sure it can merge, and
+  add appropriate comments and notes
+* Wait for code review and comments from the community
diff -Nru opencolorio-1.0.9~dfsg0/docs/index.rst opencolorio-1.1.0~dfsg0/docs/index.rst
--- opencolorio-1.0.9~dfsg0/docs/index.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/index.rst	2018-01-05 01:38:27.000000000 +0000
@@ -1,12 +1,25 @@
 Home
 ====
 
-.. include:: README
+OpenColorIO (OCIO) is a complete color management solution geared towards motion
+picture production with an emphasis on visual effects and computer animation.
+OCIO provides a straightforward and consistent user experience across all
+supporting applications while allowing for sophisticated back-end configuration
+options suitable for high-end production usage. OCIO is compatible with the
+Academy Color Encoding Specification (ACES) and is LUT-format agnostic,
+supporting many popular formats.
+
+OpenColorIO is released as version 1.0 and has been in development since 2003.
+OCIO represents the culmination of years of production experience earned on such
+films as SpiderMan 2 (2004), Surf's Up (2007), Cloudy with a Chance of Meatballs
+(2009), Alice in Wonderland (2010), and many more. OpenColorIO is natively
+supported in commercial applications like Katana, Mari, Nuke, Silhouette FX, and
+others.
 
 .. _mailing_lists:
 
-Mailing lists
-"""""""""""""
+Mailing Lists
+*************
 
 There are two mailing lists associated with OpenColorIO:
 
@@ -17,17 +30,17 @@
 `ocio-dev <http://groups.google.com/group/ocio-dev>`__\ ``@googlegroups.com``
     For developers interested OCIO APIs, code integration, compilation, etc.
 
-Using OpenColorIO
-"""""""""""""""""
+Quick Start
+***********
 
 Most users will likely want to use the OpenColorIO that comes precompiled with
 their applications.  See the :ref:`compatiblesoftware` for further details on
 each application.
 
-Note that OCIO configurations aren't required to do any 'real' work, and are
+Note that OCIO configurations are required to do any 'real' work, and are
 available separately on the :ref:`downloads` section of this site. Example
 images are also available. For assistance customizing .ocio configurations,
-contact the ocio-users email alias.
+contact `ocio-users <http://groups.google.com/group/ocio-users>`__\.
 
 - Step 1:  set the OCIO environment-variable to /path/to/your/profile.ocio
 - Step 2:  Launch supported application.
@@ -37,10 +50,11 @@
 
 Please be sure to select a profile that matches your color workflow (VFX work
 typically requires a different profile than animated features). If you need
-assistance picking a profile, email ocio-users.
+assistance picking a profile, email 
+`ocio-users <http://groups.google.com/group/ocio-users>`__\.
 
-Downloading and building the code
-"""""""""""""""""""""""""""""""""
+Downloading and Building the Code
+*********************************
 
 Source code is available on Github at
 http://github.com/imageworks/OpenColorIO
@@ -49,15 +63,15 @@
 `.tar.gz <http://github.com/imageworks/OpenColorIO/tarball/master>`_ of the
 current state of the repository.
 
-Please see the :ref:`developer-guide` for more info, and contact ocio-dev with any
-questions.
+Please see the :ref:`developer-guide` for more info, and contact `ocio-dev
+<http://groups.google.com/group/ocio-dev>`__\  with any questions.
 
 .. toctree::
     :hidden:
     :maxdepth: 2
     
     self
-    CompatibleSoftware
+    introduction
     
     configurations/index
     installation
@@ -66,12 +80,15 @@
     
     developers/index
     
+    CompatibleSoftware
     FAQ
     downloads
     
     ChangeLog
     License
 
+--------------------------------------------------------------------------------
+
 :ref:`search`
 
 :ref:`genindex`
diff -Nru opencolorio-1.0.9~dfsg0/docs/installation.rst opencolorio-1.1.0~dfsg0/docs/installation.rst
--- opencolorio-1.0.9~dfsg0/docs/installation.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/installation.rst	2018-01-05 01:38:27.000000000 +0000
@@ -6,7 +6,7 @@
 The easy way
 ************
 
-While prebuilt binaries are not yet available for all paltforms, OCIO
+While prebuilt binaries are not yet available for all platforms, OCIO
 is available via several platform's package managers.
 
 Fedora and RHEL
@@ -36,12 +36,21 @@
 
     brew install opencolorio
 
+To build with the Python library use this command::
+
+    brew install opencolorio --with-python
+
 
 .. _building-from-source:
 
 Building from source
 ********************
 
+.. _osx-and-linux
+
+OS X and Linux
+++++++++++++++
+
 While there is a huge range of possible setups, the following steps
 should work on OS X and most Linux distros.
 
@@ -49,7 +58,7 @@
 
 - cmake >= 2.8
 - (optional) Python 2.x (for the Python bindings)
-- (optional) Nuke 6.x (for the Nuke nodes)
+- (optional) Nuke 6.x or newer (for the Nuke nodes)
 - (optional) OpenImageIO (for apps including ocioconvert)
 - (optional) Truelight SDK (for TruelightTransform)
 
@@ -108,6 +117,104 @@
     $ ls lib/
     libOpenColorIO.a      libOpenColorIO.dylib
 
+.. _windows-build
+
+Windows Build
++++++++++++++
+
+While build environments may vary between user, here is an example batch file
+for compiling on Windows as provided by `@hodoulp <https://github.com/hodoulp>`__::
+
+    @echo off
+
+
+    REM Grab the repo name, default is ocio_rw
+    set repo_name=ocio_rw
+    if not %1.==. set repo_name=%1
+
+
+    set CYGWIN=nodosfilewarning
+
+    set CMAKE_PATH=D:\OpenSource\cmake-3.9.3
+    set PYTHON_PATH=C:\Python27
+    set BOOST_ROOT=D:\SolidAngle\boost_1_55_0
+
+    set PATH=D:\Tools\cygwin64\bin;%CMAKE_PATH%\bin;%PYTHON_PATH%;%PATH%
+
+    call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+
+
+    set OCIO_PATH=D:\OpenSource\%repo_name%
+
+
+    @doskey ne="D:\Tools\Notepad++\notepad++.exe" -nosession -multiInst $*
+    @doskey sub="D:\Tools\Sublime Text 3\subl.exe" --project %OCIO_PATH%_project.sublime-project
+
+
+    REM Decompose the directory change to avoid problems...
+    D:
+
+    IF NOT EXIST %OCIO_PATH% ( 
+    echo %OCIO_PATH% does not exist
+    exit /b
+    )
+    cd %OCIO_PATH%
+
+
+    set CMAKE_BUILD_TYPE=Release
+
+    echo *******
+    echo *********************************************
+    echo ******* Building %OCIO_PATH%
+    echo **
+    echo **
+    set are_you_sure = Y
+    set /P are_you_sure=Build in %CMAKE_BUILD_TYPE% ([Y]/N)?  
+    if not %are_you_sure%==Y set CMAKE_BUILD_TYPE=Debug
+
+
+    set BUILD_PATH=_build_rls
+    if not %CMAKE_BUILD_TYPE%==Release set BUILD_PATH=_build_dbg
+
+    IF NOT EXIST %BUILD_PATH% ( mkdir %BUILD_PATH% )
+    cd %BUILD_PATH%
+
+
+    echo **
+    echo **
+
+    cmake -G "NMake Makefiles" ^
+        -DCMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
+        -DCMAKE_INSTALL_PREFIX=%OCIO_PATH%\_install ^
+        -DOCIO_BUILD_TESTS=ON ^
+        %OCIO_PATH%
+
+    set PATH=%OCIO_PATH%\%BUILD_PATH%\src\core;%PATH%
+
+
+    REM Find the current branch
+    set GITBRANCH=
+    for /f %%I in ('git.exe rev-parse --abbrev-ref HEAD 2^> NUL') do set GITBRANCH=%%I
+
+    if not "%GITBRANCH%" == ""  prompt $C%GITBRANCH%$F $P$G 
+
+
+    echo *******
+    echo *********************************************
+    echo boost    = %BOOST_ROOT%
+    echo cmake    = %CMAKE_PATH%
+    echo *******
+    if not "%GITBRANCH%" == "" echo branch  = %GITBRANCH%
+    echo *******
+    echo Mode    = %CMAKE_BUILD_TYPE%
+    echo path    = %OCIO_PATH%\%BUILD_PATH%
+    echo compile = nmake all
+    echo test    = nmake test
+    echo *********************************************
+    echo *******
+
+Also look to the Appveyor config script at the root of repository for an example
+build sequence.
 
 .. _enabling-optional-components:
 
@@ -230,6 +337,25 @@
    This variable needs to point to the global OCIO config file, e.g
    ``config.ocio``
 
+.. envvar:: OCIO_LOGGING_LEVEL
+
+    Configures OCIO's internal logging level. Valid values are
+    ``none``, ``warning``, ``info``, or ``debug`` (or their respective
+    numeric values ``0``, ``1``, ``2``, or ``3`` can be used)
+
+    Logging output is sent to STDERR output.
+
+.. envvar:: OCIO_ACTIVE_DISPLAYS
+
+   Overrides the :ref:`active_displays` configuration value.
+   Colon-separated list of displays, e.g ``sRGB:P3``
+
+.. envvar:: OCIO_ACTIVE_VIEWS
+
+   Overrides the :ref:`active_views` configuration
+   item. Colon-separated list of view names, e.g
+   ``internal:client:DI``
+
 .. envvar:: DYLD_LIBRARY_PATH
 
     The ``lib/`` folder (containing ``libOpenColorIO.dylib``) must be
@@ -263,8 +389,8 @@
 
 .. envvar:: NUKE_PATH
 
-    Nuke's customisation search path, where it will look for plugins,
-    gizmos, init.py and menu.py scripts and other customisations.
+    Nuke's customization search path, where it will look for plugins,
+    gizmos, init.py and menu.py scripts and other customizations.
 
     This should point to both ``lib/nuke6.2/`` (or whatever version
     the plugins are built against), and ``share/nuke/``
diff -Nru opencolorio-1.0.9~dfsg0/docs/introduction.rst opencolorio-1.1.0~dfsg0/docs/introduction.rst
--- opencolorio-1.0.9~dfsg0/docs/introduction.rst	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/introduction.rst	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,177 @@
+.. _introduction:
+
+Introduction
+============
+
+OpenColorIO (OCIO) is a complete color management solution geared towards motion
+picture production with an emphasis on visual effects and computer animation. As
+such, OCIO helps enforce a color management methodology that is required for the
+high fidelity color imaging in modern computer graphics. This section introduces
+those concepts and general workflow practices. Additional information can be
+found in Jeremy Selan's Cinematic Color `document <http://cinematiccolor.org/>`_.
+
+While OCIO is a color management library, it's only knowledge of color science
+comes from it's execution of the transforms defined in the OCIO configuration
+file. These transforms are either defined by the end user in a custom OCIO
+config or inherited from the publicly available configs.
+
+By specifying your desired ``config.ocio`` Config file in the local environment
+all OCIO compatible applications and software libraries will be able to see your
+defined color transform "universe", and direct the transformation of image data
+from one defined ``OCIO.ColorSpace`` to another, in addition to the other
+transforms documented elsewhere.
+
+Sony Pictures Imageworks Color Pipeline
+***************************************
+
+This document describes a high-level overview on how to emulate the current
+color management practice at Sony Imageworks. It applies equally to all profiles
+used at Imageworks, including both the VFX and Animation profiles.  It's by no
+means a requirement to follow this workflow at your own facility, this is merely
+a guideline on how we choose to work.
+
+General Pipeline Observations
++++++++++++++++++++++++++++++
+
+* All images, on disk, contain colorspace information as a substring within the
+  filename.  This is obeyed by all applications that load image, write images,
+  or view images.  File extensions and metadata are ignored with regards to
+  color processing.
+
+Example::
+
+      colorimage_lnf.exr  : lnf
+      dataimage_ncf.exr : ncf
+      plate_lg10.dpx : lg10
+      texture_dt8.tif : dt8
+
+.. note::
+
+    File format extension does **NOT** imply a color space.  Not all .dpx
+    files are lg10. Not all .tif images are dt8.
+
+* The common file formats we use are exr, tif, dpx.
+
+ * render outputs: exr
+ * render inputs (mipmapped-textures): exr, tif (txtif)
+ * photographic plates (scans): dpx
+ * composite outputs: dpx, exr
+ * on-set reference: (camera raw) NEF, CR2, etc.
+ * painted textures: psd, tif
+ * output proxies: jpg
+
+* All pipelines that need to be colorspace aware rely
+  on ``Config.parseColorSpaceFromString``.
+
+* Color configurations are show specific. The ``$OCIO`` environment variable is
+  set as part of a 'setshot' process, before other applications are launched.
+  Artists are not allowed to work across different shows without using a fresh
+  shell + setshot.
+
+* While the list of colorspaces can be show specific, care is taken to maintain
+  similar naming to the greatest extent feasible. This reduces artist confusion.
+  Even if two color spaces are not identical across shows, if they serve a
+  similar purpose they are named the same.  
+
+ * Example: We label 10-bit scanned film negatives as lg10. Even if two
+   different shows use different acquisition film stocks, and rely on different
+   linearization curves, they are both labeled lg10.
+
+* There is no explicit guarantee that image assets copied across shows will be
+  transferable in a color-correct manner. For example, in the above film scan
+  example, one would not expect that the linearized versions of scans processed
+  on different shows to match. In practice, this is not a problematic issue as
+  the colorspaces which are convenient to copy (such as texture assets) happen
+  to be similarly defined across show profiles.
+
+
+Rendering
++++++++++
+
+* Rendering and shading occurs in a scene-linear floating point space, typically
+  named "ln".  Half-float (16-bit) images are labeled lnh, full float images
+  (32-bit) are labeled lnf.
+
+* All image inputs should be converted to ln prior to render-time. Typically,
+  this is done when textures are published. (See below) 
+
+* Renderer outputs are always floating-point. Color outputs are typically stored
+  as lnh (16-bit half float). 
+
+* Data outputs (normals, depth data, etc) are stored as ncf ("not color" data,
+  32-bit full float). Lossy compression is never utilized.
+
+* Render outputs are always viewed with an OCIO compatible image viewer.
+  Thus, for typical color imagery the lnf display transform will be applied.
+  In Nuke, this can be emulated using the `OCIODisplay` node. A standalone image
+  viewer, ociodisplay, is also included with OpenColorIO src/example.
+
+
+.. _config-spipipeline-texture:
+
+Texture Painting / Matte Painting
++++++++++++++++++++++++++++++++++
+
+* Textures are painted either in a non-OCIO color-managed environment (Photoshop,
+  etc), or a color managed one like Mari.
+
+* At texture publish time, before mipmaps are generated, all color processing is
+  applied. Internally at SPI we use OpenImageIO's maketx that also links to
+  OpenColorIO. This code is available on the public OIIO repository. Color 
+  processing (linearization) is applied before mipmap generation in order to
+  assure energy preservation in the render. If the opposite processing order
+  were used, (mipmap in the original space, color convert in the shader), the
+  apparent intensity of texture values would change as the object approached or
+  receded from the camera.
+
+* The original texture filenames contain the colorspace information as a
+  substring, to signify processing intent.
+
+* Textures that contain data (bump maps, opacity maps, blend maps, etc) are
+  labeled with the nc colorspaces according to their bitdepth.
+
+ * Example: an 8-bit opacity map -> skin_opacity_nc8.tif
+
+* Painted textures that are intended to modulate diffuse color components are
+  labelled dt (standing for "diffuse texture").  The dt8 colorspace is designed
+  such that, when linearized, values will not extend above 1.0.  At texture
+  publishing time these are converted to lnh mipmapped tiffs/exr. Note that as
+  linear textures have greater allocation requirements, a bit depth promotion
+  is required in this case.  I.e., even if the original texture as painted was
+  only 8-bits, the mipmapped texture will be stored as a 16-bit float image.
+
+* Painted environment maps, which may be emissive as labeled vd (standing for
+  'video'). These values, when linearized, have the potential to generate
+  specular information well above 1.0. Note that in the current vd linearization
+  curves, the top code values may be very "sensitive". I.e., very small changes
+  in the initial code value (such as 254->255) may actually result in very large
+  differences in the estimated scene-linear intensity. All environment maps are
+  store as lnh mipmapped tiffs/exr. The same bit-depth promotion as in the dt8
+  case is required here.
+
+Compositing
++++++++++++
+
+* The majority of compositing operations happen in scene-linear, lnf, colorspace.
+
+* All image inputs are linearized to lnf as they are loaded.  Customized input
+  nodes make this processing convenient.  Rendered elements, which are stored in
+  linear already, do not require processing.  Photographic plates will typically
+  be linearized according to their source type, (lg10 for film scans, gn10 for
+  genesis sources, etc).
+
+* All output images are de-linearized from lnf when they are written. A
+  customized output node makes this convenient.
+
+* On occasion log data is required for certain processing operations.
+  (Plate resizing, pulling keys, degrain, etc).  For each show, a colorspace is
+  specified as appropriate for this operation.  The artist does not have to keep
+  track of which colorspace is appropriate to use; the OCIOLogConvert node is
+  always intended for this purpose.  (Within the OCIO profile, this is specified
+  using the 'compositing_log' role).
+
+Further Information
+*******************
+
+Specific information with regard to the public OCIO configs can be found in the 
+:ref:`configurations` section.
diff -Nru opencolorio-1.0.9~dfsg0/docs/ociotheme/page.html opencolorio-1.1.0~dfsg0/docs/ociotheme/page.html
--- opencolorio-1.0.9~dfsg0/docs/ociotheme/page.html	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/ociotheme/page.html	2018-01-05 01:38:27.000000000 +0000
@@ -22,8 +22,8 @@
             <div class="caption">Render: scene-linear exr</div>
         <p style="text-align: right">Images from "Cloudy With A Chance of Meatballs"</p>
         <p style="text-align: right">Copyright 2011 Sony Pictures Inc. All Rights Reserved.</p>
-        <p style="text-align: right">spi-animation profile, available here.</p>
+        <p style="text-align: right">spi-animation profile, available <a href="http://github.com/imageworks/OpenColorIO-Configs">here</a>.</p>
         </div>
     </td>
     {% endif %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/docs/userguide/baking_luts.rst opencolorio-1.1.0~dfsg0/docs/userguide/baking_luts.rst
--- opencolorio-1.0.9~dfsg0/docs/userguide/baking_luts.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/userguide/baking_luts.rst	2018-01-05 01:38:27.000000000 +0000
@@ -186,7 +186,7 @@
 point/linear-light images as is common in compositing software)
 
 The second issue is there is no simple way to load a simple 1D or 3D
-LUT into Photoshop (and it's API does not make this easy either!)
+LUT into Photoshop (and its API does not make this easy either!)
 
 A working space
 +++++++++++++++
diff -Nru opencolorio-1.0.9~dfsg0/docs/userguide/config_syntax.rst opencolorio-1.1.0~dfsg0/docs/userguide/config_syntax.rst
--- opencolorio-1.0.9~dfsg0/docs/userguide/config_syntax.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/userguide/config_syntax.rst	2018-01-05 01:38:27.000000000 +0000
@@ -5,12 +5,12 @@
 
 OpenColorIO is primarily controlled by a central configuration file,
 usually named ``config.ocio``. This page will only describe how to
-*syntactically* write this OCIO config - e.g what transforms are
+*syntactically* write this OCIO config - e.g. what transforms are
 available, or what sections are optional.
 
 This page alone will not help you to write a useful config file! See
 the :ref:`configurations` section for examples of complete, practical
-configs, and discussion of how they fit within a facitilies workflow.
+configs, and discussion of how they fit within a facilities workflow.
 
 YAML basics
 ***********
@@ -61,8 +61,8 @@
 
 Optional. Default is an empty search path.
 
-``search_path`` is a colon-seperated list of directories. Each
-directory is checked in order to locate a file (e.g a LUT).
+``search_path`` is a colon-separated list of directories. Each
+directory is checked in order to locate a file (e.g. a LUT).
 
 This works is very similar to how the UNIX ``$PATH`` env-var works for
 executables.
@@ -85,7 +85,7 @@
 directory, relative to the ``config.ocio`` file's location.
 
 Paths can be relative (to the directory containing ``config.ocio``),
-or absolute (e.g ``/mnt/path/to/my/luts``)
+or absolute (e.g. ``/mnt/path/to/my/luts``)
 
 Multiple paths can be specified, including a mix of relative and
 absolute paths. Each path is separated with a colon ``:``
@@ -130,7 +130,7 @@
 the default role will be used. This allows unhandled images to operate
 in "non-color managed" mode.
 
-Application authors should note: when no config is present (e.g via
+Application authors should note: when no config is present (e.g. via
 ``$OCIO``), the default internal profile specifies
 ``strictparsing=false``, and the default color space role is
 ``raw``. This means that ANY string passed to OCIO will be parsed as
@@ -148,8 +148,8 @@
 
     luma: [0.2126, 0.7152, 0.0722]
 
-These are the luminance coeficients, which can be used by
-OCIO-supporting applications when adjusting saturation (e.g in an
+These are the luminance coefficients, which can be used by
+OCIO-supporting applications when adjusting saturation (e.g. in an
 image-viewer when displaying a single channel)
 
 .. note::
@@ -206,38 +206,38 @@
 A description of all roles. Note that applications may interpret or
 use these differently.
 
-* ``color_picking`` - Colors in a color-selection UI can be displayed
+* ``color_picking`` - colors in a color-selection UI can be displayed
   in this space, while selecting colors in a different working space
-  (e.g ``scene_linear`` or ``texture_paint``)
+  (e.g. ``scene_linear`` or ``texture_paint``)
 
 * ``color_timing`` - colorspace used for applying color corrections,
-  e.g user-specified grade within an image viewer (if the application
+  e.g. user-specified grade within an image viewer (if the application
   uses the ``DisplayTransform::setDisplayCC`` API method)
 
 * ``compositing_log`` - a log colorspace used for certain processing
   operations (plate resizing, pulling keys, degrain, etc). Used by the
-  OCIOLogConvert Nuke node.
+  OCIOLogConvert Nuke node
 
 * ``data`` - used when writing data outputs such as normals, depth
   data, and other "non color" data. The colorspace in this role should
   typically have ``data: true`` specified, so no color transforms are
-  applied.
+  applied
 
 * ``default`` - when ``strictparsing: false``, this colorspace is used
   as a fallback. If not defined, the ``scene_linear`` role is used
 
-* ``matte_paint`` - Colorspace which matte-paintings are created in
+* ``matte_paint`` - colorspace which matte-paintings are created in
   (for more information, :ref:`see the guide on baking ICC profiles
   for Photoshop <userguide-bakelut-photoshop>`, and
   :ref:`config-spivfx`)
 
-* ``reference`` - Colorspace used for reference imagery (e.g sRGB
-  images from the internet)
+* ``reference`` - the colorspace against which the other colorspaces
+  are defined
 
-* ``scene_linear`` - The scene-referred linear-to-light colorspace,
-  typically used as reference space (see :ref:`faq-terminology`)
+* ``scene_linear`` - the scene-referred linear-to-light colorspace,
+  often the same as the reference space (see:ref:`faq-terminology`)
 
-* ``texture_paint`` - Similar to ``matte_paint`` but for painting
+* ``texture_paint`` - similar to ``matte_paint`` but for painting
   textures for 3D objects (see the description of texture painting in
   :ref:`SPI's pipeline <config-spipipeline-texture>`)
 
@@ -337,7 +337,7 @@
 
 Overridden by the ``OCIO_ACTIVE_VIEWS`` env-var::
 
-    export OCIO_ACTIVE_DISPLAYS="Film:Log:Raw"
+    export OCIO_ACTIVE_VIEWS="Film:Log:Raw"
 
 
 ``looks``
@@ -355,7 +355,7 @@
 When the look is defined in the config, you must specify a name, the
 color transform, and the colorspace in which the grade is performed
 (the "process space"). You can optionally specify an inverse transform
-for when the look transform is not trivially invertable (e.g it
+for when the look transform is not trivially invertable (e.g. it
 applies a 3D LUT)
 
 When an application applies a look, OCIO ensures the grade is applied
@@ -540,7 +540,7 @@
 
 This primarily demonstrates the meta-transform ``GroupTransform``: a
 transform which simply composes two or more transforms together into
-one. Anything that acceptsa transform like ``FileTransform`` or
+one. Anything that accepts a transform like ``FileTransform`` or
 ``CDLTransform`` will also accept a ``GroupTransform``
 
 It is also worth noting the ``ColorSpaceTransform``, which transforms
@@ -583,7 +583,7 @@
 
 
 To explain how this all ties together to display an image, say we have
-an image in the ``lnf`` colorspace (e.g a linear EXR) and wish to
+an image in the ``lnf`` colorspace (e.g. a linear EXR) and wish to
 convert it to ``srgb8`` - the transform steps are:
 
 * ``ColorSpaceTransform`` is applied, converting from lnf to lg16
@@ -604,11 +604,11 @@
 
 .. note::
 
-    OCIO has an transform optimiser which removes redunant steps, and
+    OCIO has an transform optimizer which removes redundant steps, and
     combines similar transforms into one operation.
 
     In the previous example, the complete transform chain would be
-    "lg16 -> lnf, lnf -> lg16, lg16 -> srgb8". However the optimiser
+    "lg16 -> lnf, lnf -> lg16, lg16 -> srgb8". However the optimizer
     will reduce this to "lg16 -> srgb".
 
 
@@ -685,7 +685,7 @@
 For example, see the ``lg10`` and ``lg16`` colorspaces in the
 :ref:`config-spivfx` config. If loading a ``lg10`` image and
 converting to ``lg16``, no transform is required. This is of course
-faster, but may cause an unexpected increase in precision (e.g it skip
+faster, but may cause an unexpected increase in precision (e.g. it skip
 potential clamping caused by a LUT)
 
 .. code-block:: yaml
diff -Nru opencolorio-1.0.9~dfsg0/docs/userguide/looks.rst opencolorio-1.1.0~dfsg0/docs/userguide/looks.rst
--- opencolorio-1.0.9~dfsg0/docs/userguide/looks.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/userguide/looks.rst	2018-01-05 01:38:27.000000000 +0000
@@ -4,12 +4,13 @@
 =====
 
 A "look" is a named color transform, intended to modify the look of an
-image in a "creative" manner (as opposed to a colorspace definion
-which tends to be technically/mathematically defined)
+image in a "creative" manner (as opposed to a colorspace definition
+which tends to be technically/mathematically defined). An OCIO look typically
+exists as a flexible addendum to a defined viewing transform. 
 
 Examples of looks may be a neutral grade, to be applied to film scans
 prior to VFX work, or a per-shot DI grade decided on by the director,
-to be applied just before the viewing transform
+to be applied just before the viewing transform.
 
 Looks are defined similarly to colorspaces, you specify a name and a
 transform (possibly a GroupTransform containing several other
@@ -22,7 +23,7 @@
 Example configuration
 *********************
 
-Step 1: Setup a Look
+**Step 1: Setup a Look**
 
 A look is a top-level OCIO configuration object. Conceptually, it's a
 named transform which gets applied in a specific color space. All of the
@@ -39,6 +40,14 @@
       process_space: rclg16
       transform: !<FileTransform> {src: look_di.cc, interpolation: linear}
 
+Example Python API call:
+
+.. code-block:: python
+
+    look = OCIO.Look(name='di', processSpace='rclg16')
+    t = OCIO.FileTransform('look_di.cc', interpolation=OCIO.Constants.INTERP_LINEAR)
+    look.setTransform(t)
+    config.addLook(look)
 
 The src file can be any LUT type that OCIO supports (in this case, it's a
 file that contains the ``<ColorCorrection>`` element from a CDL file.) You
@@ -54,13 +63,13 @@
 converted to ``rclg16`` before applying the ``look_di.cc``
 file-transform.
 
-Step 2: Update the Display to use a look.
+**Step 2: Update the Display to use a look.**
 
 You can specify an optional 'looks' tag in the View tag, which will
 apply the specified look(s). This lets application in the viewer
 provide options which use the looks.
 
-Example:
+Example YAML config:
 
 .. code-block:: yaml
 
@@ -76,12 +85,23 @@
         - !<View> {name: Film, colorspace: srgb10}
         - !<View> {name: Film DI, colorspace: srgb10, looks: di}
 
+Example Python API call:
+
+.. code-block:: python
+
+    for name,colorspace,look in [ ['Raw','nc10',''], ['Log','rclg10',''], 
+            ['Film','p3dci16',''], ['Film DI','p3dci16','di'] ]:
+        config.addDisplay('DLP',name,colorspace,look)
+
+    for name,colorspace,look in [ ['Raw','nc10',''], ['Log','rclg10',''], 
+            ['Film','srgb10',''], ['Film DI','srgb10','di'] ]:
+        config.addDisplay('sRGB',name,colorspace,look)
 
 Option for advanced users: The looks tag is actually a comma-delimited
 list supporting +/- modifiers. So if you you wanted to specify a View
 that undoes DI, and then adds Onset, you could do "-di,+onset".
 
-Step 3: Get per-shot looks supported.
+**Step 3: Get per-shot looks supported.**
 
 In the top example, look_di.cc, being a relative path location, will check
 each location in the config's search_path. The first file that's found
diff -Nru opencolorio-1.0.9~dfsg0/docs/userguide/tool_overview.rst opencolorio-1.1.0~dfsg0/docs/userguide/tool_overview.rst
--- opencolorio-1.0.9~dfsg0/docs/userguide/tool_overview.rst	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/docs/userguide/tool_overview.rst	2018-01-05 01:38:27.000000000 +0000
@@ -13,8 +13,9 @@
 The API
 *******
 
-Most users will never directly interact with the C++ API. However the API is used by all the supplied applications (e.g :ref:`overview-ocio2icc`) and plugins (e.g 
-the :ref:`overview-nukeplugins`)
+Most users will never directly interact with the C++ API. However the API is
+used by all the supplied applications (e.g :ref:`overview-ocio2icc`) and plugins
+(e.g the :ref:`overview-nukeplugins`)
 
 To get started with the API, see the :ref:`developer-guide`
 
@@ -139,7 +140,8 @@
 
 Loads an image, applies a color transform, and saves it to a new file.
 
-OpenImageIO is used to open and save the file, so a wide range of formats are supported.
+OpenImageIO is used to open and save the file, so a wide range of formats are
+supported.
 
 .. TODO: Link to more elaborate description
 
@@ -149,7 +151,9 @@
 ociodisplay
 ***********
 
-A basic image viewer. Uses OpenImageIO to load images, and displays them using OCIO and typical viewer controls (scene-linear exposure control and a post-display gamma control)
+A basic image viewer. Uses OpenImageIO to load images, and displays them using
+OCIO and typical viewer controls (scene-linear exposure control and a
+post-display gamma control)
 
 May be useful to users to quickly check colorspace configuration, but
 primarily a demonstration of the OCIO API
@@ -164,12 +168,15 @@
 
 A set of OCIO nodes for The Foundry's Nuke, including:
 
-* OCIOColorSpace, transforms between two color spaces (similar to the built-in "ColorSpace" node, but the colorspaces are described in the OCIO config file)
+* OCIOColorSpace, transforms between two color spaces (similar to the built-in
+  "ColorSpace" node, but the colorspaces are described in the OCIO config file)
 
 * OCIODisplay to be used as viewer processes
 
-* OCIOFileTransform loads a transform from a file (e.g a 1D or 3D LUT), and applies it
+* OCIOFileTransform loads a transform from a file (e.g a 1D or 3D LUT), and
+  applies it
 
-* OCIOCDLTransform applies CDL-compliant grades, and includes utilities to create/load ASC CDL files
+* OCIOCDLTransform applies CDL-compliant grades, and includes utilities to
+  create/load ASC CDL files
 
 .. TODO - Link to more elaborate description
diff -Nru opencolorio-1.0.9~dfsg0/export/OpenColorIO/OpenColorABI.h.in opencolorio-1.1.0~dfsg0/export/OpenColorIO/OpenColorABI.h.in
--- opencolorio-1.0.9~dfsg0/export/OpenColorIO/OpenColorABI.h.in	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/export/OpenColorIO/OpenColorABI.h.in	2018-01-05 01:38:27.000000000 +0000
@@ -55,17 +55,25 @@
 #include <boost/shared_ptr.hpp>
 #define OCIO_SHARED_PTR boost::shared_ptr
 #define OCIO_DYNAMIC_POINTER_CAST boost::dynamic_pointer_cast
+#elif defined(_LIBCPP_VERSION)
+#include <memory>
+#define OCIO_SHARED_PTR std::shared_ptr
+#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
 #elif __GNUC__ >= 4
 #include <tr1/memory>
 #define OCIO_SHARED_PTR std::tr1::shared_ptr
 #define OCIO_DYNAMIC_POINTER_CAST std::tr1::dynamic_pointer_cast
+#elif (_MSC_VER > 1600)
+#include <memory>
+#define OCIO_SHARED_PTR std::shared_ptr
+#define OCIO_DYNAMIC_POINTER_CAST std::dynamic_pointer_cast
 #else
 #error OCIO needs gcc 4 or later to get access to <tr1/memory> (or specify USE_BOOST_PTR instead)
 #endif
 
 // If supported, define OCIOEXPORT, OCIOHIDDEN
 // (used to choose which symbols to export from OpenColorIO)
-#if defined __linux__ || __APPLE__ || __FreeBSD__
+#if defined __GNUC__
     #if __GNUC__ >= 4
         #define OCIOEXPORT __attribute__ ((visibility("default")))
         #define OCIOHIDDEN __attribute__ ((visibility("hidden")))
@@ -75,11 +83,15 @@
     #endif
 #elif defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS) || defined(_MSC_VER)
     // Windows requires you to export from the main library and then import in any others
-    #if defined OpenColorIO_EXPORTS
-        #define OCIOEXPORT __declspec(dllexport)
-    #else
-        #define OCIOEXPORT __declspec(dllimport)
-    #endif
+	#ifndef OpenColorIO_STATIC
+		#if defined OpenColorIO_EXPORTS
+			#define OCIOEXPORT __declspec(dllexport)
+		#else
+			#define OCIOEXPORT __declspec(dllimport)
+		#endif
+	#else
+		#define OCIOEXPORT
+	#endif
     #define OCIOHIDDEN
 #else // Others platforms not supported atm
     #define OCIOEXPORT
diff -Nru opencolorio-1.0.9~dfsg0/export/OpenColorIO/OpenColorIO.h opencolorio-1.1.0~dfsg0/export/OpenColorIO/OpenColorIO.h
--- opencolorio-1.0.9~dfsg0/export/OpenColorIO/OpenColorIO.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/export/OpenColorIO/OpenColorIO.h	2018-01-05 01:38:27.000000000 +0000
@@ -100,7 +100,17 @@
         virtual const char* what() const throw();
         
     private:
+        //Add pragma warnings, STL member is private and not consumed by client of DLL
+        #ifdef _WIN32
+        #pragma warning(push)
+        #pragma warning(disable:4251)
+        #endif // _WIN32
+
         std::string msg_;
+
+        #ifdef _WIN32
+        #pragma warning(pop)
+        #endif // _WIN32
     };
     
     //!cpp:class:: An exception class for errors detected at
@@ -113,9 +123,9 @@
     class OCIOEXPORT ExceptionMissingFile : public Exception
     {
     public:
-        //!cpp:function::
+        //!cpp:function:: Constructor that takes a string as the exception message.
         ExceptionMissingFile(const char *) throw();
-        //!cpp:function::
+        //!cpp:function:: Constructor that takes an existing exception.
         ExceptionMissingFile(const ExceptionMissingFile&) throw();
     };
     
@@ -217,11 +227,11 @@
         // Initialization
         // ^^^^^^^^^^^^^^
         
-        //!cpp:function:: Constructor...ELABORATE
+        //!cpp:function:: Constructor a default empty configuration.
         static ConfigRcPtr Create();
-        //!cpp:function:: 
+        //!cpp:function::  Constructor a configuration using the OCIO environmnet variable.
         static ConstConfigRcPtr CreateFromEnv();
-        //!cpp:function::
+        //!cpp:function:: Constructor a configuration using a specific config file.
         static ConstConfigRcPtr CreateFromFile(const char * filename);
         //!cpp:function::
         static ConstConfigRcPtr CreateFromStream(std::istream & istream);
@@ -279,6 +289,12 @@
         const char * getEnvironmentVarDefault(const char * name) const;
         //!cpp:function::
         void clearEnvironmentVars();
+        //!cpp:function::
+        void setEnvironmentMode(EnvironmentMode mode);
+        //!cpp:function::
+        EnvironmentMode getEnvironmentMode() const;
+        //!cpp:function::
+        void loadEnvironment();
         
         //!cpp:function::
         const char * getSearchPath() const;
@@ -366,7 +382,7 @@
         //
         // Looks is a potentially comma (or colon) delimited list of lookNames,
         // Where +/- prefixes are optionally allowed to denote forward/inverse
-        // look specification. (And forward is assumed in the absense of either)
+        // look specification. (And forward is assumed in the absence of either)
         
         //!cpp:function::
         const char * getDefaultDisplay() const;
@@ -548,7 +564,7 @@
     // and color encoding. Transforming images between different
     // *ColorSpaces* is the primary motivation for this library.
     //
-    // While a complete discussion of colorspaces is beyond the scope of
+    // While a complete discussion of color spaces is beyond the scope of
     // header documentation, traditional uses would be to have *ColorSpaces*
     // corresponding to: physical capture devices (known cameras, scanners),
     // and internal 'convenience' spaces (such as scene linear, logarithmic).
@@ -726,6 +742,11 @@
         ConstTransformRcPtr getInverseTransform() const;
         //!cpp:function:: Setting a transform to a non-null call makes it allowed.
         void setInverseTransform(const ConstTransformRcPtr & transform);
+
+        //!cpp:function::
+        const char * getDescription() const;
+        //!cpp:function::
+        void setDescription(const char * description);
     private:
         Look();
         ~Look();
@@ -881,7 +902,7 @@
     // Baker
     // *****
     // 
-    // In certain situations it is nessary to serilize transforms into a variety
+    // In certain situations it is necessary to serialize transforms into a variety
     // of application specific lut formats. The Baker can be used to create lut
     // formats that ocio supports for writing.
     // 
@@ -950,7 +971,7 @@
         //!cpp:function:: set the looks to be applied during baking
         // Looks is a potentially comma (or colon) delimited list of lookNames,
         // Where +/- prefixes are optionally allowed to denote forward/inverse
-        // look specification. (And forward is assumed in the absense of either)
+        // look specification. (And forward is assumed in the absence of either)
         void setLooks(const char * looks);
         //!cpp:function:: get the looks to be applied during baking
         const char * getLooks() const;
@@ -1144,12 +1165,12 @@
         //!cpp:function::
         ~GpuShaderDesc();
         
-        //!cpp:function::
+        //!cpp:function:: Set the shader program language
         void setLanguage(GpuLanguage lang);
         //!cpp:function::
         GpuLanguage getLanguage() const;
         
-        //!cpp:function::
+        //!cpp:function:: Set the function name of the shader program
         void setFunctionName(const char * name);
         //!cpp:function::
         const char * getFunctionName() const;
diff -Nru opencolorio-1.0.9~dfsg0/.gitignore opencolorio-1.1.0~dfsg0/.gitignore
--- opencolorio-1.0.9~dfsg0/.gitignore	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/.gitignore	2018-01-05 01:38:27.000000000 +0000
@@ -1,6 +1,8 @@
 .DS_Store
 attic
 build*
+_build*
+_install*
 dist*
 mastercopy
 *.pyc
diff -Nru opencolorio-1.0.9~dfsg0/INSTALL opencolorio-1.1.0~dfsg0/INSTALL
--- opencolorio-1.0.9~dfsg0/INSTALL	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/INSTALL	2018-01-05 01:38:27.000000000 +0000
@@ -1 +1 @@
-For install instructions, see docs/setup.rst
+For install instructions, see docs/installation.rst
diff -Nru opencolorio-1.0.9~dfsg0/README opencolorio-1.1.0~dfsg0/README
--- opencolorio-1.0.9~dfsg0/README	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/README	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-OpenColorIO (OCIO) is a complete color management solution geared towards motion
-picture production with an emphasis on visual effects and computer animation.
-OCIO provides a straightforward and consistent user experience across all
-supporting applications while allowing for sophisticated back-end configuration
-options suitable for high-end production usage. OCIO is compatible with the
-Academy Color Encoding Specification (ACES) and is LUT-format agnostic,
-supporting many popular formats.
-
-OpenColorIO is released as version 1.0 and has been in development since 2003.
-OCIO represents the culmination of years of production experience earned on such
-films as SpiderMan 2 (2004), Surf's Up (2007), Cloudy with a Chance of Meatballs
-(2009), Alice in Wonderland (2010), and many more. OpenColorIO is natively
-supported in commercial applications like Katana, Mari, Silhouette FX, and others
-coming soon.
-
-OpenColorIO is `free <http://opencolorio.org/License.html>`__ and is one of
-several open source projects actively sponsored by `Sony Imageworks 
-<http://opensource.imageworks.com>`__.
-
-http://opencolorio.org
diff -Nru opencolorio-1.0.9~dfsg0/README.md opencolorio-1.1.0~dfsg0/README.md
--- opencolorio-1.0.9~dfsg0/README.md	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/README.md	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,59 @@
+OpenColorIO
+===========
+
+[![License](https://img.shields.io/badge/License-BSD%203--Clause-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
+[![Build Status](https://travis-ci.org/imageworks/OpenColorIO.svg?branch=master)](https://travis-ci.org/imageworks/OpenColorIO)
+[![Windows Build Status](https://ci.appveyor.com/api/projects/status/fidyv9jkxeigyd2a/branch/master?svg=true)]()
+
+Introduction
+------------
+[linear]: /docs/ociotheme/static/clo_res19_lnf.0101.jpg
+[log]: /docs/ociotheme/static/clo_res19_lm10.0101.jpg
+[vd]: /docs/ociotheme/static/clo_res19_vd16.0101.jpg
+
+![lnh][linear] ![lm10][log] ![vd8][vd]
+
+OpenColorIO (OCIO) is a complete color management solution geared towards motion
+picture production with an emphasis on visual effects and computer animation.
+OCIO provides a straightforward and consistent user experience across all
+supporting applications while allowing for sophisticated back-end configuration
+options suitable for high-end production usage. OCIO is compatible with the
+Academy Color Encoding Specification (ACES) and is LUT-format agnostic,
+supporting many popular formats.
+
+OpenColorIO is released as version 1.0 and has been in development since 2003.
+OCIO represents the culmination of years of production experience earned on such
+films as SpiderMan 2 (2004), Surf's Up (2007), Cloudy with a Chance of Meatballs
+(2009), Alice in Wonderland (2010), and many more. OpenColorIO is natively
+supported in commercial applications like Katana, Mari, Nuke, Silhouette FX, and others.
+
+OpenColorIO is free (http://opencolorio.org/License.html) and is one of
+several open source projects actively sponsored by Sony Imageworks (http://opensource.imageworks.com)
+
+Web Resources
+-------------
+* Web page: http://opencolorio.org
+* Mail lists:
+    * Developer: ocio-dev@googlegroups.com
+    * User: ocio-users@googlegroups.com
+* Slack channel: https://opencolorio.slack.com
+    * Please request access on the ocio-dev email with the email address you would like to be invited on
+
+Reference Configs
+-----------------
+Reference OCIO configuration files and associated LUTs can be found at the Imageworks [OpenColorIO-Configs](https://github.com/imageworks/OpenColorIO-Configs) repository
+
+The following reference implementations are provided:
+* SPI: Sony Pictures Imageworks
+  * spi-anim
+  * spi-vfx
+* ACES: Academy Color Encoding System
+  * aces_0.1.1
+  * aces_0.7.1
+  * aces_1.0.1
+  * aces_1.0.2
+  * aces_1.0.3
+
+---
+Images from "Cloudy With A Chance of Meatballs" Copyright 2011 Sony Pictures Inc. All Rights Reserved.
+
diff -Nru opencolorio-1.0.9~dfsg0/share/cmake/OCIOMacros.cmake opencolorio-1.1.0~dfsg0/share/cmake/OCIOMacros.cmake
--- opencolorio-1.0.9~dfsg0/share/cmake/OCIOMacros.cmake	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/share/cmake/OCIOMacros.cmake	2018-01-05 01:38:27.000000000 +0000
@@ -27,15 +27,22 @@
     endif()
 
     # Find GLEW
+
+    if(GLEW_PATH)
+        message(STATUS "GLEW path explicitly specified: ${GLEW_PATH}")
+    endif()
+
     set(GLEW_VERSION 1.5.1)
     FIND_PATH(GLEW_INCLUDES GL/glew.h
+        ${GLEW_PATH}/include
         /usr/include
         /usr/local/include
         /sw/include
         /opt/local/include
         DOC "The directory where GL/glew.h resides")
     FIND_LIBRARY(GLEW_LIBRARIES
-        NAMES GLEW glew
+        NAMES GLEW glew glew32
+        ${GLEW_PATH}/lib
         /usr/lib64
         /usr/lib
         /usr/local/lib64
@@ -49,7 +56,7 @@
         message(STATUS "Found GLEW library ${GLEW_LIBRARIES}")
         message(STATUS "Found GLEW includes ${GLEW_INCLUDES}")
     else()
-        message(STATUS "GLEW not found")
+        message(STATUS "GLEW ${GLEW_VERSION} not found. Specify GLEW_PATH to locate it")
         set(GLEW_FOUND FALSE)
     endif()
 ENDMACRO()
@@ -89,6 +96,27 @@
         set(OIIO_FOUND TRUE)
         message(STATUS "Found OIIO library ${OIIO_LIBRARIES}")
         message(STATUS "Found OIIO includes ${OIIO_INCLUDES}")
+
+        # Unfortunately, OIIO hides a dependency to Ilmbase includes
+
+        if(ILMBASE_PATH)
+            message(STATUS "Ilmbase path explicitly specified: ${ILMBASE_PATH}")
+        endif()
+
+        FIND_PATH( ILMBASE_INCLUDES OpenEXR/half.h
+            ${ILMBASE_PATH}/include/
+            /usr/include
+            /usr/local/include
+            /sw/include
+            /opt/local/include
+            DOC "The directory where OpenEXR/half.h resides")
+
+        if(ILMBASE_INCLUDES)
+            message(STATUS "Found Ilmbase includes ${ILMBASE_INCLUDES}")
+        else()
+            set(OIIO_FOUND FALSE)
+            message(STATUS "Ilmbase not found. Specify ILMBASE_PATH to locate it")
+        endif()
     else()
         set(OIIO_FOUND FALSE)
         message(STATUS "OIIO not found. Specify OIIO_PATH to locate it")
@@ -109,8 +137,28 @@
 
     set(PYTHON_OK YES) # OK until something goes wrong
 
+    if(MSVC)
+        # Python default installation on Windows is Python 32bit
+        execute_process(COMMAND ${PYTHON} -c "import sys,platform; print platform.architecture()[0]"
+            OUTPUT_VARIABLE PYTHON_X64
+            RESULT_VARIABLE PYTHON_RETURNVALUE
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
+        if( NOT ${PYTHON_RETURNVALUE} EQUAL 0 OR NOT ${PYTHON_X64} MATCHES "64bit")
+            set(PYTHON_OK NO)
+        endif()
+    endif()
+
     # Get Python version
-    execute_process(COMMAND ${PYTHON} -c "from distutils import sysconfig; print(sysconfig.get_python_version())"
+    if(WIN32)
+        # Windows install path use the version without the dot
+        set(version_cmd "from distutils import sysconfig; print(sysconfig.get_config_var('VERSION'))")
+    else()
+        set(version_cmd "from distutils import sysconfig; print(sysconfig.get_python_version())")
+    endif()
+
+    execute_process(COMMAND ${PYTHON} -c "${version_cmd}"
         OUTPUT_VARIABLE PYTHON_VERSION
         RESULT_VARIABLE PYTHON_RETURNVALUE
         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -141,7 +189,7 @@
 
 
     # Locate headers
-    execute_process(COMMAND ${PYTHON} -c "from distutils import sysconfig; print(':'.join(set(sysconfig.get_config_var('INCLDIRSTOMAKE').split())))"
+    execute_process(COMMAND ${PYTHON} -c "from distutils import sysconfig; print(':'.join(set(sysconfig.get_config_var('INCLUDEPY').split())))"
         OUTPUT_VARIABLE PYTHON_INCLUDE_RAW
         RESULT_VARIABLE PYTHON_RETURNVALUE
         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -155,9 +203,15 @@
         set(PYTHON_OK NO)
     endif()
 
+    if(WIN32)
+        # LIBPL does not exist on Windows, and no variable exist
+        set(library_cmd "from distutils import sysconfig; print '%s/libs' % sysconfig.get_config_var('prefix')")
+    else()
+        set(library_cmd "from distutils import sysconfig; print(':'.join(set(sysconfig.get_config_var('LIBPL').split())))")
+    endif()
 
     # Locate Python library
-    execute_process(COMMAND ${PYTHON} -c "from distutils import sysconfig; print(':'.join(set(sysconfig.get_config_var('LIBPL').split())))"
+    execute_process(COMMAND ${PYTHON} -c "${library_cmd}"
         OUTPUT_VARIABLE PYTHON_LIBRARY_DIRS_RAW
         RESULT_VARIABLE PYTHON_RETURNVALUE
         OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -183,10 +237,19 @@
     if(OCIO_PYGLUE_RESPECT_ABI)
         # Respect Python major/minor version, and UCS version (unicode
         # content system). E.g install into "lib/python2.6/ucs4/site-packages"
-        set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
+        # Windows & *nix does not use the same path, refer to https://docs.python.org/2/install/
+        if(WIN32)
+            set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/${PYTHON_UCS}/site-packages")
+        else()
+            set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
+        endif()
     else()
         # Ignore UCS value and install into lib/python2.6/site-packages dir
-        set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages")
+        if(WIN32)
+            set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/site-packages")
+        else()
+            set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages")
+        endif()
     endif()
 
 ENDMACRO()
@@ -293,8 +356,9 @@
 
 MACRO(ExtractRstCPP INFILE OUTFILE)
    add_custom_command(
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       OUTPUT ${OUTFILE}
-      COMMAND ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
+      COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceCPP.py ${INFILE} ${OUTFILE}
       DEPENDS ${INFILE}
       COMMENT "Extracting reStructuredText from ${INFILE} (using old process)"
    )
@@ -302,8 +366,9 @@
 
 MACRO(ExtractRstSimple INFILE OUTFILE)
    add_custom_command(
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       OUTPUT ${OUTFILE}
-      COMMAND ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
+      COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/share/sphinx/ExtractRstFromSourceSimple.py ${INFILE} ${OUTFILE}
       DEPENDS ${INFILE}
       COMMENT "Extracting reStructuredText from ${INFILE}"
    )
diff -Nru opencolorio-1.0.9~dfsg0/share/docker/dockerfile_centos7_gcc48 opencolorio-1.1.0~dfsg0/share/docker/dockerfile_centos7_gcc48
--- opencolorio-1.0.9~dfsg0/share/docker/dockerfile_centos7_gcc48	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/share/docker/dockerfile_centos7_gcc48	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,76 @@
+#
+# Centos 7 Dockerfile for OCIO
+#
+
+# Pull base image
+FROM centos:7
+
+LABEL maintainer="sean@seancooper.xyz"
+
+# Install yum hosted dependencies
+RUN yum -y install epel-release && \
+    yum -y install gcc-c++ \
+    make \
+    cmake3 \
+    git \
+    wget \
+    bzip2 \
+    file \
+    which \
+    patch \
+    python-devel.x86_64 \
+    python-sphinx \
+    glew-devel \
+    java \
+    libtiff-devel \
+    zlib \
+    libpng-devel \
+    libjpeg-turbo-devel \
+    bzip2-devel \
+    freeglut-devel \
+    libXmu-devel \
+    libXi-devel && \
+    yum -y clean all
+    
+# Install Truelight library
+RUN mkdir /home/download && \
+    cd /home/download && \
+    wget -O truelight-4.0.7863_64.run --post-data 'access=public&download=truelight/4_0/truelight-4.0.7863_64.run&last_page=/support/customer-login/truelight_sp/truelight_40.php' https://www.filmlight.ltd.uk/resources/download.php && \
+    sh truelight-4.0.7863_64.run
+
+# Install Boost
+RUN cd /home/download && \
+    wget https://sourceforge.net/projects/boost/files/boost/1.61.0/boost_1_61_0.tar.gz && \
+    tar -xzf boost_1_61_0.tar.gz && \
+    cd boost_1_61_0 && \
+    sh bootstrap.sh && \
+    ./b2 install --prefix=/usr/local
+
+# Install OpenEXR
+RUN mkdir /home/git && \
+    cd /home/git && \
+    git clone https://github.com/openexr/openexr.git -b v2.2.1 && \
+    cd /home/git/openexr/IlmBase && \
+    mkdir /home/git/openexr/IlmBase/build && \
+    cd /home/git/openexr/IlmBase/build && \
+    cmake3 .. && \
+    make install -j2 && \
+    cd /home/git/openexr/OpenEXR && \
+    mkdir /home/git/openexr/OpenEXR/build && \
+    cd /home/git/openexr/OpenEXR/build && \
+    cmake3 -DILMBASE_PACKAGE_PREFIX=/usr/local .. && \
+    make install -j2
+
+# Install OIIO
+RUN cd /home/git && \
+    git clone https://github.com/OpenImageIO/oiio.git -b RB-1.7 && \
+    cd /home/git/oiio && \
+    mkdir build && \
+    cd /home/git/oiio/build && \
+    cmake3 .. && \
+    make install -j2
+
+# Remove cache
+RUN rm -rf /var/cache/yum && \
+    rm -R /home/git && \
+    rm -R /home/download
diff -Nru opencolorio-1.0.9~dfsg0/share/nuke/ocionuke/cdl.py opencolorio-1.1.0~dfsg0/share/nuke/ocionuke/cdl.py
--- opencolorio-1.0.9~dfsg0/share/nuke/ocionuke/cdl.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/share/nuke/ocionuke/cdl.py	2018-01-05 01:38:27.000000000 +0000
@@ -44,6 +44,18 @@
     node['cccid'].setValue(cdl.getID())
 
 
+def _xml_colorcorrection_to_cdltransform(xml, cccposition):
+    """From an XML string, return a CDLTransform object, if the cccid
+    is absent from the XML the given cccposition will be used instead 
+    """
+    ccxml = ET.tostring(xml)
+    cdl = OCIO.CDLTransform()
+    cdl.setXML(ccxml)
+    if "cccid" not in xml.getchildren():
+	cdl.setID(str(cccposition))
+
+    return cdl
+
 def _xml_to_cdltransforms(xml):
     """Given some XML as a string, returns a list of CDLTransform
     objects for each ColorCorrection (returns a one-item list for a
@@ -55,30 +67,28 @@
     # Strip away xmlns
     for elem in tree.getiterator():
         if elem.tag.startswith("{"):
-             elem.tag = elem.tag.partition("}")[2]
+            elem.tag = elem.tag.partition("}")[2]
 
     filetype = tree.tag
 
+    cccposition = 0
     if filetype == "ColorCorrection":
-        ccxml = ET.tostring(tree)
-        cdl = OCIO.CDLTransform()
-        cdl.setXML(ccxml)
-        return [cdl]
+        return [_xml_colorcorrection_to_cdltransform(tree, cccposition)]
 
-    elif filetype == "ColorCorrectionCollection":
+    elif filetype in ["ColorCorrectionCollection", "ColorDecisionList"]:
         allcdl = []
         for cc in tree.getchildren():
+            if cc.tag == "ColorDecision":
+                cc = cc.getchildren()[0] # TODO: something better here
             if cc.tag != "ColorCorrection": continue
-            ccxml = ET.tostring(cc)
-            cdl = OCIO.CDLTransform()
-            cdl.setXML(ccxml)
-            allcdl.append(cdl)
+            allcdl.append(_xml_colorcorrection_to_cdltransform(cc, cccposition))
+            cccposition += 1
         return allcdl
 
     else:
         raise RuntimeError(
             "The supplied file did not have the correct root element, expected"
-            " 'ColorCorrection' or 'ColorCorrectionCollection', got %r" % (filetype))
+            " 'ColorCorrection' or 'ColorCorrectionCollection' or 'ColorDecisionList', got %r" % (filetype))
 
 
 def _cdltransforms_to_xml(allcc):
@@ -175,7 +185,7 @@
         node = nuke.thisNode()
 
     if filename is None:
-        ccfilename = nuke.getFilename("Color Correction filename", pattern = "*.cc *.ccc")
+        ccfilename = nuke.getFilename("Color Correction filename", pattern = "*.cc *.ccc *.cdl")
         if ccfilename is None:
             # User clicked cancel
             return
@@ -228,7 +238,7 @@
     """
 
     if filename is None:
-        filename = nuke.getFilename("Color Correction XML file", pattern = "*.cc *.ccc")
+        filename = nuke.getFilename("Color Correction XML file", pattern = "*.cc *.ccc *.cdl")
         if filename is None:
             # User clicked cancel
             return
diff -Nru opencolorio-1.0.9~dfsg0/share/sphinx/ExtractRstFromSourceCPP.py opencolorio-1.1.0~dfsg0/share/sphinx/ExtractRstFromSourceCPP.py
--- opencolorio-1.0.9~dfsg0/share/sphinx/ExtractRstFromSourceCPP.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/share/sphinx/ExtractRstFromSourceCPP.py	2018-01-05 01:38:27.000000000 +0000
@@ -146,7 +146,7 @@
         
         if buffer_lines[0] != '':
             buffer_lines.insert(0, '')
-        for x in xrange(0, len(buffer_lines)):
+        for x in range(0, len(buffer_lines)):
             buffer_lines[x] = "   %s" % buffer_lines[x]
         buffer_lines.append('')
         buffer = '\n'.join(buffer_lines)
@@ -181,7 +181,7 @@
                     indent += 1
             # remove indent
             bufa = [buf_lines[0]]
-            for x in xrange(1, len(buf_lines)):
+            for x in range(1, len(buf_lines)):
                 bufa.append(buf_lines[x][indent:])
             buf = '\n'.join(bufa) + '\n'
             ##
@@ -229,7 +229,7 @@
             sys.exit(1)
         
         src = open(sys.argv[1]).read()
-        output = file(sys.argv[2], 'w')
+        output = open(sys.argv[2], 'w+')
         ExtractRst(src, output)
         output.close()
         
diff -Nru opencolorio-1.0.9~dfsg0/share/sphinx/ExtractRstFromSourceSimple.py opencolorio-1.1.0~dfsg0/share/sphinx/ExtractRstFromSourceSimple.py
--- opencolorio-1.0.9~dfsg0/share/sphinx/ExtractRstFromSourceSimple.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/share/sphinx/ExtractRstFromSourceSimple.py	2018-01-05 01:38:27.000000000 +0000
@@ -51,7 +51,7 @@
                 # Make sure that the file name is valid here
                 if newOutputFile:
                     ofile.close()
-                ofile = file(filename, 'w')
+                ofile = open(filename, 'w')
                 newOutputFile = True
             ofile.write(docstring.strip() + '\n')
         else:
@@ -69,7 +69,7 @@
             sys.exit(1)
         
         src = open(sys.argv[1]).read()
-        output = file(sys.argv[2], 'w')
+        output = open(sys.argv[2], 'w')
         ExtractRst(src, output)
         output.close()
         
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm opencolorio-1.1.0~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm
--- opencolorio-1.0.9~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm	2018-01-05 01:38:27.000000000 +0000
@@ -202,7 +202,7 @@
 
 int PopUpMenu(const MenuVec &menu_items, int selected_index, const void *hwnd)
 {
-    NSMutableArray *item_array = [[NSMutableArray alloc] init];
+    NSMutableArray *item_array = [NSMutableArray array];
     
     for(MenuVec::const_iterator i = menu_items.begin(); i != menu_items.end(); i++)
     {
@@ -218,12 +218,148 @@
     NSInteger item = [menu selectedItem];
     
     [menu release];
-    [item_array release];
     
     return item;
 }
 
 
+bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace, bool selectRoles, const void *hwnd)
+{
+    NSMenu *menu = [[[NSMenu alloc] initWithTitle:@"ColorSpace Pop-Up"] autorelease];
+    
+    [menu setAutoenablesItems:NO];
+    
+    
+    for(int i=0; i < config->getNumColorSpaces(); ++i)
+    {
+        const char *colorSpaceName = config->getColorSpaceNameByIndex(i);
+        
+        OCIO::ConstColorSpaceRcPtr colorSpacePtr = config->getColorSpace(colorSpaceName);
+        
+        const char *family = colorSpacePtr->getFamily();
+        
+        
+        NSString *colorSpacePath = nil;
+        
+        if(family == NULL)
+        {
+            colorSpacePath = [NSString stringWithUTF8String:colorSpaceName];
+        }
+        else
+        {
+            colorSpacePath = [NSString stringWithFormat:@"%s/%s", family, colorSpaceName];
+        }
+        
+        
+        NSArray *pathComponents = [colorSpacePath pathComponents];
+        
+        NSMenu *currentMenu = menu;
+        
+        for(int j=0; j < [pathComponents count]; j++)
+        {
+            NSString *componentName = [pathComponents objectAtIndex:j];
+            
+            if(j == ([pathComponents count] - 1))
+            {
+                NSMenuItem *newItem = [currentMenu addItemWithTitle:componentName action:@selector(textMenuItemAction:) keyEquivalent:@""];
+                
+                if(colorSpace == [componentName UTF8String])
+                {
+                    [newItem setState:NSOnState];
+                }
+            }
+            else
+            {
+                NSMenuItem *componentItem = [currentMenu itemWithTitle:componentName];
+                
+                if(componentItem == nil)
+                {
+                    componentItem = [currentMenu addItemWithTitle:componentName action:NULL keyEquivalent:@""];
+                    
+                    NSMenu *subMenu = [[[NSMenu alloc] initWithTitle:componentName] autorelease];
+                    
+                    [subMenu setAutoenablesItems:NO];
+                    
+                    [componentItem setSubmenu:subMenu];
+                }
+                
+                currentMenu = [componentItem submenu];
+            }
+        }
+    }
+    
+    
+    if(config->getNumRoles() > 0)
+    {
+        NSMenuItem *rolesItem = [menu insertItemWithTitle:@"Roles" action:NULL keyEquivalent:@"" atIndex:0];
+        
+        NSMenu *rolesMenu = [[[NSMenu alloc] initWithTitle:@"Roles"] autorelease];
+        
+        [rolesMenu setAutoenablesItems:NO];
+        
+        [rolesItem setSubmenu:rolesMenu];
+        
+        for(int i=0; i < config->getNumRoles(); i++)
+        {
+            NSString *roleName = [NSString stringWithUTF8String:config->getRoleName(i)];
+            
+            OCIO::ConstColorSpaceRcPtr colorSpacePtr = config->getColorSpace([roleName UTF8String]);
+            
+            NSString *colorSpaceName = [NSString stringWithUTF8String:colorSpacePtr->getName()];
+            
+            SEL selector = (selectRoles ? @selector(textMenuItemAction:) : NULL);
+            
+            NSMenuItem *roleItem = [rolesMenu addItemWithTitle:roleName action:selector keyEquivalent:@""];
+            
+            if(colorSpace == [roleName UTF8String])
+            {
+                [roleItem setState:NSOnState];
+            }
+            
+            NSMenu *roleMenu = [[[NSMenu alloc] initWithTitle:roleName] autorelease];
+            
+            [roleMenu setAutoenablesItems:NO];
+            
+            [roleItem setSubmenu:roleMenu];
+            
+            NSMenuItem *roleColorSpaceItem = [roleMenu addItemWithTitle:colorSpaceName action:@selector(textMenuItemAction:) keyEquivalent:@""];
+            
+            if(colorSpace == [colorSpaceName UTF8String])
+            {
+                [roleColorSpaceItem setState:NSOnState];
+            }
+        }
+        
+        [menu insertItem:[NSMenuItem separatorItem] atIndex:1];
+    }
+    
+        
+    
+    OpenColorIO_AE_Menu *ocio_menu = [[OpenColorIO_AE_Menu alloc] initWithTextMenu:menu];
+    
+    [ocio_menu showTextMenu];
+    
+    
+    NSMenuItem *item = [ocio_menu selectedTextMenuItem];
+    
+    
+    bool selected = false;
+    
+    if(item != nil)
+    {
+        colorSpace = [[item title] UTF8String];
+        
+        selected = true;
+    }
+    
+    
+    [ocio_menu release];
+    
+    
+    return selected;
+}
+
+
 void ErrorMessage(const char *message, const void *hwnd)
 {
     NSAlert *alert = [[NSAlert alloc] init];
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.h opencolorio-1.1.0~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.h
--- opencolorio-1.0.9~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.h	2018-01-05 01:38:27.000000000 +0000
@@ -29,11 +29,16 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface OpenColorIO_AE_Menu : NSView {
+@interface OpenColorIO_AE_Menu : NSView
+{
     NSArray *menu_items;
     NSInteger chosen_item;
+    
+    NSMenu *text_menu;
+    NSMenuItem *chosen_menu_item;
 }
 
+// index-based menu
 - (id)init:(NSArray *)menuItems selectedItem:(NSInteger)selected;
 
 - (void)showMenu;
@@ -42,4 +47,13 @@
 
 - (NSInteger)selectedItem;
 
+// text-based menu
+- (id)initWithTextMenu:(NSMenu *)menu;
+
+- (void)showTextMenu;
+
+- (IBAction)textMenuItemAction:(id)sender;
+
+- (NSMenuItem *)selectedTextMenuItem;
+
 @end
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.m opencolorio-1.1.0~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.m
--- opencolorio-1.0.9~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.m	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/mac/OpenColorIO_AE_Menu.m	2018-01-05 01:38:27.000000000 +0000
@@ -31,16 +31,18 @@
 
 @implementation OpenColorIO_AE_Menu
 
-- (id)init:(NSArray *)menuItems selectedItem:(NSInteger)selected {
+- (id)init:(NSArray *)menuItems selectedItem:(NSInteger)selected
+{
     self = [super init];
-
+    
     menu_items = menuItems;
     chosen_item = selected;
     
     return self;
 }
 
-- (void)showMenu {
+- (void)showMenu
+{
 
     // Doing some pretty weird stuff here.
     // I need to bring up a contextual menu without AE giving me an NSView.
@@ -101,14 +103,55 @@
     [menu release];
 }
 
-- (IBAction)menuItemAction:(id)sender {
+- (IBAction)menuItemAction:(id)sender
+{
     NSMenuItem *item = (NSMenuItem *)sender;
     
     chosen_item = [item tag];
 }
 
-- (NSInteger)selectedItem {
+- (NSInteger)selectedItem
+{
     return chosen_item;
 }
 
+
+
+- (id)initWithTextMenu:(NSMenu *)menu
+{
+    self = [super init];
+    
+    text_menu = menu;
+    chosen_menu_item = nil;
+    
+    return self;
+}
+
+- (void)showTextMenu
+{
+    id fakeMouseEvent=[NSEvent mouseEventWithType:NSLeftMouseDown
+                        location: [[NSApp keyWindow] convertScreenToBase:[NSEvent mouseLocation]]
+                        modifierFlags:0 
+                        timestamp:0
+                        windowNumber: [[NSApp keyWindow] windowNumber]
+                        context:nil
+                        eventNumber:0 
+                        clickCount:1 
+                        pressure:0];
+    
+    [NSMenu popUpContextMenu:text_menu withEvent:fakeMouseEvent forView:self];
+}
+
+- (IBAction)textMenuItemAction:(id)sender
+{
+    NSMenuItem *item = (NSMenuItem *)sender;
+    
+    chosen_menu_item = item;
+}
+
+- (NSMenuItem *)selectedTextMenuItem
+{
+    return chosen_menu_item;
+}
+
 @end
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_Context.cpp opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_Context.cpp
--- opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_Context.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_Context.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -69,7 +69,7 @@
 
 std::string Path::full_path() const
 {
-    if( is_relative(_path) && !_dir.empty() )
+    if( !_path.empty() && is_relative(_path) && !_dir.empty() )
     {
         std::vector<std::string> path_vec = components( convert_delimiters(_path) );
         std::vector<std::string> dir_vec = components(_dir);
@@ -115,7 +115,7 @@
 
 std::string Path::relative_path(bool force) const
 {
-    if( is_relative(_path) || _dir.empty() || _path.empty() )
+    if( _dir.empty() || _path.empty() || is_relative(_path) )
     {
         return _path;
     }
@@ -182,7 +182,7 @@
 }
 
 
-Path::PathType Path::path_type(std::string path)
+Path::PathType Path::path_type(const std::string &path)
 {
     if( path.empty() )
     {
@@ -228,7 +228,7 @@
 }
 
 
-bool Path::is_relative(std::string path)
+bool Path::is_relative(const std::string &path)
 {
     Path::PathType type = path_type(path);
     
@@ -254,27 +254,29 @@
 }
 
 
-std::string Path::convert_delimiters(std::string path)
+std::string Path::convert_delimiters(const std::string &path)
 {
 #ifdef WIN_ENV
-    char search = mac_delimiter;
-    char replace = win_delimiter;
+    const char search = mac_delimiter;
+    const char replace = win_delimiter;
 #else
-    char search = win_delimiter;
-    char replace = mac_delimiter;
+    const char search = win_delimiter;
+    const char replace = mac_delimiter;
 #endif
 
-    for(int i=0; i < path.size(); i++)
+    std::string path_copy = path;
+
+    for(int i=0; i < path_copy.size(); i++)
     {
-        if(path[i] == search)
-            path[i] = replace;
+        if(path_copy[i] == search)
+            path_copy[i] = replace;
     }
     
-    return path;
+    return path_copy;
 }
 
 
-std::vector<std::string> Path::components(std::string path)
+std::vector<std::string> Path::components(const std::string &path)
 {
     std::vector<std::string> vec;
     
@@ -354,7 +356,17 @@
             
             for(int i=0; i < _config->getNumColorSpaces(); ++i)
             {
-                _inputs.push_back( _config->getColorSpaceNameByIndex(i) );
+                const char *colorSpaceName = _config->getColorSpaceNameByIndex(i);
+                
+                OCIO::ConstColorSpaceRcPtr colorSpace = _config->getColorSpace(colorSpaceName);
+                
+                const char *family = colorSpace->getFamily();
+                
+                _inputs.push_back(colorSpaceName);
+                
+                const std::string fullPath = (family == NULL ? colorSpaceName : std::string(family) + "/" + colorSpaceName);
+                
+                _inputsFullPath.push_back(fullPath);
             }
             
             
@@ -363,24 +375,20 @@
                 _devices.push_back( _config->getDisplay(i) );
             }
             
-            const char * defaultDisplay = _config->getDefaultDisplay();
-            const char * defaultTransform = _config->getDefaultView(defaultDisplay);
             
-            for(int i=0; i < _config->getNumViews(defaultDisplay); ++i)
-            {
-                _transforms.push_back( _config->getView(defaultDisplay, i) );
-            }
+            OCIO::ConstColorSpaceRcPtr defaultInput = _config->getColorSpace(OCIO::ROLE_DEFAULT);
             
+            const char *defaultInputName = (defaultInput ? defaultInput->getName() : OCIO::ROLE_DEFAULT);
             
-            OCIO::ConstColorSpaceRcPtr defaultInput = _config->getColorSpace(OCIO::ROLE_SCENE_LINEAR);
             
-            const char *defaultInputName = (defaultInput ? defaultInput->getName() : OCIO::ROLE_SCENE_LINEAR);
+            setupConvert(defaultInputName, defaultInputName);
             
             
-            setupConvert(defaultInputName, defaultInputName);
+            const char *defaultDisplay = _config->getDefaultDisplay();
+            const char *defaultTransform = _config->getDefaultView(defaultDisplay);
             
-            _transform = defaultTransform;
             _device = defaultDisplay;
+            _transform = defaultTransform;
         }
         else
         {
@@ -450,7 +458,17 @@
             
             for(int i=0; i < _config->getNumColorSpaces(); ++i)
             {
-                _inputs.push_back( _config->getColorSpaceNameByIndex(i) );
+                const char *colorSpaceName = _config->getColorSpaceNameByIndex(i);
+                
+                OCIO::ConstColorSpaceRcPtr colorSpace = _config->getColorSpace(colorSpaceName);
+                
+                const char *family = colorSpace->getFamily();
+                
+                _inputs.push_back(colorSpaceName);
+                
+                const std::string fullPath = (family == NULL ? colorSpaceName : std::string(family) + "/" + colorSpaceName);
+                
+                _inputsFullPath.push_back(fullPath);
             }
             
             
@@ -459,25 +477,16 @@
                 _devices.push_back( _config->getDisplay(i) );
             }
             
-            const char * defaultDisplay = _config->getDefaultDisplay();
-            const char * defaultTransform = _config->getDefaultView(defaultDisplay);
-            
-            for(int i=0; i < _config->getNumViews(defaultDisplay); ++i)
-            {
-                _transforms.push_back( _config->getView(defaultDisplay, i) );
-            }
-            
-            
             if(arb_data->action == OCIO_ACTION_CONVERT)
             {
                 setupConvert(arb_data->input, arb_data->output);
                 
-                _transform = arb_data->transform;
                 _device = arb_data->device;
+                _transform = arb_data->transform;
             }
             else
             {
-                setupDisplay(arb_data->input, arb_data->transform, arb_data->device);
+                setupDisplay(arb_data->input, arb_data->device, arb_data->transform);
                 
                 _output = arb_data->output;
             }
@@ -572,11 +581,11 @@
     else if(arb_data->action == OCIO_ACTION_DISPLAY)
     {
         if(_input != arb_data->input ||
-            _transform != arb_data->transform ||
             _device != arb_data->device ||
+            _transform != arb_data->transform ||
             force_reset)
         {
-            setupDisplay(arb_data->input, arb_data->transform, arb_data->device);
+            setupDisplay(arb_data->input, arb_data->device, arb_data->transform);
         }
     }
     else
@@ -606,17 +615,35 @@
 }
 
 
-void OpenColorIO_AE_Context::setupDisplay(const char *input, const char *xform, const char *device)
+void OpenColorIO_AE_Context::setupDisplay(const char *input, const char *device, const char *xform)
 {
+    _transforms.clear();
+    
+    bool xformValid = false;
+    
+    for(int i=0; i < _config->getNumViews(device); i++)
+    {
+        const std::string transformName = _config->getView(device, i);
+        
+        if(transformName == xform)
+            xformValid = true;
+        
+        _transforms.push_back(transformName);
+    }
+    
+    if(!xformValid)
+        xform = _config->getDefaultView(device);
+    
+
     OCIO::DisplayTransformRcPtr transform = OCIO::DisplayTransform::Create();
     
     transform->setInputColorSpaceName(input);
-    transform->setView(xform);
     transform->setDisplay(device);
+    transform->setView(xform);
     
     _input = input;
-    _transform = xform;
     _device = device;
+    _transform = xform;
     
 
     _processor = _config->getProcessor(transform);
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_Context.h opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_Context.h
--- opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_Context.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_Context.h	2018-01-05 01:38:27.000000000 +0000
@@ -64,10 +64,10 @@
         TYPE_WIN
     } PathType;
     
-    static PathType path_type(std::string path);
-    static bool is_relative(std::string path);
-    static std::string convert_delimiters(std::string path);
-    static std::vector<std::string> components(std::string path);
+    static PathType path_type(const std::string &path);
+    static bool is_relative(const std::string &path);
+    static std::string convert_delimiters(const std::string &path);
+    static std::vector<std::string> components(const std::string &path);
 };
 
 
@@ -81,7 +81,7 @@
     bool Verify(const ArbitraryData *arb_data, const std::string &dir);
     
     void setupConvert(const char *input, const char *output);
-    void setupDisplay(const char *input, const char *transform, const char *device);
+    void setupDisplay(const char *input, const char *device, const char *transform);
     void setupLUT(bool invert, OCIO_Interp interpolation);
   
     typedef std::vector<std::string> SpaceVec;
@@ -89,13 +89,14 @@
     OCIO_Action getAction() const { return _action; }
     const std::string & getInput() const { return _input; }
     const std::string & getOutput() const { return _output; }
-    const std::string & getTransform() const { return _transform; }
     const std::string & getDevice() const { return _device; }
-    const SpaceVec & getInputs() const { return _inputs; }
-    const SpaceVec & getTransforms() const { return _transforms; }
+    const std::string & getTransform() const { return _transform; }
+    const SpaceVec & getInputs(bool fullPath=false) const { return fullPath ? _inputsFullPath : _inputs; }
     const SpaceVec & getDevices() const { return _devices; }
+    const SpaceVec & getTransforms() const { return _transforms; }
     
-    const OCIO::ConstProcessorRcPtr & processor() const { return _processor; }
+    OCIO::ConstConfigRcPtr config() const { return _config; }
+    OCIO::ConstProcessorRcPtr processor() const { return _processor; }
     
     bool ExportLUT(const std::string &path, const std::string &display_icc_path);
     
@@ -110,11 +111,12 @@
     
     std::string _input;
     std::string _output;
-    std::string _transform;
     std::string _device;
+    std::string _transform;
     SpaceVec _inputs;
-    SpaceVec _transforms;
+    SpaceVec _inputsFullPath;
     SpaceVec _devices;
+    SpaceVec _transforms;
     
     bool _invert;
     OCIO_Interp _interpolation;
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_Dialogs.h opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_Dialogs.h
--- opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_Dialogs.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_Dialogs.h	2018-01-05 01:38:27.000000000 +0000
@@ -33,6 +33,10 @@
 #include <map>
 #include <vector>
 
+#include <OpenColorIO/OpenColorIO.h>
+namespace OCIO = OCIO_NAMESPACE;
+
+
 typedef std::map<std::string, std::string> ExtensionMap; // map[ ext ] = format
 
 bool OpenFile(char *path, int buf_len, const ExtensionMap &extensions, const void *hwnd);
@@ -54,7 +58,13 @@
 int PopUpMenu(const MenuVec &menu_items, int selected_index, const void *hwnd);
 
 
+bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace, bool selectRoles, const void *hwnd);
+
+
 void ErrorMessage(const char *message, const void *hwnd);
 
+#ifdef SUPPLY_HINSTANCE
+void SetHInstance(void *hInstance);
+#endif
 
 #endif // _OPENCOLORIC_AE_DIALOG_H_
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_UI.cpp opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_UI.cpp
--- opencolorio-1.0.9~dfsg0/src/aftereffects/OpenColorIO_AE_UI.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/OpenColorIO_AE_UI.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -490,11 +490,11 @@
                         
                         bot.Move(0, MENU_HEIGHT + MENU_SPACE_V);
                         
-                        DrawMenu(bot, "Transform:", arb_data->transform);
+                        DrawMenu(bot, "Device:", arb_data->device);
                         
                         bot.Move(0, MENU_HEIGHT + MENU_SPACE_V);
                         
-                        DrawMenu(bot, "Device:", arb_data->device);
+                        DrawMenu(bot, "Transform:", arb_data->transform);
                     }
                 }
             }
@@ -679,7 +679,10 @@
             }
             else if(arb_data->action == OCIO_ACTION_DISPLAY)
             {
-                seq_data->context->setupDisplay(arb_data->input, arb_data->transform, arb_data->device);
+                seq_data->context->setupDisplay(arb_data->input, arb_data->device, arb_data->transform);
+                
+                // transform may have changed
+                strncpy(arb_data->transform, seq_data->context->getTransform().c_str(), ARB_SPACE_LEN);
             }
         }
         
@@ -847,7 +850,10 @@
                 }
                 else if(arb_data->action == OCIO_ACTION_DISPLAY)
                 {
-                    seq_data->context->setupDisplay(arb_data->input, arb_data->transform, arb_data->device);
+                    seq_data->context->setupDisplay(arb_data->input, arb_data->device, arb_data->transform);
+                    
+                    // transform may have changed
+                    strncpy(arb_data->transform, seq_data->context->getTransform().c_str(), ARB_SPACE_LEN);
                 }
             }
             
@@ -897,7 +903,10 @@
         {
             arb_data->action = OCIO_ACTION_DISPLAY;
             
-            seq_data->context->setupDisplay(arb_data->input, arb_data->transform, arb_data->device);
+            seq_data->context->setupDisplay(arb_data->input, arb_data->device, arb_data->transform);
+            
+            // transform may have changed
+            strncpy(arb_data->transform, seq_data->context->getTransform().c_str(), ARB_SPACE_LEN);
             
             params[OCIO_DATA]->uu.change_flags = PF_ChangeFlag_CHANGED_VALUE;
         }
@@ -976,120 +985,166 @@
 {
     if(seq_data->context != NULL && arb_data->action == seq_data->context->getAction())
     {
-        MenuVec menu_items;
-        int selected_item;
-        
-        if(arb_data->action == OCIO_ACTION_LUT)
+        if(arb_data->action == OCIO_ACTION_CONVERT ||
+            (arb_data->action == OCIO_ACTION_DISPLAY && (reg == REGION_MENU1)))
         {
+            // colorSpace menus
+            std::string selected_item;
+        
             if(reg == REGION_MENU1)
             {
-                menu_items.push_back("Nearest Neighbor");
-                menu_items.push_back("Linear");
-                menu_items.push_back("Tetrahedral");
-                menu_items.push_back("(-");
-                menu_items.push_back("Best");
-                
-                selected_item = arb_data->interpolation == OCIO_INTERP_NEAREST ? 0 :
-                                arb_data->interpolation == OCIO_INTERP_LINEAR ? 1 :
-                                arb_data->interpolation == OCIO_INTERP_TETRAHEDRAL ? 2 :
-                                arb_data->interpolation == OCIO_INTERP_BEST ? 4 :
-                                -1;
-            }
-        }
-        else if(arb_data->action == OCIO_ACTION_CONVERT)
-        {
-            menu_items = seq_data->context->getInputs();
-            
-            if(reg == REGION_MENU1)
-            {
-                selected_item = FindInVec(menu_items, arb_data->input);
+                selected_item = arb_data->input;
             }
             else
             {
-                selected_item = FindInVec(menu_items, arb_data->output);
-            }
-        }
-        else if(arb_data->action == OCIO_ACTION_DISPLAY)
-        {
-            if(reg == REGION_MENU1)
-            {
-                menu_items = seq_data->context->getInputs();
-                
-                selected_item = FindInVec(menu_items, arb_data->input);
-            }
-            else if(reg == REGION_MENU2)
-            {
-                menu_items = seq_data->context->getTransforms();
-                
-                selected_item = FindInVec(menu_items, arb_data->transform);
+                selected_item = arb_data->output;
             }
-            else if(reg == REGION_MENU3)
+            
+            
+            void *hwndOwner = NULL;
+
+        #ifdef WIN_ENV
+            PF_GET_PLATFORM_DATA(PF_PlatData_MAIN_WND, &hwndOwner);
+        #endif
+        
+            const bool changed = ColorSpacePopUpMenu(seq_data->context->config(), selected_item, true, hwndOwner);
+            
+            
+            if(changed)
             {
-                menu_items = seq_data->context->getDevices();
+                if(reg == REGION_MENU1)
+                {
+                    strncpy(arb_data->input, selected_item.c_str(), ARB_SPACE_LEN);
+                }
+                else
+                {
+                    strncpy(arb_data->output, selected_item.c_str(), ARB_SPACE_LEN);
+                }
                 
-                selected_item = FindInVec(menu_items, arb_data->device);
+                params[OCIO_DATA]->uu.change_flags = PF_ChangeFlag_CHANGED_VALUE;
             }
         }
-        
-        
-        
-        void *hwndOwner = NULL;
-
-    #ifdef WIN_ENV
-        PF_GET_PLATFORM_DATA(PF_PlatData_MAIN_WND, &hwndOwner);
-    #endif
-
-        int result = PopUpMenu(menu_items, selected_item, hwndOwner);
-        
-        
-        if(result != selected_item)
+        else
         {
-            std::string color_space = menu_items[ result ];
+            // standard menus
+            MenuVec menu_items;
+            int selected_item;
             
             if(arb_data->action == OCIO_ACTION_LUT)
             {
                 if(reg == REGION_MENU1)
                 {
-                    arb_data->interpolation =   result == 0 ? OCIO_INTERP_NEAREST :
-                                                result == 2 ? OCIO_INTERP_TETRAHEDRAL :
-                                                result == 4 ? OCIO_INTERP_BEST :
-                                                OCIO_INTERP_LINEAR;
-                                            
-                    seq_data->context->setupLUT(arb_data->invert, arb_data->interpolation);
+                    menu_items.push_back("Nearest Neighbor");
+                    menu_items.push_back("Linear");
+                    menu_items.push_back("Tetrahedral");
+                    menu_items.push_back("(-");
+                    menu_items.push_back("Best");
+                    
+                    selected_item = arb_data->interpolation == OCIO_INTERP_NEAREST ? 0 :
+                                    arb_data->interpolation == OCIO_INTERP_LINEAR ? 1 :
+                                    arb_data->interpolation == OCIO_INTERP_TETRAHEDRAL ? 2 :
+                                    arb_data->interpolation == OCIO_INTERP_BEST ? 4 :
+                                    -1;
                 }
             }
             else if(arb_data->action == OCIO_ACTION_CONVERT)
             {
+                menu_items = seq_data->context->getInputs();
+                
                 if(reg == REGION_MENU1)
                 {
-                    strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN);
+                    selected_item = FindInVec(menu_items, arb_data->input);
                 }
-                else if(reg == REGION_MENU2)
+                else
                 {
-                    strncpy(arb_data->output, color_space.c_str(), ARB_SPACE_LEN);
+                    selected_item = FindInVec(menu_items, arb_data->output);
                 }
-                
-                seq_data->context->setupConvert(arb_data->input, arb_data->output);
             }
             else if(arb_data->action == OCIO_ACTION_DISPLAY)
             {
                 if(reg == REGION_MENU1)
                 {
-                    strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN);
+                    menu_items = seq_data->context->getInputs();
+                    
+                    selected_item = FindInVec(menu_items, arb_data->input);
                 }
                 else if(reg == REGION_MENU2)
                 {
-                    strncpy(arb_data->transform, color_space.c_str(), ARB_SPACE_LEN);
+                    menu_items = seq_data->context->getDevices();
+                    
+                    selected_item = FindInVec(menu_items, arb_data->device);
                 }
                 else if(reg == REGION_MENU3)
                 {
-                    strncpy(arb_data->device, color_space.c_str(), ARB_SPACE_LEN);
+                    menu_items = seq_data->context->getTransforms();
+                    
+                    selected_item = FindInVec(menu_items, arb_data->transform);
                 }
-                
-                seq_data->context->setupDisplay(arb_data->input, arb_data->transform, arb_data->device);
             }
+            
+            
+            
+            void *hwndOwner = NULL;
+
+        #ifdef WIN_ENV
+            PF_GET_PLATFORM_DATA(PF_PlatData_MAIN_WND, &hwndOwner);
+        #endif
+
+            int result = PopUpMenu(menu_items, selected_item, hwndOwner);
+            
+            
+            if(result != selected_item)
+            {
+                std::string color_space = menu_items[ result ];
+                
+                if(arb_data->action == OCIO_ACTION_LUT)
+                {
+                    if(reg == REGION_MENU1)
+                    {
+                        arb_data->interpolation =   result == 0 ? OCIO_INTERP_NEAREST :
+                                                    result == 2 ? OCIO_INTERP_TETRAHEDRAL :
+                                                    result == 4 ? OCIO_INTERP_BEST :
+                                                    OCIO_INTERP_LINEAR;
+                                                
+                        seq_data->context->setupLUT(arb_data->invert, arb_data->interpolation);
+                    }
+                }
+                else if(arb_data->action == OCIO_ACTION_CONVERT)
+                {
+                    if(reg == REGION_MENU1)
+                    {
+                        strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN);
+                    }
+                    else if(reg == REGION_MENU2)
+                    {
+                        strncpy(arb_data->output, color_space.c_str(), ARB_SPACE_LEN);
+                    }
                     
-            params[OCIO_DATA]->uu.change_flags = PF_ChangeFlag_CHANGED_VALUE;
+                    seq_data->context->setupConvert(arb_data->input, arb_data->output);
+                }
+                else if(arb_data->action == OCIO_ACTION_DISPLAY)
+                {
+                    if(reg == REGION_MENU1)
+                    {
+                        strncpy(arb_data->input, color_space.c_str(), ARB_SPACE_LEN);
+                    }
+                    else if(reg == REGION_MENU2)
+                    {
+                        strncpy(arb_data->device, color_space.c_str(), ARB_SPACE_LEN);
+                    }
+                    else if(reg == REGION_MENU3)
+                    {
+                        strncpy(arb_data->transform, color_space.c_str(), ARB_SPACE_LEN);
+                    }
+                    
+                    seq_data->context->setupDisplay(arb_data->input, arb_data->device, arb_data->transform);
+                    
+                    // transform may have changed
+                    strncpy(arb_data->transform, seq_data->context->getTransform().c_str(), ARB_SPACE_LEN);
+                }
+                        
+                params[OCIO_DATA]->uu.change_flags = PF_ChangeFlag_CHANGED_VALUE;
+            }
         }
     }
 }
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/glew.vcproj opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/glew.vcproj
--- opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/glew.vcproj	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/glew.vcproj	2018-01-05 01:38:27.000000000 +0000
@@ -82,6 +82,69 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\glew-1.7.0\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GLEW_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
@@ -145,7 +208,133 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\glew-1.7.0\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GLEW_STATIC"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\glew-1.7.0\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GLEW_STATIC"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|x64"
 			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -208,7 +397,70 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Release_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\glew-1.7.0\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GLEW_STATIC"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|x64"
 			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/lcms.vcproj opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/lcms.vcproj
--- opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/lcms.vcproj	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/lcms.vcproj	2018-01-05 01:38:27.000000000 +0000
@@ -82,6 +82,69 @@
 			/>
 		</Configuration>
 		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\lcms2-2.1\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
 			Name="Release|Win32"
 			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
@@ -145,7 +208,133 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
+			Name="Release|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\lcms2-2.1\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\lcms2-2.1\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|x64"
 			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
@@ -208,7 +397,70 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
+			Name="Release_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\lcms2-2.1\include&quot;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|x64"
 			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/tinyxml.vcproj opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/tinyxml.vcproj
--- opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/tinyxml.vcproj	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/tinyxml.vcproj	2018-01-05 01:38:27.000000000 +0000
@@ -271,6 +271,258 @@
 				Name="VCPostBuildEventTool"
 			/>
 		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\tinyxml"
+				PreprocessorDefinitions="TIXML_USE_STL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\tinyxml"
+				PreprocessorDefinitions="TIXML_USE_STL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\tinyxml"
+				PreprocessorDefinitions="NDEBUG;TIXML_USE_STL"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\..\ext\tinyxml"
+				PreprocessorDefinitions="NDEBUG;TIXML_USE_STL"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
 	</Configurations>
 	<References>
 	</References>
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/yaml.vcproj opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/yaml.vcproj
--- opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/ext/yaml.vcproj	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/ext/yaml.vcproj	2018-01-05 01:38:27.000000000 +0000
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -106,7 +106,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
 				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -169,7 +169,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -232,7 +232,255 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp\include&quot;"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="&quot;..\..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;..\..\..\..\..\ext\boost_1_48_0"
 				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -277,115 +525,119 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\aliasmanager.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\binary.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\convert.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\binary.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\directives.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\conversion.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emit.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\directives.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emitfromevents.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\emitfromevents.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emitter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\emitter.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emitterstate.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\emitterstate.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emitterutils.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\emitterutils.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\exp.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\exp.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\contrib\graphbuilder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\contrib\graphbuilder.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\contrib\graphbuilderadapter.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\contrib\graphbuilderadapter.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\memory.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\contrib\graphbuilderadapter.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\node.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\iterator.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\node_data.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\node.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\nodebuilder.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\nodebuilder.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\nodeevents.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\nodeownership.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\null.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\null.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\ostream_wrapper.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\ostream.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\parse.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\parser.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\parser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\regex.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\regex.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scanner.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scanner.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scanscalar.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scanscalar.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scantag.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scantag.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scantoken.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scantoken.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\simplekey.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\simplekey.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\singledocparser.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\singledocparser.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\stream.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\stream.cpp"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\tag.cpp"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\tag.cpp"
 				>
 			</File>
 		</Filter>
@@ -395,199 +647,95 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\aliasmanager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\anchor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\contrib\anchordict.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\collectionstack.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\conversion.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\directives.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\dll.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\emitfromevents.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\emitter.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\emittermanip.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\emitterstate.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\emitterutils.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\eventhandler.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\exceptions.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\exp.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\contrib\graphbuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\indentation.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\iterator.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\iterpriv.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\ltnode.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\mark.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\node.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\nodebuilder.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\nodeimpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\nodeownership.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\nodereadimpl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\nodeutil.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\collectionstack.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\noncopyable.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\directives.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\null.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emitterstate.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\ostream.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\emitterutils.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\parser.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\exp.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\ptr_stack.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\contrib\graphbuilderadapter.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\ptr_vector.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\indentation.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\regex.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\nodebuilder.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\regeximpl.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\nodeevents.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scanner.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\ptr_stack.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scanscalar.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\ptr_vector.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\scantag.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\regex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\setting.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\regeximpl.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\singledocparser.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scanner.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\stlemitter.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scanscalar.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\stlnode.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\scantag.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\stream.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\setting.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\streamcharsource.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\singledocparser.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\stringsource.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\stream.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\tag.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\streamcharsource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\src\token.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\stringsource.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\traits.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\tag.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\..\ext\yaml-cpp\include\yaml-cpp\yaml.h"
+				RelativePath="..\..\..\..\..\ext\yaml-cpp-0.5.1\src\token.h"
 				>
 			</File>
 		</Filter>
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/OpenColorABI.h opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/OpenColorABI.h
--- opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/OpenColorABI.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/OpenColorABI.h	2018-01-05 01:38:27.000000000 +0000
@@ -32,7 +32,7 @@
 // Makefile configuration options
 #define OCIO_NAMESPACE OpenColorIO
 #define OCIO_USE_BOOST_PTR 1
-#define OCIO_VERSION "1.0.7"
+#define OCIO_VERSION "1.0.9"
 #define OCIO_VERSION_NS v1
 
 /* Version as a single 4-byte hex number, e.g. 0x01050200 == 1.5.2
@@ -42,7 +42,7 @@
    */
 #define OCIO_VERSION_HEX ((1 << 24) | \
                           (0 << 16) | \
-                          (7 <<  8))
+                          (9 <<  8))
 
 
 // Namespace / version mojo
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/OpenColorIO.vcproj opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/OpenColorIO.vcproj
--- opencolorio-1.0.9~dfsg0/src/aftereffects/vc/vc9/OpenColorIO.vcproj	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/vc/vc9/OpenColorIO.vcproj	2018-01-05 01:38:27.000000000 +0000
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp\include&quot;;.\"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
 				PreprocessorDefinitions="TIXML_USE_STL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -107,7 +107,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp\include&quot;;.\"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
 				PreprocessorDefinitions="TIXML_USE_STL"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -171,7 +171,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp\include&quot;;.\"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
 				PreprocessorDefinitions="NDEBUG;TIXML_USE_STL"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -235,7 +235,259 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp\include&quot;;.\"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
+				PreprocessorDefinitions="NDEBUG;TIXML_USE_STL"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
+				PreprocessorDefinitions="TIXML_USE_STL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug_4ByteStruct|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
+				PreprocessorDefinitions="TIXML_USE_STL"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
+				PreprocessorDefinitions="NDEBUG;TIXML_USE_STL"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release_4ByteStruct|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="4"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				TargetEnvironment="3"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..\..\..\export;..\..\..\..\src\core;..\..\..\..\ext\boost_1_48_0;..\..\..\..\ext\tinyxml;&quot;..\..\..\..\ext\yaml-cpp-0.5.1\include&quot;;.\"
 				PreprocessorDefinitions="NDEBUG;TIXML_USE_STL"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -317,6 +569,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\core\Display.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\core\DisplayTransform.cpp"
 				>
 			</File>
@@ -345,6 +601,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\core\FileFormatCDL.cpp"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\core\FileFormatCSP.cpp"
 				>
 			</File>
@@ -531,6 +791,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\core\Display.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\..\src\core\ExponentOps.h"
 				>
 			</File>
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/win/OpenColorIO_AE_Dialogs_Win.cpp opencolorio-1.1.0~dfsg0/src/aftereffects/win/OpenColorIO_AE_Dialogs_Win.cpp
--- opencolorio-1.0.9~dfsg0/src/aftereffects/win/OpenColorIO_AE_Dialogs_Win.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/win/OpenColorIO_AE_Dialogs_Win.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -39,7 +39,7 @@
 #include "lcms2.h"
 
 
-HINSTANCE hDllInstance = NULL;
+static HINSTANCE hDllInstance = NULL;
 
 static void AppendString(char *text, int &length, const char *str, int len = -1)
 {
@@ -93,7 +93,7 @@
 
     for(ExtensionMap::const_iterator i = extensions.begin(); i != extensions.end(); i++)
     {
-		std::string extension = i->first;
+        std::string extension = i->first;
         std::string format = i->second;
 
         std::string format_part = format + " (*." + extension + ")";
@@ -133,7 +133,7 @@
     const char *my_lpstrTitle = "Import OCIO";
     const char *my_lpstrDefExt = "ocio";
 
-    char my_lpstrFilter[512];
+    char my_lpstrFilter[1024];
     MakeFilterText(my_lpstrFilter, extensions, true);
 
 
@@ -173,7 +173,7 @@
     const char *my_lpstrTitle = "Export OCIO";
     const char *my_lpstrDefExt = "icc";
 
-    char my_lpstrFilter[256];
+    char my_lpstrFilter[512];
     MakeFilterText(my_lpstrFilter, extensions, false);
 
 
@@ -461,6 +461,176 @@
 }
 
 
+static void
+tokenize(std::vector<std::string> &tokens, 
+         const std::string& str, 
+         std::string delimiters)
+{
+    std::string::size_type lastPos = str.find_first_not_of(delimiters, 0);
+    std::string::size_type pos     = str.find_first_of(delimiters, lastPos);
+
+    while (pos != std::string::npos || lastPos != std::string::npos)
+    {
+        tokens.push_back(str.substr(lastPos, pos - lastPos));
+        lastPos = str.find_first_not_of(delimiters, pos);
+        pos = str.find_first_of(delimiters, lastPos);
+    }
+}
+
+
+bool ColorSpacePopUpMenu(OCIO::ConstConfigRcPtr config, std::string &colorSpace, bool selectRoles, const void *hwnd)
+{
+    HMENU menu = CreatePopupMenu();
+
+    for(int i=0; i < config->getNumColorSpaces(); ++i)
+    {
+        const char *colorSpaceName = config->getColorSpaceNameByIndex(i);
+        
+        OCIO::ConstColorSpaceRcPtr colorSpacePtr = config->getColorSpace(colorSpaceName);
+        
+        const char *family = colorSpacePtr->getFamily();
+        
+        
+        std::string colorSpacePath;
+        
+        if(family == NULL)
+        {
+            colorSpacePath = colorSpaceName;
+        }
+        else
+        {
+            colorSpacePath = std::string(family) + "/" + colorSpaceName;
+        }
+        
+        
+        std::vector<std::string> pathComponents;
+
+        tokenize(pathComponents, colorSpacePath, "/");
+
+
+        
+        HMENU currentMenu = menu;
+        
+        for(int j=0; j < pathComponents.size(); j++)
+        {
+            const std::string &componentName = pathComponents[j];
+            
+            if(j == (pathComponents.size() - 1))
+            {
+                UINT flags = MF_STRING;
+
+                if(componentName == colorSpace)
+                    flags |= MF_CHECKED;
+
+                const BOOL inserted = AppendMenu(currentMenu, flags, i + 1, componentName.c_str());
+
+                assert(inserted);
+            }
+            else
+            {
+                int componentMenuPos = -1;
+
+                for(int k=0; k < GetMenuItemCount(currentMenu) && componentMenuPos < 0; k++)
+                {
+                    CHAR buf[256];
+
+                    const int strLen = GetMenuString(currentMenu, k, buf, 255, MF_BYPOSITION);
+
+                    assert(strLen > 0);
+
+                    if(componentName == buf)
+                        componentMenuPos = k;
+                }
+
+                if(componentMenuPos < 0)
+                {
+                    HMENU subMenu = CreateMenu();
+                    
+                    const BOOL inserted = AppendMenu(currentMenu, MF_STRING | MF_POPUP, (UINT_PTR)subMenu, componentName.c_str());
+
+                    assert(inserted);
+
+                    componentMenuPos = (GetMenuItemCount(currentMenu) - 1);
+                }
+                
+                currentMenu = GetSubMenu(currentMenu, componentMenuPos);
+            }
+        }
+    }
+    
+    
+    if(config->getNumRoles() > 0)
+    {
+        HMENU rolesMenu = CreatePopupMenu();
+
+        const BOOL rolesInserted = InsertMenu(menu, 0, MF_STRING | MF_BYPOSITION | MF_POPUP, (UINT_PTR)rolesMenu, "Roles");
+
+        assert(rolesInserted);
+        
+        for(int i=0; i < config->getNumRoles(); i++)
+        {
+            const std::string roleName = config->getRoleName(i);
+            
+            OCIO::ConstColorSpaceRcPtr colorSpacePtr = config->getColorSpace(roleName.c_str());
+            
+            const std::string colorSpaceName = colorSpacePtr->getName();
+            
+            int colorSpaceIndex = -1;
+
+            for(int k=0; k < config->getNumColorSpaces() && colorSpaceIndex < 0; k++)
+            {
+                const std::string colorSpaceName2 = config->getColorSpaceNameByIndex(k);
+
+                if(colorSpaceName2 == colorSpaceName)
+                    colorSpaceIndex = k;
+            }
+
+            HMENU roleSubmenu = CreatePopupMenu();
+            
+            UINT roleFlags = MF_STRING | MF_POPUP;
+
+            if(selectRoles && roleName == colorSpace)
+                roleFlags |= MF_CHECKED;
+
+            const BOOL roleInserted = AppendMenu(rolesMenu, roleFlags, (UINT_PTR)roleSubmenu, roleName.c_str());
+
+            assert(roleInserted);
+            
+            UINT colorSpaceFlags = MF_STRING;
+
+            if(colorSpaceName == colorSpace)
+                colorSpaceFlags |= MF_CHECKED;
+
+            const BOOL colorSpaceInsterted = AppendMenu(roleSubmenu, colorSpaceFlags, colorSpaceIndex + 1, colorSpaceName.c_str());
+
+            assert(colorSpaceInsterted);
+        }
+        
+        const BOOL dividerInserted = InsertMenu(menu, 1, MF_STRING | MF_BYPOSITION | MF_SEPARATOR, 0, "Sep");
+
+        assert(dividerInserted);
+    }
+
+    POINT pos;
+    GetCursorPos(&pos);
+
+    int result = TrackPopupMenuEx(menu,
+                        (TPM_NONOTIFY | TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD),
+                        pos.x, pos.y, (HWND)hwnd, NULL);
+
+    DestroyMenu(menu);
+
+    if(result > 0)
+    {
+        colorSpace = config->getColorSpaceNameByIndex(result - 1);
+
+        return true;
+    }
+    else
+        return false;
+}
+
+
 void GetStdConfigs(ConfigVec &configs)
 {
     char appdata_path[MAX_PATH];
@@ -554,7 +724,12 @@
     MessageBox((HWND)hwnd, message, "OpenColorIO", MB_OK);
 }
 
-
+#ifdef SUPPLY_HINSTANCE
+void SetHInstance(void *hInstance)
+{
+    hDllInstance = (HINSTANCE)hInstance;
+}
+#else
 BOOL WINAPI DllMain(HANDLE hInstance, DWORD fdwReason, LPVOID lpReserved)
 {
     if (fdwReason == DLL_PROCESS_ATTACH)
@@ -562,3 +737,4 @@
 
     return TRUE;
 }
+#endif
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/win/OpenColorIO_AE_GL_Win.cpp opencolorio-1.1.0~dfsg0/src/aftereffects/win/OpenColorIO_AE_GL_Win.cpp
--- opencolorio-1.0.9~dfsg0/src/aftereffects/win/OpenColorIO_AE_GL_Win.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/win/OpenColorIO_AE_GL_Win.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -36,7 +36,7 @@
 static HWND         g_win = NULL;
 static HDC          g_hdc = NULL;
 static HGLRC        g_context = NULL;
-static GLuint       g_framebuffer;
+static GLuint       g_framebuffer = GL_INVALID_VALUE;
 
 
 static bool HaveRequiredExtensions()
@@ -193,14 +193,18 @@
 
 void GlobalSetdown_GL()
 {
+    if(g_framebuffer != GL_INVALID_VALUE)
+    {
+        glDeleteFramebuffersEXT(1, &g_framebuffer);
+        g_framebuffer = GL_INVALID_VALUE;
+    }
+    
     if(g_context)
     {
         wglDeleteContext(g_context);
         g_context = NULL;
-        
-        glDeleteFramebuffersEXT(1, &g_framebuffer);
     }
-    
+
     if(g_win)
     {
         ReleaseDC(g_win, g_hdc);
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/xcode/OpenColorABI.h opencolorio-1.1.0~dfsg0/src/aftereffects/xcode/OpenColorABI.h
--- opencolorio-1.0.9~dfsg0/src/aftereffects/xcode/OpenColorABI.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/xcode/OpenColorABI.h	2018-01-05 01:38:27.000000000 +0000
@@ -32,7 +32,7 @@
 // Makefile configuration options
 #define OCIO_NAMESPACE OpenColorIO
 #define OCIO_USE_BOOST_PTR 0
-#define OCIO_VERSION "1.0.7"
+#define OCIO_VERSION "1.0.9"
 #define OCIO_VERSION_NS v1
 
 /* Version as a single 4-byte hex number, e.g. 0x01050200 == 1.5.2
@@ -42,7 +42,7 @@
    */
 #define OCIO_VERSION_HEX ((1 << 24) | \
                           (0 << 16) | \
-                          (7 <<  8))
+                          (9 <<  8))
 
 
 // Namespace / version mojo
diff -Nru opencolorio-1.0.9~dfsg0/src/aftereffects/xcode/OpenColorIO.xcodeproj/project.pbxproj opencolorio-1.1.0~dfsg0/src/aftereffects/xcode/OpenColorIO.xcodeproj/project.pbxproj
--- opencolorio-1.0.9~dfsg0/src/aftereffects/xcode/OpenColorIO.xcodeproj/project.pbxproj	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/aftereffects/xcode/OpenColorIO.xcodeproj/project.pbxproj	2018-01-05 01:38:27.000000000 +0000
@@ -13,6 +13,9 @@
 		2A7CACBE15536CD700F52C98 /* NoOps.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A7CACB815536CD700F52C98 /* NoOps.cpp */; };
 		2A7CACBF15536CD700F52C98 /* NoOps.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A7CACB915536CD700F52C98 /* NoOps.h */; };
 		2A7CACC015536CD700F52C98 /* OpOptimizers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A7CACBA15536CD700F52C98 /* OpOptimizers.cpp */; };
+		2A7F20D31E2F17D2003428D7 /* FileFormatCDL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F20D21E2F17D2003428D7 /* FileFormatCDL.cpp */; };
+		2ACB3D001CC074A200134356 /* Display.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACB3CFE1CC074A200134356 /* Display.cpp */; };
+		2ACB3D011CC074A200134356 /* Display.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ACB3CFF1CC074A200134356 /* Display.h */; };
 		2ACF56CC14776A1E00991ED5 /* AllocationOp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACF567614776A1E00991ED5 /* AllocationOp.cpp */; };
 		2ACF56CD14776A1E00991ED5 /* AllocationOp.h in Headers */ = {isa = PBXBuildFile; fileRef = 2ACF567714776A1E00991ED5 /* AllocationOp.h */; };
 		2ACF56CE14776A1E00991ED5 /* AllocationTransform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2ACF567814776A1E00991ED5 /* AllocationTransform.cpp */; };
@@ -106,6 +109,9 @@
 		2A7CACB815536CD700F52C98 /* NoOps.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NoOps.cpp; sourceTree = "<group>"; };
 		2A7CACB915536CD700F52C98 /* NoOps.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoOps.h; sourceTree = "<group>"; };
 		2A7CACBA15536CD700F52C98 /* OpOptimizers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OpOptimizers.cpp; sourceTree = "<group>"; };
+		2A7F20D21E2F17D2003428D7 /* FileFormatCDL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileFormatCDL.cpp; sourceTree = "<group>"; };
+		2ACB3CFE1CC074A200134356 /* Display.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Display.cpp; sourceTree = "<group>"; };
+		2ACB3CFF1CC074A200134356 /* Display.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Display.h; sourceTree = "<group>"; };
 		2ACF567114776A0A00991ED5 /* libOpenColorIO.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libOpenColorIO.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		2ACF567614776A1E00991ED5 /* AllocationOp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AllocationOp.cpp; sourceTree = "<group>"; };
 		2ACF567714776A1E00991ED5 /* AllocationOp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllocationOp.h; sourceTree = "<group>"; };
@@ -225,6 +231,8 @@
 		2ACF567514776A1E00991ED5 /* core */ = {
 			isa = PBXGroup;
 			children = (
+				2ACB3CFE1CC074A200134356 /* Display.cpp */,
+				2ACB3CFF1CC074A200134356 /* Display.h */,
 				2ACF567614776A1E00991ED5 /* AllocationOp.cpp */,
 				2ACF567714776A1E00991ED5 /* AllocationOp.h */,
 				2ACF567814776A1E00991ED5 /* AllocationTransform.cpp */,
@@ -244,6 +252,7 @@
 				2ACF568614776A1E00991ED5 /* FileFormat3DL.cpp */,
 				2ACF568714776A1E00991ED5 /* FileFormatCC.cpp */,
 				2ACF568814776A1E00991ED5 /* FileFormatCCC.cpp */,
+				2A7F20D21E2F17D2003428D7 /* FileFormatCDL.cpp */,
 				2ACF568914776A1E00991ED5 /* FileFormatCSP.cpp */,
 				2ACF568A14776A1E00991ED5 /* FileFormatHDL.cpp */,
 				2ACF568B14776A1E00991ED5 /* FileFormatIridasCube.cpp */,
@@ -373,6 +382,7 @@
 				2ACF573F14776B7000991ED5 /* OpenColorABI.h in Headers */,
 				2A7CACBD15536CD700F52C98 /* LookParse.h in Headers */,
 				2A7CACBF15536CD700F52C98 /* NoOps.h in Headers */,
+				2ACB3D011CC074A200134356 /* Display.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -485,6 +495,8 @@
 				2A7CACBC15536CD700F52C98 /* LookParse.cpp in Sources */,
 				2A7CACBE15536CD700F52C98 /* NoOps.cpp in Sources */,
 				2A7CACC015536CD700F52C98 /* OpOptimizers.cpp in Sources */,
+				2ACB3D001CC074A200134356 /* Display.cpp in Sources */,
+				2A7F20D31E2F17D2003428D7 /* FileFormatCDL.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -497,7 +509,10 @@
 				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = TIXML_USE_STL;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					TIXML_USE_STL,
+					OLDYAML,
+				);
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
@@ -519,6 +534,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					NDEBUG,
 					TIXML_USE_STL,
+					OLDYAML,
 				);
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociobakelut/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/apps/ociobakelut/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/apps/ociobakelut/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociobakelut/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -5,19 +5,28 @@
     FIND_PACKAGE_MESSAGE(LCMS "Found lcms: ${LCMS_LIBRARIES}"
         "${LCMS_INCLUDE_DIR}")
 else()
+    find_package(Git)
+    if(NOT GIT_EXECUTABLE)
+        message("Git not found, could not build external LCMS as we cannot apply patch")
+    endif()
     message(STATUS "Using bundled lcms.")
     set(LCMS_VERSION 2.1)
     set(LCMS_BUNDLED TRUE)
+    if(CMAKE_TOOLCHAIN_FILE)
+        set(LCMS_CMAKE_ARGS ${LCMS_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
+    endif()
+    set(LCMS_INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/dist)
     ExternalProject_Add(LCMS
-        URL ${CMAKE_SOURCE_DIR}/ext/lcms2-${LCMS_VERSION}.tar.gz
-        BUILD_IN_SOURCE 1
-        CONFIGURE_COMMAND ./configure --prefix=${PROJECT_BINARY_DIR}/ext/dist --without-jpeg --without-tiff --without-zlib
-        BUILD_COMMAND make
-        INSTALL_COMMAND make install
+        PREFIX         ${CMAKE_BINARY_DIR}/lcms2-prefix
+        URL            ${CMAKE_SOURCE_DIR}/ext/lcms2-${LCMS_VERSION}.tar.gz
+        PATCH_COMMAND  ${GIT_EXECUTABLE} apply ${CMAKE_SOURCE_DIR}/ext/lcms2-${LCMS_VERSION}.patch
+        BINARY_DIR     ${CMAKE_BINARY_DIR}/ext/build/lcms2
+        INSTALL_DIR    ${LCMS_INSTALL_DIR}
+        CMAKE_ARGS     ${LCMS_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=${LCMS_INSTALL_DIR} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
     )
-    set(LCMS_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
-    set(LCMS_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
-    set(LCMS_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/liblcms2.a)
+    set(LCMS_INCLUDE_DIRS 	${PROJECT_BINARY_DIR}/ext/dist/include)
+    set(LCMS_LIBRARY_DIRS 	${PROJECT_BINARY_DIR}/ext/dist/lib)
+    set(LCMS_LIBRARIES 		${PROJECT_BINARY_DIR}/ext/dist/lib/${CMAKE_STATIC_LIBRARY_PREFIX}lcms2${CMAKE_STATIC_LIBRARY_SUFFIX})
 endif()
 
 file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
@@ -27,6 +36,7 @@
     ${CMAKE_BINARY_DIR}/export/
     ${CMAKE_SOURCE_DIR}/src/apps/share/
     ${LCMS_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIR}
 )
 
 link_directories(
@@ -35,12 +45,13 @@
 
 add_executable(ociobakelut ${share_src_files} main.cpp ocioicc.cpp)
 
+set_target_properties(ociobakelut PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+
 if(LCMS_BUNDLED)
     add_dependencies(ociobakelut LCMS)
 endif()
 
-target_link_libraries(ociobakelut
-                      ${LCMS_LIBRARIES}
-                      OpenColorIO)
+target_link_libraries(ociobakelut ${LCMS_LIBRARIES})
+target_link_OCIO(ociobakelut)
 
-install(TARGETS ociobakelut DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
+install(TARGETS ociobakelut EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociobakelut/main.cpp opencolorio-1.1.0~dfsg0/src/apps/ociobakelut/main.cpp
--- opencolorio-1.0.9~dfsg0/src/apps/ociobakelut/main.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociobakelut/main.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -96,6 +96,7 @@
                "usage:  ociobakelut [options] <OUTPUTFILE.LUT>\n\n"
                "example:  ociobakelut --inputspace lg10 --outputspace srgb8 --format flame lg_to_srgb.3dl\n"
                "example:  ociobakelut --lut filmlut.3dl --lut calibration.3dl --format flame display.3dl\n"
+               "example:  ociobakelut --cccid 0 --lut cdlgrade.ccc --lut calibration.3dl --format flame graded_display.3dl\n"
                "example:  ociobakelut --lut look.3dl --offset 0.01 -0.02 0.03 --lut display.3dl --format flame display_with_look.3dl\n"
                "example:  ociobakelut --inputspace lg10 --outputspace srgb8 --format icc ~/Library/ColorSync/Profiles/test.icc\n"
                "example:  ociobakelut --lut filmlut.3dl --lut calibration.3dl --format icc ~/Library/ColorSync/Profiles/test.icc\n\n",
@@ -108,6 +109,7 @@
                "--iconfig %s", &inputconfig, "Input .ocio configuration file (default: $OCIO)\n",
                "<SEPARATOR>", "Config-Free LUT Baking",
                "<SEPARATOR>", "    (all options can be specified multiple times, each is applied in order)",
+               "--cccid %s", &dummystr, "Specify a CCCId for any following luts",
                "--lut %s", &dummystr, "Specify a LUT (forward direction)",
                "--invlut %s", &dummystr, "Specify a LUT (inverse direction)",
                "--slope %f %f %f", &dummyf1, &dummyf2, &dummyf3, "slope",
@@ -412,6 +414,9 @@
 parse_luts(int argc, const char *argv[])
 {
     OCIO::GroupTransformRcPtr groupTransform = OCIO::GroupTransform::Create();
+    const char *lastCCCId = NULL; // Ugly to use this but using GroupTransform::getTransform()
+                                  // returns a const object so we must set this
+                                  // prior to using --lut for now.
     
     for(int i=0; i<argc; ++i)
     {
@@ -427,10 +432,25 @@
             OCIO::FileTransformRcPtr t = OCIO::FileTransform::Create();
             t->setSrc(argv[i+1]);
             t->setInterpolation(OCIO::INTERP_BEST);
+            if (lastCCCId)
+            {
+                t->setCCCId(lastCCCId);
+            }
             groupTransform->push_back(t);
             
             i += 1;
         }
+        else if(arg == "--cccid" || arg == "-cccid")
+        {
+            if(i+1>=argc)
+            {
+                throw OCIO::Exception("Error parsing --cccid. Invalid num args");
+            }
+            
+            lastCCCId = argv[i+1];
+            
+            i += 1;
+        }
         else if(arg == "--invlut" || arg == "-invlut")
         {
             if(i+1>=argc)
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociobakelut/ocioicc.cpp opencolorio-1.1.0~dfsg0/src/apps/ociobakelut/ocioicc.cpp
--- opencolorio-1.0.9~dfsg0/src/apps/ociobakelut/ocioicc.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociobakelut/ocioicc.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -32,6 +32,7 @@
 #include <iostream>
 #include <sstream>
 #include <vector>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociocheck/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/apps/ociocheck/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/apps/ociocheck/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociocheck/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -4,14 +4,15 @@
     ${CMAKE_SOURCE_DIR}/export/
     ${CMAKE_BINARY_DIR}/export/
     ${CMAKE_SOURCE_DIR}/src/apps/share/
+    ${Boost_INCLUDE_DIR}
     )
 
 add_executable(ociocheck
     main.cpp
     ${share_src_files})
 
-target_link_libraries(ociocheck
-    OpenColorIO
-    )
+set_target_properties(ociocheck PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+
+target_link_OCIO(ociocheck)
 
-install(TARGETS ociocheck DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
+install(TARGETS ociocheck EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ocioconvert/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/apps/ocioconvert/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/apps/ocioconvert/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ocioconvert/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -4,13 +4,18 @@
         ${CMAKE_BINARY_DIR}/export/
         ${CMAKE_SOURCE_DIR}/src/apps/share/
         ${OIIO_INCLUDES}
+        ${ILMBASE_INCLUDES}
     )
     
     file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
     
     add_executable(ocioconvert ${share_src_files} main.cpp)
     
-    target_link_libraries(ocioconvert ${OIIO_LIBRARIES} OpenColorIO ${CMAKE_DL_LIBS})
+    set_target_properties(ocioconvert PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+
+    target_link_libraries(ocioconvert ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS})
     
-    install(TARGETS ocioconvert DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
+    target_link_OCIO(ocioconvert)
+    
+    install(TARGETS ocioconvert EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
 endif()
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociodisplay/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/apps/ociodisplay/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/apps/ociodisplay/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociodisplay/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -1,11 +1,20 @@
-include_directories(
-    ${CMAKE_SOURCE_DIR}/export/
-    ${CMAKE_BINARY_DIR}/export/
-    ${OPENGL_INCLUDE_DIR}
-    ${OIIO_INCLUDES}
-    ${GLEW_INCLUDES}
-)
-add_executable(ociodisplay main.cpp)
-# set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} )
-target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES} OpenColorIO)
-install(TARGETS ociodisplay DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
+if (OIIO_FOUND)
+    include_directories(
+        ${CMAKE_SOURCE_DIR}/export/
+        ${CMAKE_BINARY_DIR}/export/
+        ${OPENGL_INCLUDE_DIR}
+        ${OIIO_INCLUDES}
+        ${ILMBASE_INCLUDES}
+        ${GLEW_INCLUDES}
+    	${GLUT_INCLUDE_DIR}
+    )
+
+    add_executable(ociodisplay main.cpp)
+
+    # set_target_properties(ociodisplay PROPERTIES INSTALL_RPATH ${OIIO_LIBRARIES} )
+    set_target_properties(ociodisplay PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+    target_link_libraries(ociodisplay ${GLEW_LIBRARIES} ${GLUT_LIBRARY} ${OPENGL_LIBRARY} ${OIIO_LIBRARIES})
+    target_link_OCIO(ociodisplay)
+
+    install(TARGETS ociodisplay EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
+endif()
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociodisplay/main.cpp opencolorio-1.1.0~dfsg0/src/apps/ociodisplay/main.cpp
--- opencolorio-1.0.9~dfsg0/src/apps/ociodisplay/main.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociodisplay/main.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -36,10 +36,22 @@
 #include <sstream>
 #include <vector>
 
+#include <OpenColorIO/OpenColorIO.h>
+namespace OCIO = OCIO_NAMESPACE;
+
+#include <OpenImageIO/imageio.h>
+#include <OpenImageIO/typedesc.h>
+#if (OIIO_VERSION < 10100)
+namespace OIIO = OIIO_NAMESPACE;
+#endif
+
 #ifdef __APPLE__
 #include <OpenGL/gl.h>
 #include <OpenGL/glext.h>
 #include <GLUT/glut.h>
+#elif _WIN32
+#include <GL/glew.h>
+#include <GL/glut.h>
 #else
 #include <GL/glew.h>
 #include <GL/gl.h>
@@ -47,14 +59,10 @@
 #include <GL/glut.h>
 #endif
 
-#include <OpenColorIO/OpenColorIO.h>
-namespace OCIO = OCIO_NAMESPACE;
 
-#include <OpenImageIO/imageio.h>
-#include <OpenImageIO/typedesc.h>
-#if (OIIO_VERSION < 10100)
-namespace OIIO = OIIO_NAMESPACE;
-#endif
+bool g_verbose = false;
+std::string g_filename;
+
 
 GLint g_win = 0;
 int g_winWidth = 0;
@@ -75,6 +83,7 @@
 std::string g_inputColorSpace;
 std::string g_display;
 std::string g_transformName;
+std::string g_look;
 
 float g_exposure_fstop = 0.0f;
 float g_display_gamma = 1.0f;
@@ -92,7 +101,7 @@
     int texHeight = 512;
     int components = 4;
     
-    if(filename)
+    if(filename && *filename)
     {
         std::cout << "loading: " << filename << std::endl;
         try
@@ -117,12 +126,18 @@
             texWidth = spec.width;
             texHeight = spec.height;
             components = spec.nchannels;
-            
+
             img.resize(texWidth*texHeight*components);
             memset(&img[0], 0, texWidth*texHeight*components*sizeof(float));
-            
-            f->read_image(OIIO::TypeDesc::TypeFloat, &img[0]);
-            delete f;
+
+            f->read_image(
+#if (OIIO_VERSION >= 10800)
+                OIIO::TypeFloat, 
+#else
+                OIIO::TypeDesc::TypeFloat, 
+#endif
+                &img[0]);
+            OIIO::ImageInput::destroy(f);
         }
         catch(...)
         {
@@ -182,9 +197,10 @@
     OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
     g_display = config->getDefaultDisplay();
     g_transformName = config->getDefaultView(g_display.c_str());
+    g_look = config->getDisplayLooks(g_display.c_str(), g_transformName.c_str());
     
     g_inputColorSpace = OCIO::ROLE_SCENE_LINEAR;
-    if(filename)
+    if(filename && *filename)
     {
         std::string cs = config->parseColorSpaceFromString(filename);
         if(!cs.empty())
@@ -194,7 +210,8 @@
         }
         else
         {
-            std::cout << "colorspace: " << g_inputColorSpace << " \t(could not determine from filename, using default)" << std::endl;
+            std::cout << "colorspace: " << g_inputColorSpace 
+                << " \t(could not determine from filename, using default)" << std::endl;
         }
     }
 }
@@ -472,6 +489,26 @@
     transform->setInputColorSpaceName( g_inputColorSpace.c_str() );
     transform->setDisplay( g_display.c_str() );
     transform->setView( g_transformName.c_str() );
+    transform->setLooksOverride( g_look.c_str() );
+
+    if(g_verbose)
+    {
+        std::cout << std::endl;
+        std::cout << "Color transformation composed of:" << std::endl;
+        std::cout << "      Image ColorSpace is:\t" << g_inputColorSpace << std::endl;
+        std::cout << "      Transform is:\t\t" << g_transformName << std::endl;
+        std::cout << "      Device is:\t\t" << g_display << std::endl;
+        std::cout << "      Looks Override is:\t'" << g_look << "'" << std::endl;
+        std::cout << "  with:" << std::endl;
+        std::cout << "    exposure_fstop = " << g_exposure_fstop << std::endl;
+        std::cout << "    display_gamma  = " << g_display_gamma << std::endl;
+        std::cout << "    channels       = " 
+                  << (g_channelHot[0] ? "R" : "")
+                  << (g_channelHot[1] ? "G" : "")
+                  << (g_channelHot[2] ? "B" : "")
+                  << (g_channelHot[3] ? "A" : "") << std::endl;
+
+    }
     
     // Add optional transforms to create a full-featured, "canonical" display pipeline
     // Fstop exposure control (in SCENE_LINEAR)
@@ -598,7 +635,9 @@
     {
         g_transformName = config->getDefaultView(g_display.c_str());
     }
-    
+
+    g_look = config->getDisplayLooks(g_display.c_str(), g_transformName.c_str());
+
     UpdateOCIOGLState();
     glutPostRedisplay();
 }
@@ -611,20 +650,65 @@
     if(!transform) return;
     
     g_transformName = transform;
+
+    g_look = config->getDisplayLooks(g_display.c_str(), g_transformName.c_str());
     
     UpdateOCIOGLState();
     glutPostRedisplay();
 }
 
-static void PopulateOCIOMenus()
+void look_CB(int id)
 {
     OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
     
+    const char * look = config->getLookNameByIndex(id);
+    if(!look || !*look) return;
+    
+    g_look = look;
+    
+    UpdateOCIOGLState();
+    glutPostRedisplay();
+}
+
+static void PopulateOCIOMenus()
+{
+    OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
     
     int csMenuID = glutCreateMenu(imageColorSpace_CB);
+
+    std::map<std::string, int> families;
     for(int i=0; i<config->getNumColorSpaces(); ++i)
     {
-        glutAddMenuEntry(config->getColorSpaceNameByIndex(i), i);
+        const char * csName = config->getColorSpaceNameByIndex(i);
+        if(csName && *csName)
+        {
+            OCIO::ConstColorSpaceRcPtr cs = config->getColorSpace(csName);
+            if(cs)
+            {
+                const char * family = cs->getFamily();
+                if(family && *family)
+                {
+                    if(families.find(family)==families.end())
+                    {
+                        families[family] = glutCreateMenu(imageColorSpace_CB);
+                        glutAddMenuEntry(csName, i);
+
+                        glutSetMenu(csMenuID);
+                        glutAddSubMenu(family, families[family]);
+                    }
+                    else
+                    {
+                        glutSetMenu(families[family]);
+                        glutAddMenuEntry(csName, i);
+                    }
+                }
+                else
+                {
+                    glutSetMenu(csMenuID);
+                    glutAddMenuEntry(csName, i);
+                }
+            }
+        }
     }
     
     int deviceMenuID = glutCreateMenu(displayDevice_CB);
@@ -640,10 +724,17 @@
         glutAddMenuEntry(config->getView(defaultDisplay, i), i);
     }
     
+    int lookMenuID = glutCreateMenu(look_CB);
+    for(int i=0; i<config->getNumLooks(); ++i)
+    {
+        glutAddMenuEntry(config->getLookNameByIndex(i), i);
+    }
+    
     glutCreateMenu(menuCallback);
     glutAddSubMenu("Image ColorSpace", csMenuID);
     glutAddSubMenu("Transform", transformMenuID);
     glutAddSubMenu("Device", deviceMenuID);
+    glutAddSubMenu("Looks Override", lookMenuID);
     
     glutAttachMenu(GLUT_RIGHT_BUTTON);
 }
@@ -665,10 +756,59 @@
 "\tA:   View Alpha\n"
 "\tL:   View Luma\n"
 "\n"
-"\tRight-Mouse Button:   Configure Display / Transform / ColorSpace\n"
+"\tRight-Mouse Button:   Configure Display / Transform / ColorSpace / Looks\n"
 "\n"
 "\tEsc: Quit\n";
 
+void parseArguments(int argc, char **argv)
+{
+    for(int i=1; i<argc; ++i)
+    {
+        if(0==strcmp(argv[i], "-v"))
+        {
+            g_verbose = true;
+        }
+        else if(0==strcmp(argv[i], "-h"))
+        {
+            std::cout << std::endl;
+            std::cout << "help:" << std::endl;
+            std::cout << "  ociodisplay [OPTIONS] [image]  where" << std::endl;
+            std::cout << std::endl;
+            std::cout << "  OPTIONS:" << std::endl;
+            std::cout << "     -h :  displays the help and exit" << std::endl;
+            std::cout << "     -v :  displays the color space information" << std::endl;
+            std::cout << std::endl;
+            exit(0);
+        }
+        else
+        {
+            g_filename = argv[i];
+        }
+    }
+
+    if(g_verbose)
+    {
+        std::cout << std::endl;
+        if(!g_filename.empty())
+        {
+            std::cout << "Image:" << std::endl
+                      << "\t" << g_filename << std::endl;
+        }
+        std::cout << std::endl;
+        std::cout << "OIIO: " << std::endl
+                  << "\tversion       = " << OIIO_VERSION_STRING << std::endl;
+        std::cout << std::endl;
+        std::cout << "OCIO: " << std::endl
+                  << "\tversion       = " << OCIO::GetVersion() << std::endl;
+        if(getenv("OCIO"))
+        {
+            std::cout << "\tconfiguration = " << getenv("OCIO") << std::endl;
+            OCIO::ConstConfigRcPtr config = OCIO::GetCurrentConfig();
+            std::cout << "\tsearch_path   = " << config->getSearchPath() << std::endl;
+        }
+    }
+}
+
 int main(int argc, char **argv)
 {
     glutInit(&argc, argv);
@@ -676,6 +816,8 @@
     glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
     glutInitWindowSize(512, 512);
     glutInitWindowPosition (100, 100);
+
+    parseArguments(argc, argv);
     
     g_win = glutCreateWindow(argv[0]);
     
@@ -693,19 +835,18 @@
     glutSpecialFunc(SpecialKey);
     glutDisplayFunc(Redisplay);
     
-    const char * filename = 0;
-    if(argc>1) filename = argv[1];
-    
     std::cout << USAGE_TEXT << std::endl;
     
     // TODO: switch profiles based on shading language
-    // std::cout << "GL_SHADING_LANGUAGE_VERSION: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
+    std::cout << "GL_SHADING_LANGUAGE_VERSION: " << glGetString(GL_SHADING_LANGUAGE_VERSION) << std::endl;
+    std::cout << std::endl;
+
     AllocateLut3D();
     
-    InitImageTexture(filename);
+    InitImageTexture(g_filename.c_str());
     try
     {
-        InitOCIO(filename);
+        InitOCIO(g_filename.c_str());
     }
     catch(OCIO::Exception & e)
     {
@@ -727,8 +868,8 @@
         glutIdleFunc(Idle);
     }
     */
-    
+
     glutMainLoop();
-    
+
     return 0;
 }
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/ociolutimage/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/apps/ociolutimage/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/apps/ociolutimage/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/ociolutimage/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -4,13 +4,18 @@
         ${CMAKE_BINARY_DIR}/export/
         ${CMAKE_SOURCE_DIR}/src/apps/share/
         ${OIIO_INCLUDES}
+        ${ILMBASE_INCLUDES}
     )
     
     file(GLOB_RECURSE share_src_files "${CMAKE_SOURCE_DIR}/src/apps/share/*.cpp")
     
     add_executable(ociolutimage ${share_src_files} main.cpp)
     
-    target_link_libraries(ociolutimage ${OIIO_LIBRARIES} OpenColorIO ${CMAKE_DL_LIBS})
+    set_target_properties(ociolutimage PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
+
+    target_link_libraries(ociolutimage ${OIIO_LIBRARIES} ${CMAKE_DL_LIBS})
     
-    install(TARGETS ociolutimage DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
+    target_link_OCIO(ociolutimage)
+    
+    install(TARGETS ociolutimage EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin)
 endif()
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/share/argparse.cpp opencolorio-1.1.0~dfsg0/src/apps/share/argparse.cpp
--- opencolorio-1.0.9~dfsg0/src/apps/share/argparse.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/share/argparse.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -37,6 +37,7 @@
 #include <iostream>
 #include <cstdarg>
 #include <iterator>
+#include <algorithm>
 
 #include "strutil.h"
 #include "argparse.h"
diff -Nru opencolorio-1.0.9~dfsg0/src/apps/share/pystring.cpp opencolorio-1.1.0~dfsg0/src/apps/share/pystring.cpp
--- opencolorio-1.0.9~dfsg0/src/apps/share/pystring.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/apps/share/pystring.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -64,18 +64,18 @@
 
 /* helper macro to fixup start/end slice values */
 #define ADJUST_INDICES(start, end, len)         \
-    if (end > len)                          \
-        end = len;                          \
-    else if (end < 0) {                     \
-        end += len;                         \
-        if (end < 0)                        \
-        end = 0;                        \
-    }                                       \
-    if (start < 0) {                        \
-        start += len;                       \
-        if (start < 0)                      \
-        start = 0;                      \
-    }
+	if (end > len)                          \
+		end = len;                          \
+	else if (end < 0) {                     \
+		end += len;                         \
+		if (end < 0)                        \
+		end = 0;                        \
+	}                                       \
+	if (start < 0) {                        \
+		start += len;                       \
+		if (start < 0)                      \
+		start = 0;                      \
+	}
 
 
 	namespace {
@@ -162,897 +162,919 @@
 	} //anonymous namespace
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void split( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
-    {
-        result.clear();
-
-        if ( maxsplit < 0 ) maxsplit = MAX_32BIT_INT;//result.max_size();
-
-
-        if ( sep.size() == 0 )
-        {
-            split_whitespace( str, result, maxsplit );
-            return;
-        }
-
-        std::string::size_type i,j, len = str.size(), n = sep.size();
-
-        i = j = 0;
-
-        while ( i+n <= len )
-        {
-            if ( str[i] == sep[0] && str.substr( i, n ) == sep )
-            {
-                if ( maxsplit-- <= 0 ) break;
-
-                result.push_back( str.substr( j, i - j ) );
-                i = j = i + n;
-            }
-            else
-            {
-                i++;
-            }
-        }
-
-        result.push_back( str.substr( j, len-j ) );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void rsplit( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
-    {
-        if ( maxsplit < 0 )
-        {
-            split( str, result, sep, 0 );
-            return;
-        }
-
-        result.clear();
-
-        if ( sep.size() == 0 )
-        {
-            rsplit_whitespace( str, result, maxsplit );
-            return;
-        }
-
-        std::string::size_type i,j, len = str.size(), n = sep.size();
-
-        i = j = len;
-
-        while ( i > n )
-        {
-            if ( str[i - 1] == sep[n - 1] && str.substr( i - n, n ) == sep )
-            {
-                if ( maxsplit-- <= 0 ) break;
-
-                result.push_back( str.substr( i, j - i ) );
-                i = j = i - n;
-            }
-            else
-            {
-                i--;
-            }
-        }
-
-        result.push_back( str.substr( 0, j ) );
-        reverse_strings( result );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    #define LEFTSTRIP 0
-    #define RIGHTSTRIP 1
-    #define BOTHSTRIP 2
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string do_strip( const std::string & str, int striptype, const std::string & chars  )
-    {
-        Py_ssize_t len = (Py_ssize_t) str.size(), i, j, charslen = (Py_ssize_t) chars.size();
-
-        if ( charslen == 0 )
-        {
-            i = 0;
-            if ( striptype != RIGHTSTRIP )
-            {
-                while ( i < len && ::isspace( str[i] ) )
-                {
-                    i++;
-                }
-            }
-
-            j = len;
-            if ( striptype != LEFTSTRIP )
-            {
-                do
-                {
-                    j--;
-                }
-                while (j >= i && ::isspace(str[j]));
-
-                j++;
-            }
-
-
-        }
-        else
-        {
-            const char * sep = chars.c_str();
-
-            i = 0;
-            if ( striptype != RIGHTSTRIP )
-            {
-                while ( i < len && memchr(sep, str[i], charslen) )
-                {
-                    i++;
-                }
-            }
-
-            j = len;
-            if (striptype != LEFTSTRIP)
-            {
-                do
-                {
-                    j--;
-                }
-                while (j >= i &&  memchr(sep, str[j], charslen)  );
-                j++;
-            }
-
-
-        }
-
-        if ( i == 0 && j == len )
-        {
-            return str;
-        }
-        else
-        {
-            return str.substr( i, j - i );
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void partition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
-    {
-        result.resize(3);
-        int index = find( str, sep );
-        if ( index < 0 )
-        {
-            result[0] = str;
-            result[1] = "";
-            result[2] = "";
-        }
-        else
-        {
-            result[0] = str.substr( 0, index );
-            result[1] = sep;
-            result[2] = str.substr( index + sep.size(), str.size() );
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void rpartition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
-    {
-        result.resize(3);
-        int index = rfind( str, sep );
-        if ( index < 0 )
-        {
-            result[0] = "";
-            result[1] = "";
-            result[2] = str;
-        }
-        else
-        {
-            result[0] = str.substr( 0, index );
-            result[1] = sep;
-            result[2] = str.substr( index + sep.size(), str.size() );
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string strip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, BOTHSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string lstrip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, LEFTSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string rstrip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, RIGHTSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string join( const std::string & str, const std::vector< std::string > & seq )
-    {
-        std::vector< std::string >::size_type seqlen = seq.size(), i;
-
-        if ( seqlen == 0 ) return "";
-        if ( seqlen == 1 ) return seq[0];
-
-        std::string result( seq[0] );
-
-        for ( i = 1; i < seqlen; ++i )
-        {
-            result += str + seq[i];
-
-        }
-
-
-        return result;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    namespace
-    {
-        /* Matches the end (direction >= 0) or start (direction < 0) of self
-         * against substr, using the start and end arguments. Returns
-         * -1 on error, 0 if not found and 1 if found.
-         */
-        
-        int _string_tailmatch(const std::string & self, const std::string & substr,
-                              Py_ssize_t start, Py_ssize_t end,
-                              int direction)
-        {
-            Py_ssize_t len = (Py_ssize_t) self.size();
-            Py_ssize_t slen = (Py_ssize_t) substr.size();
-            
-            const char* sub = substr.c_str();
-            const char* str = self.c_str();
-            
-            ADJUST_INDICES(start, end, len);
-            
-            if (direction < 0) {
-                // startswith
-                if (start+slen > len)
-                    return 0;
-            } else {
-                // endswith
-                if (end-start < slen || start > len)
-                    return 0;
-                if (end-slen > start)
-                    start = end - slen;
-            }
-            if (end-start >= slen)
-                return (!std::memcmp(str+start, sub, slen));
-            
-            return 0;
-        }
-    }
-    
-    bool endswith( const std::string & str, const std::string & suffix, int start, int end )
-    {
-        int result = _string_tailmatch(str, suffix,
-                                       (Py_ssize_t) start, (Py_ssize_t) end, +1);
-        //if (result == -1) // TODO: Error condition
-        
-        return static_cast<bool>(result);
-    }
-    
-    
-    bool startswith( const std::string & str, const std::string & prefix, int start, int end )
-    {
-        int result = _string_tailmatch(str, prefix,
-                                       (Py_ssize_t) start, (Py_ssize_t) end, -1);
-        //if (result == -1) // TODO: Error condition
-        
-        return static_cast<bool>(result);
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    bool isalnum( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-
-
-        if( len == 1 )
-        {
-            return ::isalnum( str[0] );
-        }
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( !::isalnum( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isalpha( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isalpha( (int) str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isalpha( (int) str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isdigit( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isdigit( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( ! ::isdigit( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool islower( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::islower( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::islower( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isspace( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isspace( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isspace( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool istitle( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-
-        if ( len == 0 ) return false;
-        if ( len == 1 ) return ::isupper( str[0] );
-
-        bool cased = false, previous_is_cased = false;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::isupper( str[i] ) )
-            {
-                if ( previous_is_cased )
-                {
-                    return false;
-                }
-
-                previous_is_cased = true;
-                cased = true;
-            }
-            else if ( ::islower( str[i] ) )
-            {
-                if (!previous_is_cased)
-                {
-                    return false;
-                }
-
-                previous_is_cased = true;
-                cased = true;
-
-            }
-            else
-            {
-                previous_is_cased = false;
-            }
-        }
-
-        return cased;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isupper( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isupper( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isupper( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string capitalize( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        if ( len > 0)
-        {
-            if (::islower(s[0])) s[0] = (char) ::toupper( s[0] );
-        }
-
-        for ( i = 1; i < len; ++i )
-        {
-            if (::isupper(s[i])) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string lower( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string upper( const std::string & str )
-    {
-        std::string s( str ) ;
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string swapcase( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
-            else if (::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string title( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-        bool previous_is_cased = false;
-
-        for ( i = 0; i < len; ++i )
-        {
-            int c = s[i];
-            if ( ::islower(c) )
-            {
-                if ( !previous_is_cased )
-                {
-                    s[i] = (char) ::toupper(c);
-                }
-                previous_is_cased = true;
-            }
-            else if ( ::isupper(c) )
-            {
-                if ( previous_is_cased )
-                {
-                    s[i] = (char) ::tolower(c);
-                }
-                previous_is_cased = true;
-            }
-            else
-            {
-                previous_is_cased = false;
-            }
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string translate( const std::string & str, const std::string & table, const std::string & deletechars )
-    {
-        std::string s;
-        std::string::size_type len = str.size(), dellen = deletechars.size();
-
-        if ( table.size() != 256 )
-        {
-            // TODO : raise exception instead
-            return str;
-        }
-
-        //if nothing is deleted, use faster code
-        if ( dellen == 0 )
-        {
-            s = str;
-            for ( std::string::size_type i = 0; i < len; ++i )
-            {
-                s[i] = table[ s[i] ];
-            }
-            return s;
-        }
-
-
-        int trans_table[256];
-        for ( int i = 0; i < 256; i++)
-        {
-            trans_table[i] = table[i];
-        }
-
-        for ( std::string::size_type i = 0; i < dellen; i++)
-        {
-            trans_table[(int) deletechars[i] ] = -1;
-        }
-
-        for ( std::string::size_type i = 0; i < len; ++i )
-        {
-            if ( trans_table[ (int) str[i] ] != -1 )
-            {
-                s += table[ str[i] ];
-            }
-        }
-
-        return s;
-
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string zfill( const std::string & str, int width )
-    {
-        int len = (int)str.size();
-
-        if ( len >= width )
-        {
-            return str;
-        }
-
-        std::string s( str );
-
-        int fill = width - len;
-
-        s = std::string( fill, '0' ) + s;
-
-
-        if ( s[fill] == '+' || s[fill] == '-' )
-        {
-            s[0] = s[fill];
-            s[fill] = '0';
-        }
-
-        return s;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string ljust( const std::string & str, int width )
-    {
-        std::string::size_type len = str.size();
-        if ( (( int ) len ) >= width ) return str;
-        return str + std::string( width - len, ' ' );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string rjust( const std::string & str, int width )
-    {
-        std::string::size_type len = str.size();
-        if ( (( int ) len ) >= width ) return str;
-        return std::string( width - len, ' ' ) + str;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string center( const std::string & str, int width )
-    {
-        int len = (int) str.size();
-        int marg, left;
-
-        if ( len >= width ) return str;
-
-        marg = width - len;
-        left = marg / 2 + (marg & width & 1);
-
-        return std::string( left, ' ' ) + str + std::string( marg - left, ' ' );
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string slice( const std::string & str, int start, int end )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        if ( start >= end ) return "";
-        return str.substr( start, end - start );
-    }
-    
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int find( const std::string & str, const std::string & sub, int start, int end  )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        
-        std::string::size_type result = str.find( sub, start );
-        
-        // If we cannot find the string, or if the end-point of our found substring is past
-        // the allowed end limit, return that it can't be found.
-        if( result == std::string::npos || 
-           (result + sub.size() > (std::string::size_type)end) )
-        {
-            return -1;
-        }
-        
-        return (int) result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int index( const std::string & str, const std::string & sub, int start, int end  )
-    {
-        return find( str, sub, start, end );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int rfind( const std::string & str, const std::string & sub, int start, int end )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        
-        std::string::size_type result = str.rfind( sub, end );
-        
-        if( result == std::string::npos || 
-            result < (std::string::size_type)start  || 
-           (result + sub.size() > (std::string::size_type)end))
-            return -1;
-        
-        return (int)result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int rindex( const std::string & str, const std::string & sub, int start, int end )
-    {
-        return rfind( str, sub, start, end );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string expandtabs( const std::string & str, int tabsize )
-    {
-        std::string s( str );
-
-        std::string::size_type len = str.size(), i = 0;
-        int offset = 0;
-
-        int j = 0;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( str[i] == '\t' )
-            {
-
-                if ( tabsize > 0 )
-                {
-                    int fillsize = tabsize - (j % tabsize);
-                    j += fillsize;
-                    s.replace( i + offset, 1, std::string( fillsize, ' ' ));
-                    offset += fillsize - 1;
-                }
-                else
-                {
-                    s.replace( i + offset, 1, "" );
-                    offset -= 1;
-                }
-
-            }
-            else
-            {
-                j++;
-
-                if (str[i] == '\n' || str[i] == '\r')
-                {
-                    j = 0;
-                }
-            }
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int count( const std::string & str, const std::string & substr, int start, int end )
-    {
-        int nummatches = 0;
-        int cursor = start;
-
-        while ( 1 )
-        {
-            cursor = find( str, substr, cursor, end );
-
-            if ( cursor < 0 ) break;
-
-            cursor += (int) substr.size();
-            nummatches += 1;
-        }
-
-        return nummatches;
-
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string replace( const std::string & str, const std::string & oldstr, const std::string & newstr, int count )
-    {
-        int sofar = 0;
-        int cursor = 0;
-        std::string s( str );
-
-        std::string::size_type oldlen = oldstr.size(), newlen = newstr.size();
-
-        while ( ( cursor = find( s, oldstr, cursor ) ) != -1 )
-        {
-            if ( count > -1 && sofar >= count )
-            {
-                break;
-            }
-
-            s.replace( cursor, oldlen, newstr );
-
-            cursor += (int) newlen;
-            ++sofar;
-        }
-
-        return s;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void splitlines(  const std::string & str, std::vector< std::string > & result, bool keepends )
-    {
-        result.clear();
-        std::string::size_type len = str.size(), i, j, eol;
-
-         for (i = j = 0; i < len; )
-         {
-            while (i < len && str[i] != '\n' && str[i] != '\r') i++;
-
-            eol = i;
-            if (i < len)
-            {
-                if (str[i] == '\r' && i + 1 < len && str[i+1] == '\n')
-                {
-                    i += 2;
-                }
-                else
-                {
-                    i++;
-                }
-                if (keepends)
-                eol = i;
-
-            }
-
-            result.push_back( str.substr( j, eol - j ) );
-            j = i;
-
-        }
-
-        if (j < len)
-        {
-            result.push_back( str.substr( j, len - j ) );
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string mul( const std::string & str, int n )
-    {
-        // Early exits
-        if (n <= 0) return "";
-        if (n == 1) return str;
-        
-        std::ostringstream os;
-        for(int i=0; i<n; ++i)
-        {
-            os << str;
-        }
-        return os.str();
-    }
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void split( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
+	{
+		result.clear();
+
+		if ( maxsplit < 0 ) maxsplit = MAX_32BIT_INT;//result.max_size();
+
+
+		if ( sep.size() == 0 )
+		{
+			split_whitespace( str, result, maxsplit );
+			return;
+		}
+
+		std::string::size_type i,j, len = str.size(), n = sep.size();
+
+		i = j = 0;
+
+		while ( i+n <= len )
+		{
+			if ( str[i] == sep[0] && str.substr( i, n ) == sep )
+			{
+				if ( maxsplit-- <= 0 ) break;
+
+				result.push_back( str.substr( j, i - j ) );
+				i = j = i + n;
+			}
+			else
+			{
+				i++;
+			}
+		}
+
+		result.push_back( str.substr( j, len-j ) );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void rsplit( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
+	{
+		if ( maxsplit < 0 )
+		{
+			split( str, result, sep, 0 );
+			return;
+		}
+
+		result.clear();
+
+		if ( sep.size() == 0 )
+		{
+			rsplit_whitespace( str, result, maxsplit );
+			return;
+		}
+
+		std::string::size_type i,j, len = str.size(), n = sep.size();
+
+		i = j = len;
+
+		while ( i > n )
+		{
+			if ( str[i - 1] == sep[n - 1] && str.substr( i - n, n ) == sep )
+			{
+				if ( maxsplit-- <= 0 ) break;
+
+				result.push_back( str.substr( i, j - i ) );
+				i = j = i - n;
+			}
+			else
+			{
+				i--;
+			}
+		}
+
+		result.push_back( str.substr( 0, j ) );
+		reverse_strings( result );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	#define LEFTSTRIP 0
+	#define RIGHTSTRIP 1
+	#define BOTHSTRIP 2
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string do_strip( const std::string & str, int striptype, const std::string & chars  )
+	{
+		Py_ssize_t len = (Py_ssize_t) str.size(), i, j, charslen = (Py_ssize_t) chars.size();
+
+		if ( charslen == 0 )
+		{
+			i = 0;
+			if ( striptype != RIGHTSTRIP )
+			{
+				while ( i < len && ::isspace( str[i] ) )
+				{
+					i++;
+				}
+			}
+
+			j = len;
+			if ( striptype != LEFTSTRIP )
+			{
+				do
+				{
+					j--;
+				}
+				while (j >= i && ::isspace(str[j]));
+
+				j++;
+			}
+
+
+		}
+		else
+		{
+			const char * sep = chars.c_str();
+
+			i = 0;
+			if ( striptype != RIGHTSTRIP )
+			{
+				while ( i < len && memchr(sep, str[i], charslen) )
+				{
+					i++;
+				}
+			}
+
+			j = len;
+			if (striptype != LEFTSTRIP)
+			{
+				do
+				{
+					j--;
+				}
+				while (j >= i &&  memchr(sep, str[j], charslen)  );
+				j++;
+			}
+
+
+		}
+
+		if ( i == 0 && j == len )
+		{
+			return str;
+		}
+		else
+		{
+			return str.substr( i, j - i );
+		}
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void partition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
+	{
+		result.resize(3);
+		int index = find( str, sep );
+		if ( index < 0 )
+		{
+			result[0] = str;
+			result[1] = "";
+			result[2] = "";
+		}
+		else
+		{
+			result[0] = str.substr( 0, index );
+			result[1] = sep;
+			result[2] = str.substr( index + sep.size(), str.size() );
+		}
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void rpartition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
+	{
+		result.resize(3);
+		int index = rfind( str, sep );
+		if ( index < 0 )
+		{
+			result[0] = "";
+			result[1] = "";
+			result[2] = str;
+		}
+		else
+		{
+			result[0] = str.substr( 0, index );
+			result[1] = sep;
+			result[2] = str.substr( index + sep.size(), str.size() );
+		}
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string strip( const std::string & str, const std::string & chars )
+	{
+		return do_strip( str, BOTHSTRIP, chars );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string lstrip( const std::string & str, const std::string & chars )
+	{
+		return do_strip( str, LEFTSTRIP, chars );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string rstrip( const std::string & str, const std::string & chars )
+	{
+		return do_strip( str, RIGHTSTRIP, chars );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string join( const std::string & str, const std::vector< std::string > & seq )
+	{
+		std::vector< std::string >::size_type seqlen = seq.size(), i;
+
+		if ( seqlen == 0 ) return "";
+		if ( seqlen == 1 ) return seq[0];
+
+		std::string result( seq[0] );
+
+		for ( i = 1; i < seqlen; ++i )
+		{
+			result += str + seq[i];
+
+		}
+
+
+		return result;
+	}
+
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	
+	namespace
+	{
+		/* Matches the end (direction >= 0) or start (direction < 0) of self
+		 * against substr, using the start and end arguments. Returns
+		 * -1 on error, 0 if not found and 1 if found.
+		 */
+		
+		int _string_tailmatch(const std::string & self, const std::string & substr,
+							  Py_ssize_t start, Py_ssize_t end,
+							  int direction)
+		{
+			Py_ssize_t len = (Py_ssize_t) self.size();
+			Py_ssize_t slen = (Py_ssize_t) substr.size();
+			
+			const char* sub = substr.c_str();
+			const char* str = self.c_str();
+			
+			ADJUST_INDICES(start, end, len);
+			
+			if (direction < 0) {
+				// startswith
+				if (start+slen > len)
+					return 0;
+			} else {
+				// endswith
+				if (end-start < slen || start > len)
+					return 0;
+				if (end-slen > start)
+					start = end - slen;
+			}
+			if (end-start >= slen)
+				return (!std::memcmp(str+start, sub, slen));
+			
+			return 0;
+		}
+	}
+	
+	bool endswith( const std::string & str, const std::string & suffix, int start, int end )
+	{
+		int result = _string_tailmatch(str, suffix,
+									   (Py_ssize_t) start, (Py_ssize_t) end, +1);
+		//if (result == -1) // TODO: Error condition
+		
+		return result == 1;
+	}
+	
+	
+	bool startswith( const std::string & str, const std::string & prefix, int start, int end )
+	{
+		int result = _string_tailmatch(str, prefix,
+									   (Py_ssize_t) start, (Py_ssize_t) end, -1);
+		//if (result == -1) // TODO: Error condition
+		
+		return result == 1;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	bool isalnum( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isalnum( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::isalnum( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isalpha( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isalpha( (int) str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isalpha( (int) str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isdigit( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isdigit( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isdigit( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool islower( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::islower( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::islower( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isspace( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isspace( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isspace( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool istitle( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if ( len == 1 ) 
+		{
+			return ::isupper( str[0] ) != 0;
+		}
+
+		bool cased = false, previous_is_cased = false;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::isupper( str[i] ) )
+			{
+				if ( previous_is_cased )
+				{
+					return false;
+				}
+
+				previous_is_cased = true;
+				cased = true;
+			}
+			else if ( ::islower( str[i] ) )
+			{
+				if (!previous_is_cased)
+				{
+					return false;
+				}
+
+				previous_is_cased = true;
+				cased = true;
+
+			}
+			else
+			{
+				previous_is_cased = false;
+			}
+		}
+
+		return cased;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isupper( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isupper( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isupper( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string capitalize( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+
+		if ( len > 0)
+		{
+			if (::islower(s[0])) s[0] = (char) ::toupper( s[0] );
+		}
+
+		for ( i = 1; i < len; ++i )
+		{
+			if (::isupper(s[i])) s[i] = (char) ::tolower( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string lower( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string upper( const std::string & str )
+	{
+		std::string s( str ) ;
+		std::string::size_type len = s.size(), i;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string swapcase( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
+			else if (::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string title( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+		bool previous_is_cased = false;
+
+		for ( i = 0; i < len; ++i )
+		{
+			int c = s[i];
+			if ( ::islower(c) )
+			{
+				if ( !previous_is_cased )
+				{
+					s[i] = (char) ::toupper(c);
+				}
+				previous_is_cased = true;
+			}
+			else if ( ::isupper(c) )
+			{
+				if ( previous_is_cased )
+				{
+					s[i] = (char) ::tolower(c);
+				}
+				previous_is_cased = true;
+			}
+			else
+			{
+				previous_is_cased = false;
+			}
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string translate( const std::string & str, const std::string & table, const std::string & deletechars )
+	{
+		std::string s;
+		std::string::size_type len = str.size(), dellen = deletechars.size();
+
+		if ( table.size() != 256 )
+		{
+			// TODO : raise exception instead
+			return str;
+		}
+
+		//if nothing is deleted, use faster code
+		if ( dellen == 0 )
+		{
+			s = str;
+			for ( std::string::size_type i = 0; i < len; ++i )
+			{
+				s[i] = table[ s[i] ];
+			}
+			return s;
+		}
+
+
+		int trans_table[256];
+		for ( int i = 0; i < 256; i++)
+		{
+			trans_table[i] = table[i];
+		}
+
+		for ( std::string::size_type i = 0; i < dellen; i++)
+		{
+			trans_table[(int) deletechars[i] ] = -1;
+		}
+
+		for ( std::string::size_type i = 0; i < len; ++i )
+		{
+			if ( trans_table[ (int) str[i] ] != -1 )
+			{
+				s += table[ str[i] ];
+			}
+		}
+
+		return s;
+
+	}
+
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string zfill( const std::string & str, int width )
+	{
+		int len = (int)str.size();
+
+		if ( len >= width )
+		{
+			return str;
+		}
+
+		std::string s( str );
+
+		int fill = width - len;
+
+		s = std::string( fill, '0' ) + s;
+
+
+		if ( s[fill] == '+' || s[fill] == '-' )
+		{
+			s[0] = s[fill];
+			s[fill] = '0';
+		}
+
+		return s;
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string ljust( const std::string & str, int width )
+	{
+		std::string::size_type len = str.size();
+		if ( (( int ) len ) >= width ) return str;
+		return str + std::string( width - len, ' ' );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string rjust( const std::string & str, int width )
+	{
+		std::string::size_type len = str.size();
+		if ( (( int ) len ) >= width ) return str;
+		return std::string( width - len, ' ' ) + str;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string center( const std::string & str, int width )
+	{
+		int len = (int) str.size();
+		int marg, left;
+
+		if ( len >= width ) return str;
+
+		marg = width - len;
+		left = marg / 2 + (marg & width & 1);
+
+		return std::string( left, ' ' ) + str + std::string( marg - left, ' ' );
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string slice( const std::string & str, int start, int end )
+	{
+		ADJUST_INDICES(start, end, (int) str.size());
+		if ( start >= end ) return "";
+		return str.substr( start, end - start );
+	}
+	
+	
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int find( const std::string & str, const std::string & sub, int start, int end  )
+	{
+		ADJUST_INDICES(start, end, (int) str.size());
+		
+		std::string::size_type result = str.find( sub, start );
+		
+		// If we cannot find the string, or if the end-point of our found substring is past
+		// the allowed end limit, return that it can't be found.
+		if( result == std::string::npos || 
+		   (result + sub.size() > (std::string::size_type)end) )
+		{
+			return -1;
+		}
+		
+		return (int) result;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int index( const std::string & str, const std::string & sub, int start, int end  )
+	{
+		return find( str, sub, start, end );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int rfind( const std::string & str, const std::string & sub, int start, int end )
+	{
+		ADJUST_INDICES(start, end, (int) str.size());
+		
+		std::string::size_type result = str.rfind( sub, end );
+		
+		if( result == std::string::npos || 
+			result < (std::string::size_type)start  || 
+		   (result + sub.size() > (std::string::size_type)end))
+			return -1;
+		
+		return (int)result;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int rindex( const std::string & str, const std::string & sub, int start, int end )
+	{
+		return rfind( str, sub, start, end );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string expandtabs( const std::string & str, int tabsize )
+	{
+		std::string s( str );
+
+		std::string::size_type len = str.size(), i = 0;
+		int offset = 0;
+
+		int j = 0;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( str[i] == '\t' )
+			{
+
+				if ( tabsize > 0 )
+				{
+					int fillsize = tabsize - (j % tabsize);
+					j += fillsize;
+					s.replace( i + offset, 1, std::string( fillsize, ' ' ));
+					offset += fillsize - 1;
+				}
+				else
+				{
+					s.replace( i + offset, 1, "" );
+					offset -= 1;
+				}
+
+			}
+			else
+			{
+				j++;
+
+				if (str[i] == '\n' || str[i] == '\r')
+				{
+					j = 0;
+				}
+			}
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int count( const std::string & str, const std::string & substr, int start, int end )
+	{
+		int nummatches = 0;
+		int cursor = start;
+
+		while ( 1 )
+		{
+			cursor = find( str, substr, cursor, end );
+
+			if ( cursor < 0 ) break;
+
+			cursor += (int) substr.size();
+			nummatches += 1;
+		}
+
+		return nummatches;
+
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string replace( const std::string & str, const std::string & oldstr, const std::string & newstr, int count )
+	{
+		int sofar = 0;
+		int cursor = 0;
+		std::string s( str );
+
+		std::string::size_type oldlen = oldstr.size(), newlen = newstr.size();
+
+		while ( ( cursor = find( s, oldstr, cursor ) ) != -1 )
+		{
+			if ( count > -1 && sofar >= count )
+			{
+				break;
+			}
+
+			s.replace( cursor, oldlen, newstr );
+
+			cursor += (int) newlen;
+			++sofar;
+		}
+
+		return s;
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void splitlines(  const std::string & str, std::vector< std::string > & result, bool keepends )
+	{
+		result.clear();
+		std::string::size_type len = str.size(), i, j, eol;
+
+		 for (i = j = 0; i < len; )
+		 {
+			while (i < len && str[i] != '\n' && str[i] != '\r') i++;
+
+			eol = i;
+			if (i < len)
+			{
+				if (str[i] == '\r' && i + 1 < len && str[i+1] == '\n')
+				{
+					i += 2;
+				}
+				else
+				{
+					i++;
+				}
+				if (keepends)
+				eol = i;
+
+			}
+
+			result.push_back( str.substr( j, eol - j ) );
+			j = i;
+
+		}
+
+		if (j < len)
+		{
+			result.push_back( str.substr( j, len - j ) );
+		}
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string mul( const std::string & str, int n )
+	{
+		// Early exits
+		if (n <= 0) return "";
+		if (n == 1) return str;
+		
+		std::ostringstream os;
+		for(int i=0; i<n; ++i)
+		{
+			os << str;
+		}
+		return os.str();
+	}
 
 
 
@@ -1060,593 +1082,593 @@
 {
 namespace path
 {
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    /// These functions are C++ ports of the python2.6 versions of os.path,
-    /// and come from genericpath.py, ntpath.py, posixpath.py
-
-    /// Split a pathname into drive and path specifiers.
-    /// Returns drivespec, pathspec. Either part may be empty.
-    void splitdrive_nt(std::string & drivespec, std::string & pathspec,
-                       const std::string & p)
-    {
-        if(pystring::slice(p, 1, 2) == ":")
-        {
-            std::string path = p; // In case drivespec == p
-            drivespec = pystring::slice(path, 0, 2);
-            pathspec = pystring::slice(path, 2);
-        }
-        else
-        {
-            drivespec = "";
-            pathspec = p;
-        }
-    }
-
-    // On Posix, drive is always empty
-    void splitdrive_posix(std::string & drivespec, std::string & pathspec,
-                          const std::string & path)
-    {
-        drivespec = "";
-        pathspec = path;
-    }
-
-    void splitdrive(std::string & drivespec, std::string & pathspec,
-                    const std::string & path)
-    {
+	
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	/// These functions are C++ ports of the python2.6 versions of os.path,
+	/// and come from genericpath.py, ntpath.py, posixpath.py
+
+	/// Split a pathname into drive and path specifiers.
+	/// Returns drivespec, pathspec. Either part may be empty.
+	void splitdrive_nt(std::string & drivespec, std::string & pathspec,
+					   const std::string & p)
+	{
+		if(pystring::slice(p, 1, 2) == ":")
+		{
+			std::string path = p; // In case drivespec == p
+			drivespec = pystring::slice(path, 0, 2);
+			pathspec = pystring::slice(path, 2);
+		}
+		else
+		{
+			drivespec = "";
+			pathspec = p;
+		}
+	}
+
+	// On Posix, drive is always empty
+	void splitdrive_posix(std::string & drivespec, std::string & pathspec,
+						  const std::string & path)
+	{
+		drivespec = "";
+		pathspec = path;
+	}
+
+	void splitdrive(std::string & drivespec, std::string & pathspec,
+					const std::string & path)
+	{
 #ifdef WINDOWS
-        return splitdrive_nt(drivespec, pathspec, path);
+		return splitdrive_nt(drivespec, pathspec, path);
 #else
-        return splitdrive_posix(drivespec, pathspec, path);
+		return splitdrive_posix(drivespec, pathspec, path);
 #endif
-    }
+	}
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Test whether a path is absolute
-    // In windows, if the character to the right of the colon
-    // is a forward or backslash it's absolute.
-    bool isabs_nt(const std::string & path)
-    {
-        std::string drivespec, pathspec;
-        splitdrive_nt(drivespec, pathspec, path);
-        if(pathspec.empty()) return false;
-        return ((pathspec[0] == '/') || (pathspec[0] == '\\'));
-    }
-
-    bool isabs_posix(const std::string & s)
-    {
-        return pystring::startswith(s, "/");
-    }
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	// Test whether a path is absolute
+	// In windows, if the character to the right of the colon
+	// is a forward or backslash it's absolute.
+	bool isabs_nt(const std::string & path)
+	{
+		std::string drivespec, pathspec;
+		splitdrive_nt(drivespec, pathspec, path);
+		if(pathspec.empty()) return false;
+		return ((pathspec[0] == '/') || (pathspec[0] == '\\'));
+	}
+
+	bool isabs_posix(const std::string & s)
+	{
+		return pystring::startswith(s, "/");
+	}
 
-    bool isabs(const std::string & path)
-    {
+	bool isabs(const std::string & path)
+	{
 #ifdef WINDOWS
-        return isabs_nt(path);
+		return isabs_nt(path);
 #else
-        return isabs_posix(path);
+		return isabs_posix(path);
 #endif
-    }
+	}
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    std::string abspath_nt(const std::string & path, const std::string & cwd)
-    {
-        std::string p = path;
-        if(!isabs_nt(p)) p = join_nt(cwd, p);
-        return normpath_nt(p);
-    }
-    
-    std::string abspath_posix(const std::string & path, const std::string & cwd)
-    {
-        std::string p = path;
-        if(!isabs_posix(p)) p = join_posix(cwd, p);
-        return normpath_posix(p);
-    }
-    
-    std::string abspath(const std::string & path, const std::string & cwd)
-    {
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	
+	std::string abspath_nt(const std::string & path, const std::string & cwd)
+	{
+		std::string p = path;
+		if(!isabs_nt(p)) p = join_nt(cwd, p);
+		return normpath_nt(p);
+	}
+	
+	std::string abspath_posix(const std::string & path, const std::string & cwd)
+	{
+		std::string p = path;
+		if(!isabs_posix(p)) p = join_posix(cwd, p);
+		return normpath_posix(p);
+	}
+	
+	std::string abspath(const std::string & path, const std::string & cwd)
+	{
 #ifdef WINDOWS
-        return abspath_nt(path, cwd);
+		return abspath_nt(path, cwd);
 #else
-        return abspath_posix(path, cwd);
+		return abspath_posix(path, cwd);
 #endif
-    }
-    
+	}
+	
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    std::string join_nt(const std::vector< std::string > & paths)
-    {
-        if(paths.empty()) return "";
-        if(paths.size() == 1) return paths[0];
-        
-        std::string path = paths[0];
-        
-        for(unsigned int i=1; i<paths.size(); ++i)
-        {
-            std::string b = paths[i];
-            
-            bool b_nts = false;
-            if(path.empty())
-            {
-                b_nts = true;
-            }
-            else if(isabs_nt(b))
-            {
-                // This probably wipes out path so far.  However, it's more
-                // complicated if path begins with a drive letter:
-                //     1. join('c:', '/a') == 'c:/a'
-                //     2. join('c:/', '/a') == 'c:/a'
-                // But
-                //     3. join('c:/a', '/b') == '/b'
-                //     4. join('c:', 'd:/') = 'd:/'
-                //     5. join('c:/', 'd:/') = 'd:/'
-                
-                if( (pystring::slice(path, 1, 2) != ":") ||
-                    (pystring::slice(b, 1, 2) == ":") )
-                {
-                    // Path doesnt start with a drive letter
-                    b_nts = true;
-                }
-                // Else path has a drive letter, and b doesn't but is absolute.
-                else if((path.size()>3) || 
-                        ((path.size()==3) && !pystring::endswith(path, "/") && !pystring::endswith(path, "\\")))
-                {
-                    b_nts = true;
-                }
-            }
-            
-            if(b_nts)
-            {
-                path = b;
-            }
-            else
-            {
-                // Join, and ensure there's a separator.
-                // assert len(path) > 0
-                if( pystring::endswith(path, "/") || pystring::endswith(path, "\\"))
-                {
-                    if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
-                    {
-                        path += pystring::slice(b, 1);
-                    }
-                    else
-                    {
-                        path += b;
-                    }
-                }
-                else if(pystring::endswith(path, ":"))
-                {
-                    path += b;
-                }
-                else if(!b.empty())
-                {
-                    if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
-                    {
-                        path += b;
-                    }
-                    else
-                    {
-                        path += "\\" + b;
-                    }
-                }
-                else
-                {
-                    // path is not empty and does not end with a backslash,
-                    // but b is empty; since, e.g., split('a/') produces
-                    // ('a', ''), it's best if join() adds a backslash in
-                    // this case.
-                    path += "\\";
-                }
-            }
-        }
-        
-        return path;
-    }
-    
-    // Join two or more pathname components, inserting "\\" as needed.
-    std::string join_nt(const std::string & a, const std::string & b)
-    {
-        std::vector< std::string > paths(2);
-        paths[0] = a;
-        paths[1] = b;
-        return join_nt(paths);
-    }
-
-    // Join pathnames.
-    // If any component is an absolute path, all previous path components
-    // will be discarded.
-    // Ignore the previous parts if a part is absolute.
-    // Insert a '/' unless the first part is empty or already ends in '/'.
-
-    std::string join_posix(const std::vector< std::string > & paths)
-    {
-        if(paths.empty()) return "";
-        if(paths.size() == 1) return paths[0];
-        
-        std::string path = paths[0];
-        
-        for(unsigned int i=1; i<paths.size(); ++i)
-        {
-            std::string b = paths[i];
-            if(pystring::startswith(b, "/"))
-            {
-                path = b;
-            }
-            else if(path.empty() || pystring::endswith(path, "/"))
-            {
-                path += b;
-            }
-            else
-            {
-                path += "/" + b;
-            }
-        }
-        
-        return path;
-    }
-
-    std::string join_posix(const std::string & a, const std::string & b)
-    {
-        std::vector< std::string > paths(2);
-        paths[0] = a;
-        paths[1] = b;
-        return join_posix(paths);
-    }
-    
-    std::string join(const std::string & path1, const std::string & path2)
-    {
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	std::string join_nt(const std::vector< std::string > & paths)
+	{
+		if(paths.empty()) return "";
+		if(paths.size() == 1) return paths[0];
+		
+		std::string path = paths[0];
+		
+		for(unsigned int i=1; i<paths.size(); ++i)
+		{
+			std::string b = paths[i];
+			
+			bool b_nts = false;
+			if(path.empty())
+			{
+				b_nts = true;
+			}
+			else if(isabs_nt(b))
+			{
+				// This probably wipes out path so far.  However, it's more
+				// complicated if path begins with a drive letter:
+				//     1. join('c:', '/a') == 'c:/a'
+				//     2. join('c:/', '/a') == 'c:/a'
+				// But
+				//     3. join('c:/a', '/b') == '/b'
+				//     4. join('c:', 'd:/') = 'd:/'
+				//     5. join('c:/', 'd:/') = 'd:/'
+				
+				if( (pystring::slice(path, 1, 2) != ":") ||
+					(pystring::slice(b, 1, 2) == ":") )
+				{
+					// Path doesnt start with a drive letter
+					b_nts = true;
+				}
+				// Else path has a drive letter, and b doesn't but is absolute.
+				else if((path.size()>3) || 
+						((path.size()==3) && !pystring::endswith(path, "/") && !pystring::endswith(path, "\\")))
+				{
+					b_nts = true;
+				}
+			}
+			
+			if(b_nts)
+			{
+				path = b;
+			}
+			else
+			{
+				// Join, and ensure there's a separator.
+				// assert len(path) > 0
+				if( pystring::endswith(path, "/") || pystring::endswith(path, "\\"))
+				{
+					if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
+					{
+						path += pystring::slice(b, 1);
+					}
+					else
+					{
+						path += b;
+					}
+				}
+				else if(pystring::endswith(path, ":"))
+				{
+					path += b;
+				}
+				else if(!b.empty())
+				{
+					if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
+					{
+						path += b;
+					}
+					else
+					{
+						path += "\\" + b;
+					}
+				}
+				else
+				{
+					// path is not empty and does not end with a backslash,
+					// but b is empty; since, e.g., split('a/') produces
+					// ('a', ''), it's best if join() adds a backslash in
+					// this case.
+					path += "\\";
+				}
+			}
+		}
+		
+		return path;
+	}
+	
+	// Join two or more pathname components, inserting "\\" as needed.
+	std::string join_nt(const std::string & a, const std::string & b)
+	{
+		std::vector< std::string > paths(2);
+		paths[0] = a;
+		paths[1] = b;
+		return join_nt(paths);
+	}
+
+	// Join pathnames.
+	// If any component is an absolute path, all previous path components
+	// will be discarded.
+	// Ignore the previous parts if a part is absolute.
+	// Insert a '/' unless the first part is empty or already ends in '/'.
+
+	std::string join_posix(const std::vector< std::string > & paths)
+	{
+		if(paths.empty()) return "";
+		if(paths.size() == 1) return paths[0];
+		
+		std::string path = paths[0];
+		
+		for(unsigned int i=1; i<paths.size(); ++i)
+		{
+			std::string b = paths[i];
+			if(pystring::startswith(b, "/"))
+			{
+				path = b;
+			}
+			else if(path.empty() || pystring::endswith(path, "/"))
+			{
+				path += b;
+			}
+			else
+			{
+				path += "/" + b;
+			}
+		}
+		
+		return path;
+	}
+
+	std::string join_posix(const std::string & a, const std::string & b)
+	{
+		std::vector< std::string > paths(2);
+		paths[0] = a;
+		paths[1] = b;
+		return join_posix(paths);
+	}
+	
+	std::string join(const std::string & path1, const std::string & path2)
+	{
 #ifdef WINDOWS
-        return join_nt(path1, path2);
+		return join_nt(path1, path2);
 #else
-        return join_posix(path1, path2);
+		return join_posix(path1, path2);
 #endif
-    }
+	}
 
 
-    std::string join(const std::vector< std::string > & paths)
-    {
+	std::string join(const std::vector< std::string > & paths)
+	{
 #ifdef WINDOWS
-        return join_nt(paths);
+		return join_nt(paths);
 #else
-        return join_posix(paths);
+		return join_posix(paths);
 #endif
-    }
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-        
-    // Split a pathname.
-    // Return (head, tail) where tail is everything after the final slash.
-    // Either part may be empty
-
-    void split_nt(std::string & head, std::string & tail, const std::string & path)
-    {
-        std::string d, p;
-        splitdrive_nt(d, p, path);
-        
-        // set i to index beyond p's last slash
-        int i = (int)p.size();
-        
-        while(i>0 && (p[i-1] != '\\') && (p[i-1] != '/'))
-        {
-            i = i - 1;
-        }
-
-        head = pystring::slice(p,0,i);
-        tail = pystring::slice(p,i); // now tail has no slashes
-        
-        // remove trailing slashes from head, unless it's all slashes
-        std::string head2 = head;
-        while(!head2.empty() && ((pystring::slice(head2,-1) == "/") ||
-                                 (pystring::slice(head2,-1) == "\\")))
-        {
-            head2 = pystring::slice(head,0,-1);
-        }
-        
-        if(!head2.empty()) head = head2;
-        head = d + head;
-    }
-
-
-    // Split a path in head (everything up to the last '/') and tail (the
-    // rest).  If the path ends in '/', tail will be empty.  If there is no
-    // '/' in the path, head  will be empty.
-    // Trailing '/'es are stripped from head unless it is the root.
-
-    void split_posix(std::string & head, std::string & tail, const std::string & p)
-    {
-        int i = pystring::rfind(p, "/") + 1;
-        
-        head = pystring::slice(p,0,i);
-        tail = pystring::slice(p,i);
-        
-        if(!head.empty() && (head != pystring::mul("/", (int) head.size())))
-        {
-            head = pystring::rstrip(head, "/");
-        }
-    }
+	}
+	
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+		
+	// Split a pathname.
+	// Return (head, tail) where tail is everything after the final slash.
+	// Either part may be empty
+
+	void split_nt(std::string & head, std::string & tail, const std::string & path)
+	{
+		std::string d, p;
+		splitdrive_nt(d, p, path);
+		
+		// set i to index beyond p's last slash
+		int i = (int)p.size();
+		
+		while(i>0 && (p[i-1] != '\\') && (p[i-1] != '/'))
+		{
+			i = i - 1;
+		}
 
-    void split(std::string & head, std::string & tail, const std::string & path)
-    {
+		head = pystring::slice(p,0,i);
+		tail = pystring::slice(p,i); // now tail has no slashes
+		
+		// remove trailing slashes from head, unless it's all slashes
+		std::string head2 = head;
+		while(!head2.empty() && ((pystring::slice(head2,-1) == "/") ||
+								 (pystring::slice(head2,-1) == "\\")))
+		{
+			head2 = pystring::slice(head,0,-1);
+		}
+		
+		if(!head2.empty()) head = head2;
+		head = d + head;
+	}
+
+
+	// Split a path in head (everything up to the last '/') and tail (the
+	// rest).  If the path ends in '/', tail will be empty.  If there is no
+	// '/' in the path, head  will be empty.
+	// Trailing '/'es are stripped from head unless it is the root.
+
+	void split_posix(std::string & head, std::string & tail, const std::string & p)
+	{
+		int i = pystring::rfind(p, "/") + 1;
+		
+		head = pystring::slice(p,0,i);
+		tail = pystring::slice(p,i);
+		
+		if(!head.empty() && (head != pystring::mul("/", (int) head.size())))
+		{
+			head = pystring::rstrip(head, "/");
+		}
+	}
+
+	void split(std::string & head, std::string & tail, const std::string & path)
+	{
 #ifdef WINDOWS
-        return split_nt(head, tail, path);
+		return split_nt(head, tail, path);
 #else
-        return split_posix(head, tail, path);
+		return split_posix(head, tail, path);
 #endif
-    }
+	}
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    std::string basename_nt(const std::string & path)
-    {
-        std::string head, tail;
-        split_nt(head, tail, path);
-        return tail;
-    }
-
-    std::string basename_posix(const std::string & path)
-    {
-        std::string head, tail;
-        split_posix(head, tail, path);
-        return tail;
-    }
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	std::string basename_nt(const std::string & path)
+	{
+		std::string head, tail;
+		split_nt(head, tail, path);
+		return tail;
+	}
+
+	std::string basename_posix(const std::string & path)
+	{
+		std::string head, tail;
+		split_posix(head, tail, path);
+		return tail;
+	}
 
-    std::string basename(const std::string & path)
-    {
+	std::string basename(const std::string & path)
+	{
 #ifdef WINDOWS
-        return basename_nt(path);
+		return basename_nt(path);
 #else
-        return basename_posix(path);
+		return basename_posix(path);
 #endif
-    }
+	}
 
-    std::string dirname_nt(const std::string & path)
-    {
-        std::string head, tail;
-        split_nt(head, tail, path);
-        return head;
-    }
-    
-    std::string dirname_posix(const std::string & path)
-    {
-        std::string head, tail;
-        split_posix(head, tail, path);
-        return head;
-    }
-    
-    std::string dirname(const std::string & path)
-    {
+	std::string dirname_nt(const std::string & path)
+	{
+		std::string head, tail;
+		split_nt(head, tail, path);
+		return head;
+	}
+	
+	std::string dirname_posix(const std::string & path)
+	{
+		std::string head, tail;
+		split_posix(head, tail, path);
+		return head;
+	}
+	
+	std::string dirname(const std::string & path)
+	{
 #ifdef WINDOWS
-        return dirname_nt(path);
+		return dirname_nt(path);
 #else
-        return dirname_posix(path);
+		return dirname_posix(path);
 #endif
-    }
+	}
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A\B.
-    std::string normpath_nt(const std::string & p)
-    {
-        std::string path = p;
-        path = pystring::replace(path, "/","\\");
-        
-        std::string prefix;
-        splitdrive_nt(prefix, path, path);
-        
-        // We need to be careful here. If the prefix is empty, and the path starts
-        // with a backslash, it could either be an absolute path on the current
-        // drive (\dir1\dir2\file) or a UNC filename (\\server\mount\dir1\file). It
-        // is therefore imperative NOT to collapse multiple backslashes blindly in
-        // that case.
-        // The code below preserves multiple backslashes when there is no drive
-        // letter. This means that the invalid filename \\\a\b is preserved
-        // unchanged, where a\\\b is normalised to a\b. It's not clear that there
-        // is any better behaviour for such edge cases.
-        
-        if(prefix.empty())
-        {
-            // No drive letter - preserve initial backslashes
-            while(pystring::slice(path,0,1) == "\\")
-            {
-                prefix = prefix + "\\";
-                path = pystring::slice(path,1);
-            }
-        }
-        else
-        {
-            // We have a drive letter - collapse initial backslashes
-            if(pystring::startswith(path, "\\"))
-            {
-                prefix = prefix + "\\";
-                path = pystring::lstrip(path, "\\");
-            }
-        }
-        
-        std::vector<std::string> comps;
-        pystring::split(path, comps, "\\");
-        
-        int i = 0;
-        
-        while(i<(int)comps.size())
-        {
-            if(comps[i].empty() || comps[i] == ".")
-            {
-                comps.erase(comps.begin()+i);
-            }
-            else if(comps[i] == "..")
-            {
-                if(i>0 && comps[i-1] != "..")
-                {
-                    comps.erase(comps.begin()+i-1, comps.begin()+i+1);
-                    i -= 1;
-                }
-                else if(i == 0 && pystring::endswith(prefix, "\\"))
-                {
-                    comps.erase(comps.begin()+i);
-                }
-                else
-                {
-                    i += 1;
-                }
-            }
-            else
-            {
-                i += 1;
-            }
-        }
-        
-        // If the path is now empty, substitute '.'
-        if(prefix.empty() && comps.empty())
-        {
-            comps.push_back(".");
-        }
-        
-        return prefix + pystring::join("\\", comps);
-    }
-
-    // Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
-    // It should be understood that this may change the meaning of the path
-    // if it contains symbolic links!
-    // Normalize path, eliminating double slashes, etc.
-
-    std::string normpath_posix(const std::string & p)
-    {
-        if(p.empty()) return ".";
-        
-        std::string path = p;
-        
-        int initial_slashes = pystring::startswith(path,"/") ? 1 : 0;
-        
-        // POSIX allows one or two initial slashes, but treats three or more
-        // as single slash.
-        
-        if (initial_slashes && pystring::startswith(path,"//")
-            && !pystring::startswith(path,"///"))
-            initial_slashes = 2;
-        
-        std::vector<std::string> comps, new_comps;
-        pystring::split(path, comps, "/");
-        
-        for(unsigned int i=0; i<comps.size(); ++i)
-        {
-            std::string comp = comps[i];
-            if(comp.empty() || comp == ".")
-                continue;
-            
-            if( (comp != "..") || ((initial_slashes == 0) && new_comps.empty()) ||
-                (!new_comps.empty() && new_comps[new_comps.size()-1] == ".."))
-            {
-                new_comps.push_back(comp);
-            }
-            else if (!new_comps.empty())
-            {
-                new_comps.pop_back();
-            }
-        }
-        
-        path = pystring::join("/", new_comps);
-        
-        if (initial_slashes > 0)
-            path = pystring::mul("/",initial_slashes) + path;
-        
-        if(path.empty()) return ".";
-        return path;
-    }
-    
-    std::string normpath(const std::string & path)
-    {
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	// Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A\B.
+	std::string normpath_nt(const std::string & p)
+	{
+		std::string path = p;
+		path = pystring::replace(path, "/","\\");
+		
+		std::string prefix;
+		splitdrive_nt(prefix, path, path);
+		
+		// We need to be careful here. If the prefix is empty, and the path starts
+		// with a backslash, it could either be an absolute path on the current
+		// drive (\dir1\dir2\file) or a UNC filename (\\server\mount\dir1\file). It
+		// is therefore imperative NOT to collapse multiple backslashes blindly in
+		// that case.
+		// The code below preserves multiple backslashes when there is no drive
+		// letter. This means that the invalid filename \\\a\b is preserved
+		// unchanged, where a\\\b is normalised to a\b. It's not clear that there
+		// is any better behaviour for such edge cases.
+		
+		if(prefix.empty())
+		{
+			// No drive letter - preserve initial backslashes
+			while(pystring::slice(path,0,1) == "\\")
+			{
+				prefix = prefix + "\\";
+				path = pystring::slice(path,1);
+			}
+		}
+		else
+		{
+			// We have a drive letter - collapse initial backslashes
+			if(pystring::startswith(path, "\\"))
+			{
+				prefix = prefix + "\\";
+				path = pystring::lstrip(path, "\\");
+			}
+		}
+		
+		std::vector<std::string> comps;
+		pystring::split(path, comps, "\\");
+		
+		int i = 0;
+		
+		while(i<(int)comps.size())
+		{
+			if(comps[i].empty() || comps[i] == ".")
+			{
+				comps.erase(comps.begin()+i);
+			}
+			else if(comps[i] == "..")
+			{
+				if(i>0 && comps[i-1] != "..")
+				{
+					comps.erase(comps.begin()+i-1, comps.begin()+i+1);
+					i -= 1;
+				}
+				else if(i == 0 && pystring::endswith(prefix, "\\"))
+				{
+					comps.erase(comps.begin()+i);
+				}
+				else
+				{
+					i += 1;
+				}
+			}
+			else
+			{
+				i += 1;
+			}
+		}
+		
+		// If the path is now empty, substitute '.'
+		if(prefix.empty() && comps.empty())
+		{
+			comps.push_back(".");
+		}
+		
+		return prefix + pystring::join("\\", comps);
+	}
+
+	// Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
+	// It should be understood that this may change the meaning of the path
+	// if it contains symbolic links!
+	// Normalize path, eliminating double slashes, etc.
+
+	std::string normpath_posix(const std::string & p)
+	{
+		if(p.empty()) return ".";
+		
+		std::string path = p;
+		
+		int initial_slashes = pystring::startswith(path,"/") ? 1 : 0;
+		
+		// POSIX allows one or two initial slashes, but treats three or more
+		// as single slash.
+		
+		if (initial_slashes && pystring::startswith(path,"//")
+			&& !pystring::startswith(path,"///"))
+			initial_slashes = 2;
+		
+		std::vector<std::string> comps, new_comps;
+		pystring::split(path, comps, "/");
+		
+		for(unsigned int i=0; i<comps.size(); ++i)
+		{
+			std::string comp = comps[i];
+			if(comp.empty() || comp == ".")
+				continue;
+			
+			if( (comp != "..") || ((initial_slashes == 0) && new_comps.empty()) ||
+				(!new_comps.empty() && new_comps[new_comps.size()-1] == ".."))
+			{
+				new_comps.push_back(comp);
+			}
+			else if (!new_comps.empty())
+			{
+				new_comps.pop_back();
+			}
+		}
+		
+		path = pystring::join("/", new_comps);
+		
+		if (initial_slashes > 0)
+			path = pystring::mul("/",initial_slashes) + path;
+		
+		if(path.empty()) return ".";
+		return path;
+	}
+	
+	std::string normpath(const std::string & path)
+	{
 #ifdef WINDOWS
-        return normpath_nt(path);
+		return normpath_nt(path);
 #else
-        return normpath_posix(path);
+		return normpath_posix(path);
 #endif
-    }
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	// Split the extension from a pathname.
+	// Extension is everything from the last dot to the end, ignoring
+	// leading dots.  Returns "(root, ext)"; ext may be empty.
+	// It is always true that root + ext == p
+
+	void splitext_generic(std::string & root, std::string & ext,
+						  const std::string & p,
+						  const std::string & sep,
+						  const std::string & altsep,
+						  const std::string & extsep)
+	{
+		int sepIndex = pystring::rfind(p, sep);
+		if(!altsep.empty())
+		{
+			int altsepIndex = pystring::rfind(p, altsep);
+			sepIndex = std::max(sepIndex, altsepIndex);
+		}
+
+		int dotIndex = pystring::rfind(p, extsep);
+		if(dotIndex > sepIndex)
+		{
+			// Skip all leading dots
+			int filenameIndex = sepIndex + 1;
+
+			while(filenameIndex < dotIndex)
+			{
+				if(pystring::slice(p,filenameIndex) != extsep)
+				{
+					root = pystring::slice(p, 0, dotIndex);
+					ext = pystring::slice(p, dotIndex);
+					return;
+				}
+
+				filenameIndex += 1;
+			}
+		}
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Split the extension from a pathname.
-    // Extension is everything from the last dot to the end, ignoring
-    // leading dots.  Returns "(root, ext)"; ext may be empty.
-    // It is always true that root + ext == p
-
-    void splitext_generic(std::string & root, std::string & ext,
-                          const std::string & p,
-                          const std::string & sep,
-                          const std::string & altsep,
-                          const std::string & extsep)
-    {
-        int sepIndex = pystring::rfind(p, sep);
-        if(!altsep.empty())
-        {
-            int altsepIndex = pystring::rfind(p, altsep);
-            sepIndex = std::max(sepIndex, altsepIndex);
-        }
-
-        int dotIndex = pystring::rfind(p, extsep);
-        if(dotIndex > sepIndex)
-        {
-            // Skip all leading dots
-            int filenameIndex = sepIndex + 1;
-
-            while(filenameIndex < dotIndex)
-            {
-                if(pystring::slice(p,filenameIndex) != extsep)
-                {
-                    root = pystring::slice(p, 0, dotIndex);
-                    ext = pystring::slice(p, dotIndex);
-                    return;
-                }
-
-                filenameIndex += 1;
-            }
-        }
-
-        root = p;
-        ext = "";
-    }
-
-    void splitext_nt(std::string & root, std::string & ext, const std::string & path)
-    {
-        return splitext_generic(root, ext, path,
-                                "\\", "/", ".");
-    }
-
-    void splitext_posix(std::string & root, std::string & ext, const std::string & path)
-    {
-        return splitext_generic(root, ext, path,
-                                "/", "", ".");
-    }
+		root = p;
+		ext = "";
+	}
+
+	void splitext_nt(std::string & root, std::string & ext, const std::string & path)
+	{
+		return splitext_generic(root, ext, path,
+								"\\", "/", ".");
+	}
+
+	void splitext_posix(std::string & root, std::string & ext, const std::string & path)
+	{
+		return splitext_generic(root, ext, path,
+								"/", "", ".");
+	}
 
-    void splitext(std::string & root, std::string & ext, const std::string & path)
-    {
+	void splitext(std::string & root, std::string & ext, const std::string & path)
+	{
 #ifdef WINDOWS
-        return splitext_nt(root, ext, path);
+		return splitext_nt(root, ext, path);
 #else
-        return splitext_posix(root, ext, path);
+		return splitext_posix(root, ext, path);
 #endif
-    }
+	}
 
 } // namespace path
 } // namespace os
diff -Nru opencolorio-1.0.9~dfsg0/src/core/AllocationTransform.cpp opencolorio-1.1.0~dfsg0/src/core/AllocationTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/AllocationTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/AllocationTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -149,9 +149,23 @@
     
     std::ostream& operator<< (std::ostream& os, const AllocationTransform& t)
     {
+        Allocation allocation(t.getAllocation());
+        int numVars(t.getNumVars());
+        std::vector<float> vars(numVars);
+        t.getVars(&vars[0]);
+
         os << "<AllocationTransform ";
-        os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "direction=" << TransformDirectionToString(t.getDirection());
+        if (numVars)
+        {
+            os << ", allocation=" << AllocationToString(allocation) << ", ";
+            os << "vars=" << vars[0];
+            for (int i = 1; i < numVars; ++i)
+            {
+                os << " " << vars[i];
+            }
+        }
+        os << ">";
         
         return os;
     }
diff -Nru opencolorio-1.0.9~dfsg0/src/core/CDLTransform.cpp opencolorio-1.1.0~dfsg0/src/core/CDLTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/CDLTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/CDLTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -256,21 +256,26 @@
             os << "Null cccRootElement.";
             throw Exception(os.str().c_str());
         }
-            
-        if(std::string(cccRootElement->Value()) != "ColorCorrectionCollection")
+        
+        std::string rootElementType(cccRootElement->Value());
+        bool isCDL = (rootElementType == "ColorDecisionList");
+        const char* container = isCDL ? "ColorDecision" : "ColorCorrection";
+        
+        if(!isCDL && rootElementType != "ColorCorrectionCollection")
         {
             std::ostringstream os;
             os << "GetCDLTransforms Error. ";
-            os << "Root element is type '" << cccRootElement->Value() << "', ";
-            os << "ColorCorrectionCollection expected.";
+            os << "Root element is type '" << rootElementType << "', ";
+            os << "ColorDecisionList or ColorCorrectionCollection expected.";
             throw Exception(os.str().c_str());
         }
         
-        TiXmlNode * child = cccRootElement->FirstChild("ColorCorrection");
+        TiXmlNode * child = cccRootElement->FirstChild(container);
         while(child)
         {
+            TiXmlNode * xmlNode= (isCDL) ? child->FirstChild("ColorCorrection") : child;
             CDLTransformRcPtr transform = CDLTransform::Create();
-            LoadCDL(transform.get(), child->ToElement());
+            LoadCDL(transform.get(), xmlNode->ToElement());
             
             transformVec.push_back(transform);
             
@@ -290,7 +295,7 @@
                 transformMap[id] = transform;
             }
             
-            child = child->NextSibling("ColorCorrection");
+            child = child->NextSibling(container);
         }
     }
     
@@ -776,18 +781,16 @@
         float sop[9];
         t.getSOP(sop);
         
-        os << "<CDLTransform ";
-        os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << "sop=";
+        os << "<CDLTransform";
+        os << " direction=" << TransformDirectionToString(t.getDirection());
+        os << ", sop=";
         for (unsigned int i=0; i<9; ++i)
         {
             if(i!=0) os << " ";
             os << sop[i];
         }
-        os << ", ";
-        os << "sat=" << t.getSat() << ",";
-        os << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << ", sat=" << t.getSat();
+        os << ">";
         return os;
     }
     
diff -Nru opencolorio-1.0.9~dfsg0/src/core/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/core/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/core/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -4,8 +4,8 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/export/
     ${CMAKE_BINARY_DIR}/export/
-    ${EXTERNAL_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
+    ${EXTERNAL_INCLUDE_DIRS}
 )
 
 file(GLOB_RECURSE core_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp")
@@ -16,71 +16,97 @@
     ${CMAKE_BINARY_DIR}/export/OpenColorABI.h @ONLY)
 list(APPEND core_export_headers ${CMAKE_BINARY_DIR}/export/OpenColorABI.h)
 
+# Process all warnings as errors
+
+if(WIN32)
+    # On debug mode there are other kinds of warning...
+    if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+        set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+    endif()
+else()
+    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
+endif()
+
 # SHARED
 
 if(OCIO_BUILD_SHARED)
-    add_library(OpenColorIO SHARED ${core_src_files})
+    add_library(OpenColorIO SHARED ${EXTERNAL_OBJECTS} ${core_src_files})
 
     if(USE_EXTERNAL_TINYXML)
         target_link_libraries(OpenColorIO ${TINYXML_LIBRARIES})
     else(USE_EXTERNAL_TINYXML)
-        add_dependencies(OpenColorIO tinyxml)
+        add_dependencies(OpenColorIO TINYXML_LIB)
     endif(USE_EXTERNAL_TINYXML)
 
     if(USE_EXTERNAL_YAML)
         target_link_libraries(OpenColorIO ${YAML_CPP_LIBRARIES})
     else(USE_EXTERNAL_YAML)
-        add_dependencies(OpenColorIO YAML_CPP_LOCAL)
+        add_dependencies(OpenColorIO YAML_CPP_LIB)
+    endif()
+
+    if(EXTERNAL_LIBRARIES)
+        target_link_libraries(OpenColorIO ${EXTERNAL_LIBRARIES})
     endif()
 
     if(WIN32)
-        target_link_libraries(OpenColorIO
-            debug ${EXTERNAL_DEBUG_LIBRARIES}
-            optimized ${EXTERNAL_OPTIMIZED_LIBRARIES}
-            general ${EXTERNAL_GENERAL_LIBRARIES})
-    else()
-        target_link_libraries(OpenColorIO ${EXTERNAL_GENERAL_LIBRARIES})
+        # Mute a design issue where the Exception public class inherits 
+        # from a STL Exception. STL classes are never supposed to
+        # be exported among different dynamic libraries.
+        set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /wd4275")
     endif()
+
     set_target_properties(OpenColorIO PROPERTIES
         OUTPUT_NAME OpenColorIO
-        COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS}"
-        LINK_FLAGS "${EXTERNAL_LINK_FLAGS}")
+        COMPILE_FLAGS   "${EXTERNAL_COMPILE_FLAGS}"
+        LINK_FLAGS      "${EXTERNAL_LINK_FLAGS}")
     
     message(STATUS "Setting OCIO SOVERSION to: ${SOVERSION}")
     set_target_properties(OpenColorIO PROPERTIES
         VERSION ${OCIO_VERSION}
         SOVERSION ${SOVERSION})
     
-    install(TARGETS OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX})
+    install(TARGETS OpenColorIO EXPORT OpenColorIO 
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/bin
+    )
 endif()
 
 # STATIC
 
 if(OCIO_BUILD_STATIC)
     list(REMOVE_ITEM core_src_files ${CMAKE_SOURCE_DIR}/src/core/UnitTest.cpp)
-    add_library(OpenColorIO_STATIC STATIC ${core_src_files})
-    add_dependencies(OpenColorIO_STATIC tinyxml YAML_CPP_LOCAL)
-    if(WIN32)
-        target_link_libraries(OpenColorIO_STATIC
-            debug ${EXTERNAL_DEBUG_LIBRARIES}
-            optimized ${EXTERNAL_OPTIMIZED_LIBRARIES}
-            general ${EXTERNAL_GENERAL_LIBRARIES})
-    else()
-        target_link_libraries(OpenColorIO_STATIC ${EXTERNAL_GENERAL_LIBRARIES})
+    add_library(OpenColorIO_STATIC STATIC ${EXTERNAL_OBJECTS} ${core_src_files})
+    add_dependencies(OpenColorIO_STATIC TINYXML_LIB YAML_CPP_LIB)
+    if(EXTERNAL_LIBRARIES)
+        target_link_libraries(OpenColorIO_STATIC ${EXTERNAL_LIBRARIES})
     endif()
+    
+	set_target_properties(OpenColorIO_STATIC PROPERTIES COMPILE_DEFINITIONS "OpenColorIO_STATIC")
     set_target_properties(OpenColorIO_STATIC PROPERTIES
-        OUTPUT_NAME OpenColorIO
-        COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS}"
-        LINK_FLAGS "${EXTERNAL_LINK_FLAGS}")
+        OUTPUT_NAME                 OpenColorIO
+        ARCHIVE_OUTPUT_DIRECTORY    "${CMAKE_CURRENT_BINARY_DIR}/static"
+        COMPILE_FLAGS               "${EXTERNAL_COMPILE_FLAGS}"
+        LINK_FLAGS                  "${EXTERNAL_LINK_FLAGS}")
     
     message(STATUS "Setting OCIO SOVERSION to: ${SOVERSION}")
     set_target_properties(OpenColorIO_STATIC PROPERTIES
         VERSION ${OCIO_VERSION}
         SOVERSION ${SOVERSION})
     
-    install(TARGETS OpenColorIO_STATIC DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib)
+    install(TARGETS OpenColorIO_STATIC EXPORT OpenColorIO ARCHIVE DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/static)
 endif()
 
+macro(target_link_OCIO target)
+    if(OCIO_BUILD_SHARED)
+        target_link_libraries(${target} OpenColorIO         ${ARGN})
+    elseif(OCIO_BUILD_STATIC)
+        target_link_libraries(${target} OpenColorIO_STATIC  ${ARGN})
+        set_target_properties(${target} PROPERTIES COMPILE_DEFINITIONS OpenColorIO_STATIC)
+    endif()
+endmacro()
+
+
 # public interface
 install(FILES ${core_export_headers}
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
diff -Nru opencolorio-1.0.9~dfsg0/src/core/ColorSpace.cpp opencolorio-1.1.0~dfsg0/src/core/ColorSpace.cpp
--- opencolorio-1.0.9~dfsg0/src/core/ColorSpace.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/ColorSpace.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -244,25 +244,37 @@
     
     std::ostream& operator<< (std::ostream& os, const ColorSpace& cs)
     {
+        int numVars(cs.getAllocationNumVars());
+        std::vector<float> vars(numVars);
+        cs.getAllocationVars(&vars[0]);
+
         os << "<ColorSpace ";
         os << "name=" << cs.getName() << ", ";
         os << "family=" << cs.getFamily() << ", ";
         os << "equalityGroup=" << cs.getEqualityGroup() << ", ";
         os << "bitDepth=" << BitDepthToString(cs.getBitDepth()) << ", ";
-        os << "isData=" << BoolToString(cs.isData()) << ", ";
-        os << "allocation=" << AllocationToString(cs.getAllocation()) << ", ";
-        os << ">\n";
+        os << "isData=" << BoolToString(cs.isData());
+        if (numVars)
+        {
+            os << ", allocation=" << AllocationToString(cs.getAllocation()) << ", ";
+            os << "vars=" << vars[0];
+            for (int i = 1; i < numVars; ++i)
+            {
+                os << " " << vars[i];
+            }
+        }
+        os << ">";
         
         if(cs.getTransform(COLORSPACE_DIR_TO_REFERENCE))
         {
-            os << "\t" << cs.getName() << " --> Reference\n";
-            os << cs.getTransform(COLORSPACE_DIR_TO_REFERENCE);
+            os << "\n    " << cs.getName() << " --> Reference";
+            os << "\n\t" << *cs.getTransform(COLORSPACE_DIR_TO_REFERENCE);
         }
         
         if(cs.getTransform(COLORSPACE_DIR_FROM_REFERENCE))
         {
-            os << "\tReference --> " << cs.getName() << "\n";
-            os << cs.getTransform(COLORSPACE_DIR_FROM_REFERENCE);
+            os << "\n    Reference --> " << cs.getName();
+            os << "\n\t" << *cs.getTransform(COLORSPACE_DIR_FROM_REFERENCE);
         }
         return os;
     }
diff -Nru opencolorio-1.0.9~dfsg0/src/core/ColorSpaceTransform.cpp opencolorio-1.1.0~dfsg0/src/core/ColorSpaceTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/ColorSpaceTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/ColorSpaceTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -130,7 +130,9 @@
     {
         os << "<ColorSpaceTransform ";
         os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "src=" << t.getSrc() << ", ";
+        os << "dst=" << t.getDst();
+        os << ">";
         return os;
     }
     
@@ -150,13 +152,13 @@
         
         if(combinedDir == TRANSFORM_DIR_FORWARD)
         {
-            src = config.getColorSpace( colorSpaceTransform.getSrc() );
-            dst = config.getColorSpace( colorSpaceTransform.getDst() );
+            src = config.getColorSpace( context->resolveStringVar( colorSpaceTransform.getSrc() ) );
+            dst = config.getColorSpace( context->resolveStringVar( colorSpaceTransform.getDst() ) );
         }
         else if(combinedDir == TRANSFORM_DIR_INVERSE)
         {
-            dst = config.getColorSpace( colorSpaceTransform.getSrc() );
-            src = config.getColorSpace( colorSpaceTransform.getDst() );
+            dst = config.getColorSpace( context->resolveStringVar( colorSpaceTransform.getSrc() ) );
+            src = config.getColorSpace( context->resolveStringVar( colorSpaceTransform.getDst() ) );
         }
         
         BuildColorSpaceOps(ops, config, context, src, dst);
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Config.cpp opencolorio-1.1.0~dfsg0/src/core/Config.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Config.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Config.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -40,6 +40,7 @@
 #include "HashUtils.h"
 #include "Logging.h"
 #include "LookParse.h"
+#include "Display.h"
 #include "MathUtils.h"
 #include "Mutex.h"
 #include "OpBuilders.h"
@@ -49,6 +50,7 @@
 #include "PrivateTypes.h"
 #include "pystring/pystring.h"
 #include "OCIOYaml.h"
+#include "Platform.h"
 
 OCIO_NAMESPACE_ENTER
 {
@@ -131,20 +133,21 @@
     {
     
     // Environment
-    std::string LookupEnvironment(const StringMap & env, const std::string & name)
+    const char* LookupEnvironment(const StringMap & env,
+                                        const std::string & name)
     {
         StringMap::const_iterator iter = env.find(name);
         if(iter == env.end()) return "";
-        return iter->second;
+        return iter->second.c_str();
     }
     
     // Roles
     // (lower case role name: colorspace name)
-    std::string LookupRole(const StringMap & roles, const std::string & rolename)
+    const char* LookupRole(const StringMap & roles, const std::string & rolename)
     {
         StringMap::const_iterator iter = roles.find(pystring::lower(rolename));
         if(iter == roles.end()) return "";
-        return iter->second;
+        return iter->second.c_str();
     }
     
     
@@ -208,7 +211,6 @@
         if(csname.empty()) return false;
         
         std::string csnamelower = pystring::lower(csname);
-        
         for(unsigned int i = 0; i < colorspaces.size(); ++i)
         {
             if(csnamelower == pystring::lower(colorspaces[i]->getName()))
@@ -220,184 +222,7 @@
         
         return false;
     }
-    
-    
-    // Displays
-    struct View
-    {
-        std::string name;
-        std::string colorspace;
-        std::string looks;
-        
-        View() { }
-        
-        View(const std::string & name_,
-             const std::string & colorspace_,
-             const std::string & looksList_) :
-                name(name_),
-                colorspace(colorspace_),
-                looks(looksList_)
-        { }
-    };
-    
-    typedef std::vector<View> ViewVec;
-    typedef std::map<std::string, ViewVec> DisplayMap;  // (display name : ViewVec)
-    
-    void operator >> (const YAML::Node& node, View& v)
-    {
-        if(node.Tag() != "View")
-            return;
-        
-        std::string key, stringval;
-        
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
-        {
-            iter.first() >> key;
-            
-            if(key == "name")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    v.name = stringval;
-            }
-            else if(key == "colorspace")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    v.colorspace = stringval;
-            }
-            else if(key == "looks" || key == "look")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    v.looks = stringval;
-            }
-            else
-            {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
-            }
-        }
-        
-        if(v.name.empty())
-        {
-            throw Exception("View does not specify 'name'.");
-        }
-        if(v.colorspace.empty())
-        {
-            std::ostringstream os;
-            os << "View '" << v.name << "' ";
-            os << "does not specify colorspace.";
-            throw Exception(os.str().c_str());
-        }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, View view)
-    {
-        out << YAML::VerbatimTag("View");
-        out << YAML::Flow;
-        out << YAML::BeginMap;
-        out << YAML::Key << "name" << YAML::Value << view.name;
-        out << YAML::Key << "colorspace" << YAML::Value << view.colorspace;
-        if(!view.looks.empty()) out << YAML::Key << "looks" << YAML::Value << view.looks;
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    DisplayMap::iterator find_display(DisplayMap & displays, const std::string & display)
-    {
-        for(DisplayMap::iterator iter = displays.begin();
-            iter != displays.end();
-            ++iter)
-        {
-            if(StrEqualsCaseIgnore(display, iter->first)) return iter;
-        }
-        return displays.end();
-    }
-    
-    DisplayMap::const_iterator find_display_const(const DisplayMap & displays, const std::string & display)
-    {
-        for(DisplayMap::const_iterator iter = displays.begin();
-            iter != displays.end();
-            ++iter)
-        {
-            if(StrEqualsCaseIgnore(display, iter->first)) return iter;
-        }
-        return displays.end();
-    }
-    
-    int find_view(const ViewVec & vec, const std::string & name)
-    {
-        for(unsigned int i=0; i<vec.size(); ++i)
-        {
-            if(StrEqualsCaseIgnore(name, vec[i].name)) return i;
-        }
-        return -1;
-    }
-    
-    void AddDisplay(DisplayMap & displays,
-                    const std::string & display,
-                    const std::string & view,
-                    const std::string & colorspace,
-                    const std::string & looks)
-    {
-        DisplayMap::iterator iter = find_display(displays, display);
-        if(iter == displays.end())
-        {
-            ViewVec views;
-            views.push_back( View(view, colorspace, looks) );
-            displays[display] = views;
-        }
-        else
-        {
-            ViewVec & views = iter->second;
-            int index = find_view(views, view);
-            if(index<0)
-            {
-                views.push_back( View(view, colorspace, looks) );
-            }
-            else
-            {
-                views[index].colorspace = colorspace;
-                views[index].looks = looks;
-            }
-        }
-    }
-    
-    void ComputeDisplays(StringVec & displayCache,
-                         const DisplayMap & displays,
-                         const StringVec & activeDisplays,
-                         const StringVec & activeDisplaysEnvOverride)
-    {
-        displayCache.clear();
-        
-        StringVec displayMasterList;
-        for(DisplayMap::const_iterator iter = displays.begin();
-            iter != displays.end();
-            ++iter)
-        {
-            displayMasterList.push_back(iter->first);
-        }
-        
-        // Apply the env override if it's not empty.
-        if(!activeDisplaysEnvOverride.empty())
-        {
-            displayCache = IntersectStringVecsCaseIgnore(displayMasterList, activeDisplaysEnvOverride);
-            if(!displayCache.empty()) return;
-        }
-        // Otherwise, aApply the active displays if it's not empty.
-        else if(!activeDisplays.empty())
-        {
-            displayCache = IntersectStringVecsCaseIgnore(displayMasterList, activeDisplays);
-            if(!displayCache.empty()) return;
-        }
         
-        displayCache = displayMasterList;
-    }
-    
-    
-    
     } // namespace
     
     class Config::Impl
@@ -431,16 +256,20 @@
         mutable StringMap cacheids_;
         mutable std::string cacheidnocontext_;
         
+        OCIOYaml io_;
+        
         Impl() : 
             context_(Context::Create()),
             strictParsing_(true),
             sanity_(SANITY_UNKNOWN)
         {
-            char* activeDisplays = std::getenv(OCIO_ACTIVE_DISPLAYS_ENVVAR);
-            SplitStringEnvStyle(activeDisplaysEnvOverride_, activeDisplays);
-            
-            char * activeViews = std::getenv(OCIO_ACTIVE_VIEWS_ENVVAR);
-            SplitStringEnvStyle(activeViewsEnvOverride_, activeViews);
+            std::string activeDisplays;
+            Platform::getenv(OCIO_ACTIVE_DISPLAYS_ENVVAR, activeDisplays);
+            SplitStringEnvStyle(activeDisplaysEnvOverride_, activeDisplays.c_str());
+            
+            std::string activeViews;
+            Platform::getenv(OCIO_ACTIVE_VIEWS_ENVVAR, activeViews);
+            SplitStringEnvStyle(activeViewsEnvOverride_, activeViews.c_str());
             
             defaultLumaCoefs_.resize(3);
             defaultLumaCoefs_[0] = DEFAULT_LUMA_COEFF_R;
@@ -455,50 +284,51 @@
         
         Impl& operator= (const Impl & rhs)
         {
-            env_ = rhs.env_;
-            context_ = rhs.context_->createEditableCopy();
-            description_ = rhs.description_;
-            
-            // Deep copy the colorspaces
-            colorspaces_.clear();
-            colorspaces_.reserve(rhs.colorspaces_.size());
-            for(unsigned int i=0; i<rhs.colorspaces_.size(); ++i)
+            if(this!=&rhs)
             {
-                colorspaces_.push_back(rhs.colorspaces_[i]->createEditableCopy());
-            }
-            
-            // Deep copy the looks
-            looksList_.clear();
-            looksList_.reserve(rhs.looksList_.size());
-            for(unsigned int i=0; i<rhs.looksList_.size(); ++i)
-            {
-                looksList_.push_back(rhs.looksList_[i]->createEditableCopy());
+                env_ = rhs.env_;
+                context_ = rhs.context_->createEditableCopy();
+                description_ = rhs.description_;
+                
+                // Deep copy the colorspaces
+                colorspaces_.clear();
+                colorspaces_.reserve(rhs.colorspaces_.size());
+                for(unsigned int i=0; i<rhs.colorspaces_.size(); ++i)
+                {
+                    colorspaces_.push_back(rhs.colorspaces_[i]->createEditableCopy());
+                }
+                
+                // Deep copy the looks
+                looksList_.clear();
+                looksList_.reserve(rhs.looksList_.size());
+                for(unsigned int i=0; i<rhs.looksList_.size(); ++i)
+                {
+                    looksList_.push_back(rhs.looksList_[i]->createEditableCopy());
+                }
+                
+                // Assignment operator will suffice for these
+                roles_ = rhs.roles_;
+                
+                displays_ = rhs.displays_;
+                activeDisplays_ = rhs.activeDisplays_;
+                activeViews_ = rhs.activeViews_;
+                activeViewsEnvOverride_ = rhs.activeViewsEnvOverride_;
+                activeDisplaysEnvOverride_ = rhs.activeDisplaysEnvOverride_;
+                activeDisplaysStr_ = rhs.activeDisplaysStr_;
+                displayCache_ = rhs.displayCache_;
+                
+                defaultLumaCoefs_ = rhs.defaultLumaCoefs_;
+                strictParsing_ = rhs.strictParsing_;
+                
+                sanity_ = rhs.sanity_;
+                sanitytext_ = rhs.sanitytext_;
+                
+                cacheids_ = rhs.cacheids_;
+                cacheidnocontext_ = cacheidnocontext_;
             }
-            
-            // Assignment operator will suffice for these
-            roles_ = rhs.roles_;
-            
-            displays_ = rhs.displays_;
-            activeDisplays_ = rhs.activeDisplays_;
-            activeViews_ = rhs.activeViews_;
-            activeViewsEnvOverride_ = rhs.activeViewsEnvOverride_;
-            activeDisplaysEnvOverride_ = rhs.activeDisplaysEnvOverride_;
-            activeDisplaysStr_ = rhs.activeDisplaysStr_;
-            displayCache_ = rhs.displayCache_;
-            
-            defaultLumaCoefs_ = rhs.defaultLumaCoefs_;
-            strictParsing_ = rhs.strictParsing_;
-            
-            sanity_ = rhs.sanity_;
-            sanitytext_ = rhs.sanitytext_;
-            
-            cacheids_ = rhs.cacheids_;
-            cacheidnocontext_ = cacheidnocontext_;
             return *this;
         }
-        
-        void load(std::istream & istream, const char * name);
-        
+
         // Any time you modify the state of the config, you must call this
         // to reset internal cache states.  You also should do this in a
         // thread safe manner by acquiring the cacheidMutex_;
@@ -524,8 +354,9 @@
     
     ConstConfigRcPtr Config::CreateFromEnv()
     {
-        char* file = std::getenv(OCIO_CONFIG_ENVVAR);
-        if(file) return CreateFromFile(file);
+        std::string file;
+        Platform::getenv(OCIO_CONFIG_ENVVAR, file);
+        if(!file.empty()) return CreateFromFile(file.c_str());
         
         std::ostringstream os;
         os << "Color management disabled. ";
@@ -536,7 +367,7 @@
         istream.str(INTERNAL_RAW_PROFILE);
         
         ConfigRcPtr config = Config::Create();
-        config->getImpl()->load(istream, "");
+        config->getImpl()->io_.open(istream, config);
         return config;
     }
     
@@ -551,14 +382,14 @@
         }
         
         ConfigRcPtr config = Config::Create();
-        config->getImpl()->load(istream, filename);
+        config->getImpl()->io_.open(istream, config, filename);
         return config;
     }
     
     ConstConfigRcPtr Config::CreateFromStream(std::istream & istream)
     {
         ConfigRcPtr config = Config::Create();
-        config->getImpl()->load(istream, "");
+        config->getImpl()->io_.open(istream, config);
         return config;
     }
     
@@ -881,7 +712,7 @@
     
     const char * Config::getEnvironmentVarDefault(const char * name) const
     {
-        return LookupEnvironment(getImpl()->env_, name).c_str();
+        return LookupEnvironment(getImpl()->env_, name);
     }
     
     void Config::clearEnvironmentVars()
@@ -893,6 +724,27 @@
         getImpl()->resetCacheIDs();
     }
     
+    void Config::setEnvironmentMode(EnvironmentMode mode)
+    {
+        getImpl()->context_->setEnvironmentMode(mode);
+        
+        AutoMutex lock(getImpl()->cacheidMutex_);
+        getImpl()->resetCacheIDs();
+    }
+    
+    EnvironmentMode Config::getEnvironmentMode() const
+    {
+        return getImpl()->context_->getEnvironmentMode();
+    }
+    
+    void Config::loadEnvironment()
+    {
+        getImpl()->context_->loadEnvironment();
+        
+        AutoMutex lock(getImpl()->cacheidMutex_);
+        getImpl()->resetCacheIDs();
+    }
+    
     const char * Config::getSearchPath() const
     {
         return getImpl()->context_->getSearchPath();
@@ -951,7 +803,7 @@
     int Config::getIndexForColorSpace(const char * name) const
     {
         int csindex = -1;
-        
+
         // Check to see if the name is a color space
         if( FindColorSpaceIndex(&csindex, getImpl()->colorspaces_, name) )
         {
@@ -959,7 +811,7 @@
         }
         
         // Check to see if the name is a role
-        std::string csname = LookupRole(getImpl()->roles_, name);
+        const char* csname = LookupRole(getImpl()->roles_, name);
         if( FindColorSpaceIndex(&csindex, getImpl()->colorspaces_, csname) )
         {
             return csindex;
@@ -1059,8 +911,8 @@
         if(!getImpl()->strictParsing_)
         {
             // Is a default role defined?
-            std::string csname = LookupRole(getImpl()->roles_, ROLE_DEFAULT);
-            if(!csname.empty())
+            const char* csname = LookupRole(getImpl()->roles_, ROLE_DEFAULT);
+            if(csname && *csname)
             {
                 int csindex = -1;
                 if( FindColorSpaceIndex(&csindex, getImpl()->colorspaces_, csname) )
@@ -1117,7 +969,8 @@
     
     bool Config::hasRole(const char * role) const
     {
-        return LookupRole(getImpl()->roles_, role) == "" ? false : true;
+        const char* rname = LookupRole(getImpl()->roles_, role);
+        return  rname && *rname;
     }
     
     const char * Config::getRoleName(int index) const
@@ -1647,60 +1500,7 @@
     {
         try
         {
-            YAML::Emitter out;
-            out << YAML::Block;
-            out << YAML::BeginMap;
-            out << YAML::Key << "ocio_profile_version" << YAML::Value << 1;
-            out << YAML::Newline;
-            if(getImpl()->env_.size() > 0) {
-                out << YAML::Key << "environment";
-                out << YAML::Value << getImpl()->env_;
-                out << YAML::Newline;
-            }
-            out << YAML::Key << "search_path" << YAML::Value << getImpl()->context_->getSearchPath();
-            out << YAML::Key << "strictparsing" << YAML::Value << getImpl()->strictParsing_;
-            out << YAML::Key << "luma" << YAML::Value << YAML::Flow << getImpl()->defaultLumaCoefs_;
-            
-            if(getImpl()->description_ != "")
-            {
-                out << YAML::Newline;
-                out << YAML::Key << "description";
-                out << YAML::Value << getImpl()->description_;
-            }
-            
-            // Roles
-            out << YAML::Newline;
-            out << YAML::Key << "roles";
-            out << YAML::Value << getImpl()->roles_;
-            
-            // Displays
-            out << YAML::Newline;
-            out << YAML::Key << "displays";
-            out << YAML::Value << getImpl()->displays_;
-            out << YAML::Newline;
-            out << YAML::Key << "active_displays";
-            out << YAML::Value << YAML::Flow << getImpl()->activeDisplays_;
-            out << YAML::Key << "active_views";
-            out << YAML::Value << YAML::Flow << getImpl()->activeViews_;
-            
-            // Looks
-            if(!getImpl()->looksList_.empty())
-            {
-                out << YAML::Newline;
-                out << YAML::Key << "looks";
-                out << YAML::Value << getImpl()->looksList_;
-            }
-            
-            // ColorSpaces
-            {
-                out << YAML::Newline;
-                out << YAML::Key << "colorspaces";
-                out << YAML::Value << getImpl()->colorspaces_;
-            }
-            
-            out << YAML::EndMap;
-            
-            os << out.c_str();
+            getImpl()->io_.write(os, this);
         }
         catch( const std::exception & e)
         {
@@ -1710,246 +1510,6 @@
         }
     }
     
-    void Config::Impl::load(std::istream & istream, const char * filename)
-    {
-        try
-        {
-            YAML::Parser parser(istream);
-            YAML::Node node;
-            parser.GetNextDocument(node);
-            
-            // check profile version
-            int profile_version = 0;
-            if(node.FindValue("ocio_profile_version") == NULL)
-            {
-                std::ostringstream os;
-                os << "The specified file ";
-                os << "does not appear to be an OCIO configuration.";
-                throw Exception (os.str().c_str());
-            }
-            
-            node["ocio_profile_version"] >> profile_version;
-            if(profile_version > 1)
-            {
-                std::ostringstream os;
-                os << "This .ocio config ";
-                if(filename && *filename)
-                {
-                    os << " '" << filename << "' ";
-                }
-                os << "is version " << profile_version << ". ";
-                os << "This version of the OpenColorIO library (" << OCIO_VERSION ") ";
-                os << "is not known to be able to load this profile. ";
-                os << "An attempt will be made, but there are no guarantees that the ";
-                os << "results will be accurate. Continue at your own risk.";
-                LogWarning(os.str());
-            }
-            
-            
-            std::string key, stringval;
-            bool boolval = false;
-            EnvironmentMode mode = ENV_ENVIRONMENT_LOAD_ALL;
-            
-            for (YAML::Iterator iter = node.begin();
-                 iter != node.end();
-                 ++iter)
-            {
-                iter.first() >> key;
-                
-                if(key == "ocio_profile_version") { } // Already handled above.
-                else if(key == "environment")
-                {
-                    mode = ENV_ENVIRONMENT_LOAD_PREDEFINED;
-                    const YAML::Node& environment = iter.second();
-                    if(environment.Type() != YAML::NodeType::Map)
-                    {
-                        std::ostringstream os;
-                        os << "'environment' field needs to be a (name: key) map.";
-                        throw Exception(os.str().c_str());
-                    }
-                    for (YAML::Iterator it  = environment.begin();
-                                        it != environment.end(); ++it)
-                    {
-                        std::string k, v;
-                        it.first() >> k;
-                        it.second() >> v;
-                        env_[k] = v;
-                        context_->setStringVar(k.c_str(), v.c_str());
-                    }
-                }
-                else if(key == "search_path" || key == "resource_path")
-                {
-                    if (iter.second().Type() != YAML::NodeType::Null && 
-                        iter.second().Read<std::string>(stringval))
-                        context_->setSearchPath(stringval.c_str());
-                }
-                else if(key == "strictparsing")
-                {
-                    if (iter.second().Type() != YAML::NodeType::Null && 
-                        iter.second().Read<bool>(boolval))
-                        strictParsing_ = boolval;
-                }
-                else if(key == "description")
-                {
-                    if (iter.second().Type() != YAML::NodeType::Null && 
-                        iter.second().Read<std::string>(stringval))
-                        description_ = stringval;
-                }
-                else if(key == "luma")
-                {
-                    std::vector<float> val;
-                    if (iter.second().Type() != YAML::NodeType::Null)
-                    {
-                        iter.second() >> val;
-                        if(val.size() != 3)
-                        {
-                            std::ostringstream os;
-                            os << "'luma' field must be 3 ";
-                            os << "floats. Found '" << val.size() << "'.";
-                            throw Exception(os.str().c_str());
-                        }
-                        defaultLumaCoefs_ = val;
-                    }
-                }
-                else if(key == "roles")
-                {
-                    const YAML::Node& roles = iter.second();
-                    if(roles.Type() != YAML::NodeType::Map)
-                    {
-                        std::ostringstream os;
-                        os << "'roles' field needs to be a (name: key) map.";
-                        throw Exception(os.str().c_str());
-                    }
-                    for (YAML::Iterator it  = roles.begin();
-                                        it != roles.end(); ++it)
-                    {
-                        std::string k, v;
-                        it.first() >> k;
-                        it.second() >> v;
-                        roles_[pystring::lower(k)] = v;
-                    }
-                }
-                else if(key == "displays")
-                {
-                    if (iter.second().Type() != YAML::NodeType::Null)
-                    {
-                        iter.second() >> displays_;
-                    }
-                }
-                else if(key == "active_displays")
-                {
-                    if (iter.second().Type() != YAML::NodeType::Null)
-                    {
-                        iter.second() >> activeDisplays_;
-                    }
-                }
-                else if(key == "active_views")
-                {
-                    if (iter.second().Type() != YAML::NodeType::Null)
-                    {
-                        iter.second() >> activeViews_;
-                    }
-                }
-                else if(key == "colorspaces")
-                {
-                    const YAML::Node& colorspaces = iter.second();
-                    
-                    if(colorspaces.Type() != YAML::NodeType::Sequence)
-                    {
-                        std::ostringstream os;
-                        os << "'colorspaces' field needs to be a (- !<ColorSpace>) list.";
-                        throw Exception(os.str().c_str());
-                    }
-                    
-                    for(unsigned i = 0; i < colorspaces.size(); ++i)
-                    {
-                        if(colorspaces[i].Tag() == "ColorSpace")
-                        {
-                            ColorSpaceRcPtr cs = ColorSpace::Create();
-                            colorspaces[i] >> cs;
-                            colorspaces_.push_back( cs );
-                        }
-                        else
-                        {
-                            std::ostringstream os;
-                            os << "Unknown element found in colorspaces:";
-                            os << colorspaces[i].Tag() << ". Only ColorSpace(s)";
-                            os << " currently handled.";
-                            LogWarning(os.str());
-                        }
-                    }
-                }
-                else if(key == "looks")
-                {
-                    const YAML::Node& looks = iter.second();
-                    
-                    if(looks.Type() != YAML::NodeType::Sequence)
-                    {
-                        std::ostringstream os;
-                        os << "'looks' field needs to be a (- !<Look>) list.";
-                        throw Exception(os.str().c_str());
-                    }
-                    
-                    for(unsigned i = 0; i < looks.size(); ++i)
-                    {
-                        if(looks[i].Tag() == "Look")
-                        {
-                            LookRcPtr look = Look::Create();
-                            looks[i] >> look;
-                            looksList_.push_back( look );
-                        }
-                        else
-                        {
-                            std::ostringstream os;
-                            os << "Unknown element found in looks:";
-                            os << looks[i].Tag() << ". Only Look(s)";
-                            os << " currently handled.";
-                            LogWarning(os.str());
-                        }
-                    }
-                }
-                else
-                {
-                    LogUnknownKeyWarning("profile", iter.first());
-                }
-            }
-            
-            if(filename)
-            {
-                std::string realfilename = pystring::os::path::abspath(filename);
-                std::string configrootdir = pystring::os::path::dirname(realfilename);
-                context_->setWorkingDir(configrootdir.c_str());
-            }
-            
-            context_->setEnvironmentMode(mode);
-            context_->loadEnvironment();
-            
-            if(mode == ENV_ENVIRONMENT_LOAD_ALL)
-            {
-                std::ostringstream os;
-                os << "This .ocio config ";
-                if(filename && *filename)
-                {
-                    os << " '" << filename << "' ";
-                }
-                os << "has no environment section defined. The default behaviour is to ";
-                os << "load all environment variables (" << context_->getNumStringVars() << ")";
-                os << ", which reduces the efficiency of OCIO's caching. Considering ";
-                os << "predefining the environment variables used.";
-                LogDebug(os.str());
-            }
-            
-        }
-        catch( const std::exception & e)
-        {
-            std::ostringstream os;
-            os << "Error: Loading the OCIO profile ";
-            if(filename) os << "'" << filename << "' ";
-            os << "failed. " << e.what();
-            throw Exception(os.str().c_str());
-        }
-    }
-    
     void Config::Impl::resetCacheIDs()
     {
         cacheids_.clear();
@@ -2064,7 +1624,7 @@
 {
     std::istringstream is;
     is.str(OCIO::INTERNAL_RAW_PROFILE);
-    OIIO_CHECK_NO_THOW(OCIO::ConstConfigRcPtr config = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(OCIO::ConstConfigRcPtr config = OCIO::Config::CreateFromStream(is));
 }
 
 OIIO_ADD_TEST(Config, SimpleConfig)
@@ -2138,7 +1698,7 @@
     std::istringstream is;
     is.str(SIMPLE_PROFILE);
     OCIO::ConstConfigRcPtr config;
-    OIIO_CHECK_NO_THOW(config = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
 }
 
 OIIO_ADD_TEST(Config, Roles)
@@ -2163,7 +1723,7 @@
     std::istringstream is;
     is.str(SIMPLE_PROFILE);
     OCIO::ConstConfigRcPtr config;
-    OIIO_CHECK_NO_THOW(config = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
     
     OIIO_CHECK_EQUAL(config->getNumRoles(), 3);
     
@@ -2287,9 +1847,7 @@
     std::istringstream is;
     is.str(SIMPLE_PROFILE);
     OCIO::ConstConfigRcPtr config;
-    OIIO_CHECK_NO_THOW(config = OCIO::Config::CreateFromStream(is));
-    
-    OIIO_CHECK_THOW(config->sanityCheck(), OCIO::Exception);
+    OIIO_CHECK_THROW(config = OCIO::Config::CreateFromStream(is), OCIO::Exception);
     }
     
     {
@@ -2309,9 +1867,9 @@
     std::istringstream is;
     is.str(SIMPLE_PROFILE);
     OCIO::ConstConfigRcPtr config;
-    OIIO_CHECK_NO_THOW(config = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
     
-    OIIO_CHECK_NO_THOW(config->sanityCheck());
+    OIIO_CHECK_NO_THROW(config->sanityCheck());
     }
 }
 
@@ -2330,8 +1888,6 @@
     "colorspaces:\n"
     "  - !<ColorSpace>\n"
     "      name: raw\n"
-    "  - !<ColorSpace>\n"
-    "      name: raw\n"
     "strictparsing: false\n"
     "roles:\n"
     "  default: raw\n"
@@ -2345,8 +1901,6 @@
     "colorspaces:\n"
     "  - !<ColorSpace>\n"
     "      name: raw\n"
-    "  - !<ColorSpace>\n"
-    "      name: raw\n"
     "strictparsing: false\n"
     "roles:\n"
     "  default: raw\n"
@@ -2364,13 +1918,12 @@
     std::istringstream is;
     is.str(SIMPLE_PROFILE);
     OCIO::ConstConfigRcPtr config;
-    OIIO_CHECK_NO_THOW(config = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
     OIIO_CHECK_EQUAL(config->getNumEnvironmentVars(), 5);
     OIIO_CHECK_ASSERT(strcmp(config->getCurrentContext()->resolveStringVar("test${test}"),
         "testbarchedder") == 0);
     OIIO_CHECK_ASSERT(strcmp(config->getCurrentContext()->resolveStringVar("${SHOW}"),
         "bar") == 0);
-    OIIO_CHECK_THOW(config->sanityCheck(), OCIO::Exception);
     OIIO_CHECK_ASSERT(strcmp(config->getEnvironmentVarDefault("SHOW"), "super") == 0);
     
     OCIO::ConfigRcPtr edit = config->createEditableCopy();
@@ -2398,11 +1951,129 @@
     OCIO::SetLoggingLevel(OCIO::LOGGING_LEVEL_DEBUG);
     is.str(SIMPLE_PROFILE2);
     OCIO::ConstConfigRcPtr noenv;
-    OIIO_CHECK_NO_THOW(noenv = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(noenv = OCIO::Config::CreateFromStream(is));
     OIIO_CHECK_ASSERT(strcmp(noenv->getCurrentContext()->resolveStringVar("${TASK}"),
         "lighting") == 0);
     OCIO::SetLoggingLevel(loglevel);
     
+    OIIO_CHECK_EQUAL(edit->getEnvironmentMode(), OCIO::ENV_ENVIRONMENT_LOAD_PREDEFINED);
+    edit->setEnvironmentMode(OCIO::ENV_ENVIRONMENT_LOAD_ALL);
+    OIIO_CHECK_EQUAL(edit->getEnvironmentMode(), OCIO::ENV_ENVIRONMENT_LOAD_ALL);
+    
+    }
+}
+
+OIIO_ADD_TEST(Config, RoleWithoutColorSpace)
+{
+    OCIO::ConfigRcPtr config = OCIO::Config::Create()->createEditableCopy();
+    config->setRole("reference", "UnknownColorSpace");
+
+    std::ostringstream os;
+    OIIO_CHECK_THROW(config->serialize(os), OCIO::Exception);
+}
+
+OIIO_ADD_TEST(Config, Env_colorspace_name)
+{
+    const std::string MY_OCIO_CONFIG =
+        "ocio_profile_version: 1\n"
+        "\n"
+        "search_path: luts\n"
+        "strictparsing: true\n"
+        "luma: [0.2126, 0.7152, 0.0722]\n"
+        "\n"
+        "roles:\n"
+        "  compositing_log: lgh\n"
+        "  default: raw\n"
+        "  scene_linear: lnh\n"
+        "\n"
+        "displays:\n"
+        "  sRGB:\n"
+        "    - !<View> {name: Raw, colorspace: raw}\n"
+        "\n"
+        "active_displays: []\n"
+        "active_views: []\n"
+        "\n"
+        "colorspaces:\n"
+        "  - !<ColorSpace>\n"
+        "    name: raw\n"
+        "    family: \"\"\n"
+        "    equalitygroup: \"\"\n"
+        "    bitdepth: unknown\n"
+        "    isdata: false\n"
+        "    allocation: uniform\n"
+        "\n"
+        "  - !<ColorSpace>\n"
+        "    name: lnh\n"
+        "    family: \"\"\n"
+        "    equalitygroup: \"\"\n"
+        "    bitdepth: unknown\n"
+        "    isdata: false\n"
+        "    allocation: uniform\n"
+        "\n"
+        "  - !<ColorSpace>\n"
+        "    name: lgh\n"
+        "    family: \"\"\n"
+        "    equalitygroup: \"\"\n"
+        "    bitdepth: unknown\n"
+        "    isdata: false\n"
+        "    allocation: uniform\n"
+        "    allocationvars: [-0.125, 1.125]\n"
+        "    from_reference: !<ColorSpaceTransform> {src: raw, dst: $CAMERARAW}\n";
+
+
+    {
+        // Test when the env. variable is missing
+
+        std::istringstream is;
+        is.str(MY_OCIO_CONFIG);
+
+        OCIO::ConstConfigRcPtr config;
+        OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
+        OIIO_CHECK_NO_THROW(config->sanityCheck());
+        OIIO_CHECK_THROW(config->getProcessor("raw", "lgh"), OCIO::Exception);
+    }
+
+    {
+        char * env = (char *)"CAMERARAW=lnh";
+        putenv(env);
+
+        std::istringstream is;
+        is.str(MY_OCIO_CONFIG);
+
+        OCIO::ConstConfigRcPtr config;
+        OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
+        OIIO_CHECK_NO_THROW(config->sanityCheck());
+        OIIO_CHECK_NO_THROW(config->getProcessor("raw", "lgh"));
+    }
+
+    {
+        // Test when the env. variable content is wrong
+
+        char * env = (char *)"CAMERARAW=FaultyColorSpaceName";
+        putenv(env);
+
+        std::istringstream is;
+        is.str(MY_OCIO_CONFIG);
+
+        OCIO::ConstConfigRcPtr config;
+        OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
+        OIIO_CHECK_NO_THROW(config->sanityCheck());
+        OIIO_CHECK_THROW(config->getProcessor("raw", "lgh"), OCIO::Exception);
+    }
+
+    {
+        // Check that the serialization preserves the env. variable
+
+        std::istringstream is;
+        is.str(MY_OCIO_CONFIG);
+
+        OCIO::ConstConfigRcPtr config;
+        OIIO_CHECK_NO_THROW(config = OCIO::Config::CreateFromStream(is));
+        OIIO_CHECK_NO_THROW(config->sanityCheck());
+
+        std::stringstream ss;
+        ss << *config.get();
+        OIIO_CHECK_EQUAL(ss.str(), MY_OCIO_CONFIG);
     }
 }
 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Context.cpp opencolorio-1.1.0~dfsg0/src/core/Context.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Context.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Context.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -47,7 +47,8 @@
     
     void GetAbsoluteSearchPaths(std::vector<std::string> & searchpaths,
                                 const std::string & pathString,
-                                const std::string & configRootDir);
+                                const std::string & configRootDir,
+                                const EnvMap & map);
 }
     
     class Context::Impl
@@ -321,7 +322,8 @@
         std::vector<std::string> searchpaths;
         GetAbsoluteSearchPaths(searchpaths,
                                getImpl()->searchPath_,
-                               getImpl()->workingDir_);
+                               getImpl()->workingDir_,
+                               getImpl()->envMap_);
         
         // Loop over each path, and try to find the file
         std::ostringstream errortext;
@@ -348,12 +350,17 @@
 
     std::ostream& operator<< (std::ostream& os, const Context& context)
     {
-        os << "Context:\n";
+        os << "<Context";
+        os << " searchPath=" << context.getSearchPath();
+        os << ", workingDir=" << context.getWorkingDir();
+        os << ", environmentMode=" << EnvironmentModeToString(context.getEnvironmentMode());
+        os << ", environment=";
         for(int i=0; i<context.getNumStringVars(); ++i)
         {
             const char * key = context.getStringVarNameByIndex(i);
-            os << key << "=" << context.getStringVar(key) << "\n";
+            os << "\n\t" << key << ": " << context.getStringVar(key);
         }
+        os << ">";
         return os;
     }
     
@@ -362,7 +369,8 @@
 {
     void GetAbsoluteSearchPaths(std::vector<std::string> & searchpaths,
                                 const std::string & pathString,
-                                const std::string & workingDir)
+                                const std::string & workingDir,
+                                const EnvMap & map)
     {
         if(pathString.empty())
         {
@@ -375,8 +383,11 @@
         
         for (unsigned int i = 0; i < parts.size(); ++i)
         {
+            // Expand variables incase the expansion adds slashes
+            std::string expanded = EnvExpand(parts[i], map);
+
             // Remove trailing "/", and spaces
-            std::string dirname = pystring::rstrip(pystring::strip(parts[i]), "/");
+            std::string dirname = pystring::rstrip(pystring::strip(expanded), "/");
             
             if(!pystring::os::path::isabs(dirname))
             {
@@ -398,31 +409,66 @@
 
 namespace OCIO = OCIO_NAMESPACE;
 #include "UnitTest.h"
+#include <algorithm>
 
 #ifdef OCIO_SOURCE_DIR
 
 #define _STR(x) #x
 #define STR(x) _STR(x)
 
+#ifdef WINDOWS
+    // FIXME: On Windows remove the 'C:' from the absolute path as the ':' is
+    //        used for the search path delimiter. The selected character
+    //        is problematic on Windows.
+    static const std::string ociodir(&std::string(STR(OCIO_SOURCE_DIR)).c_str()[2]);
+
+    // Method to avoid using boost filesystem library to compare paths
+    std::string sanatizepath(const char* path)
+    {
+        std::string s(path);
+        std::replace(s.begin(), s.end(), '\\', '/');
+        return s;
+    }
+#else
+    static const std::string ociodir(STR(OCIO_SOURCE_DIR));
+    std::string sanatizepath(const char* path)
+    {
+        return std::string(path);
+    }
+#endif
+    static const std::string contextpath(ociodir+std::string("/src/core/Context.cpp"));
+
 OIIO_ADD_TEST(Context, ABSPath)
 {
-    
     OCIO::ContextRcPtr con = OCIO::Context::Create();
-    con->setSearchPath(STR(OCIO_SOURCE_DIR));
+    con->setSearchPath(ociodir.c_str());
     
     con->setStringVar("non_abs", "src/core/Context.cpp");
-    con->setStringVar("is_abs", STR(OCIO_SOURCE_DIR) "/src/core/Context.cpp");
+    con->setStringVar("is_abs", contextpath.c_str());
     
-    OIIO_CHECK_NO_THOW(con->resolveFileLocation("${non_abs}"));
-    OIIO_CHECK_ASSERT(strcmp(con->resolveFileLocation("${non_abs}"),
-        STR(OCIO_SOURCE_DIR) "/src/core/Context.cpp") == 0);
-    
-    OIIO_CHECK_NO_THOW(con->resolveFileLocation("${is_abs}"));
-    OIIO_CHECK_ASSERT(strcmp(con->resolveFileLocation("${is_abs}"),
-        STR(OCIO_SOURCE_DIR) "/src/core/Context.cpp") == 0);
+    OIIO_CHECK_NO_THROW(con->resolveFileLocation("${non_abs}"));
+
+    OIIO_CHECK_ASSERT(strcmp(sanatizepath(con->resolveFileLocation("${non_abs}")).c_str(), 
+                                            contextpath.c_str()) == 0);
     
+    OIIO_CHECK_NO_THROW(con->resolveFileLocation("${is_abs}"));
+    OIIO_CHECK_ASSERT(strcmp(con->resolveFileLocation("${is_abs}"), contextpath.c_str()) == 0);
+   
+}
+
+OIIO_ADD_TEST(Context, VarSearchPath)
+{
+    OCIO::ContextRcPtr context = OCIO::Context::Create();
+
+    context->setStringVar("SOURCE_DIR", ociodir.c_str());
+    context->setSearchPath("${SOURCE_DIR}/src/core");
+
+    OIIO_CHECK_NO_THROW(context->resolveFileLocation("Context.cpp"));
+    OIIO_CHECK_ASSERT(strcmp(sanatizepath(context->resolveFileLocation("Context.cpp")).c_str(), 
+                                contextpath.c_str()) == 0);
+
 }
 
-#endif // OCIO_BINARY_DIR
+#endif // OCIO_SOURCE_DIR
 
 #endif // OCIO_UNIT_TEST
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Display.cpp opencolorio-1.1.0~dfsg0/src/core/Display.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Display.cpp	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Display.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,145 @@
+/*
+Copyright (c) 2003-2010 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <string>
+
+#include <OpenColorIO/OpenColorIO.h>
+
+#include "Display.h"
+#include "ParseUtils.h"
+
+OCIO_NAMESPACE_ENTER
+{
+    
+    DisplayMap::iterator find_display(DisplayMap & displays, const std::string & display)
+    {
+        for(DisplayMap::iterator iter = displays.begin();
+            iter != displays.end();
+            ++iter)
+        {
+            if(StrEqualsCaseIgnore(display, iter->first)) return iter;
+        }
+        return displays.end();
+    }
+    
+    DisplayMap::const_iterator find_display_const(const DisplayMap & displays, const std::string & display)
+    {
+        for(DisplayMap::const_iterator iter = displays.begin();
+            iter != displays.end();
+            ++iter)
+        {
+            if(StrEqualsCaseIgnore(display, iter->first)) return iter;
+        }
+        return displays.end();
+    }
+    
+    int find_view(const ViewVec & vec, const std::string & name)
+    {
+        for(unsigned int i=0; i<vec.size(); ++i)
+        {
+            if(StrEqualsCaseIgnore(name, vec[i].name)) return i;
+        }
+        return -1;
+    }
+    
+    void AddDisplay(DisplayMap & displays,
+                    const std::string & display,
+                    const std::string & view,
+                    const std::string & colorspace,
+                    const std::string & looks)
+    {
+        DisplayMap::iterator iter = find_display(displays, display);
+        if(iter == displays.end())
+        {
+            ViewVec views;
+            views.push_back( View(view, colorspace, looks) );
+            displays[display] = views;
+        }
+        else
+        {
+            ViewVec & views = iter->second;
+            int index = find_view(views, view);
+            if(index<0)
+            {
+                views.push_back( View(view, colorspace, looks) );
+            }
+            else
+            {
+                views[index].colorspace = colorspace;
+                views[index].looks = looks;
+            }
+        }
+    }
+    
+    void ComputeDisplays(StringVec & displayCache,
+                         const DisplayMap & displays,
+                         const StringVec & activeDisplays,
+                         const StringVec & activeDisplaysEnvOverride)
+    {
+        displayCache.clear();
+        
+        StringVec displayMasterList;
+        for(DisplayMap::const_iterator iter = displays.begin();
+            iter != displays.end();
+            ++iter)
+        {
+            displayMasterList.push_back(iter->first);
+        }
+        
+        // Apply the env override if it's not empty.
+        if(!activeDisplaysEnvOverride.empty())
+        {
+            displayCache = IntersectStringVecsCaseIgnore(displayMasterList, activeDisplaysEnvOverride);
+            if(!displayCache.empty()) return;
+        }
+        // Otherwise, aApply the active displays if it's not empty.
+        else if(!activeDisplays.empty())
+        {
+            displayCache = IntersectStringVecsCaseIgnore(displayMasterList, activeDisplays);
+            if(!displayCache.empty()) return;
+        }
+        
+        displayCache = displayMasterList;
+    }
+
+}
+OCIO_NAMESPACE_EXIT
+
+///////////////////////////////////////////////////////////////////////////////
+
+#ifdef OCIO_UNIT_TEST
+
+namespace OCIO = OCIO_NAMESPACE;
+#include "UnitTest.h"
+
+OIIO_ADD_TEST(Display, Basic)
+{
+    
+}
+
+#endif // OCIO_UNIT_TEST
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Display.h opencolorio-1.1.0~dfsg0/src/core/Display.h
--- opencolorio-1.0.9~dfsg0/src/core/Display.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Display.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,85 @@
+/*
+Copyright (c) 2003-2010 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#ifndef INCLUDED_OCIO_DISPLAY_H
+#define INCLUDED_OCIO_DISPLAY_H
+
+#include <OpenColorIO/OpenColorIO.h>
+
+#include <string>
+#include <vector>
+#include <map>
+
+#include "PrivateTypes.h"
+
+OCIO_NAMESPACE_ENTER
+{
+    
+    // Displays
+    struct View
+    {
+        std::string name;
+        std::string colorspace;
+        std::string looks;
+        
+        View() { }
+        
+        View(const std::string & name_,
+             const std::string & colorspace_,
+             const std::string & looksList_) :
+                name(name_),
+                colorspace(colorspace_),
+                looks(looksList_)
+        { }
+    };
+    
+    typedef std::vector<View> ViewVec;
+    typedef std::map<std::string, ViewVec> DisplayMap;  // (display name : ViewVec)
+    
+    DisplayMap::iterator find_display(DisplayMap & displays, const std::string & display);
+    
+    DisplayMap::const_iterator find_display_const(const DisplayMap & displays, const std::string & display);
+    
+    int find_view(const ViewVec & vec, const std::string & name);
+    
+    void AddDisplay(DisplayMap & displays,
+                    const std::string & display,
+                    const std::string & view,
+                    const std::string & colorspace,
+                    const std::string & looks);
+    
+    void ComputeDisplays(StringVec & displayCache,
+                         const DisplayMap & displays,
+                         const StringVec & activeDisplays,
+                         const StringVec & activeDisplaysEnvOverride);
+    
+}
+OCIO_NAMESPACE_EXIT
+
+#endif
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/src/core/DisplayTransform.cpp opencolorio-1.1.0~dfsg0/src/core/DisplayTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/DisplayTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/DisplayTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -231,8 +231,32 @@
         os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
         os << "inputColorSpace=" << t.getInputColorSpaceName() << ", ";
         os << "display=" << t.getDisplay() << ", ";
-        os << "view=" << t.getView() << ", ";
-        os << ">\n";
+        os << "view=" << t.getView();
+        if (t.getLooksOverrideEnabled())
+        {
+            os << ", looksOverride=" << t.getLooksOverride();
+        }
+        ConstTransformRcPtr transform(t.getLinearCC());
+        if (transform)
+        {
+            os << ", linearCC: " << *transform;
+        }
+        transform = t.getColorTimingCC();
+        if (transform)
+        {
+            os << ", colorTimingCC: " << *transform;
+        }
+        transform = t.getChannelView();
+        if (transform)
+        {
+            os << ", channelView: " << *transform;
+        }
+        transform = t.getDisplayCC();
+        if (transform)
+        {
+            os << ", displayCC: " << *transform;
+        }
+        os << ">";
         return os;
     }
     
diff -Nru opencolorio-1.0.9~dfsg0/src/core/ExponentOps.cpp opencolorio-1.1.0~dfsg0/src/core/ExponentOps.cpp
--- opencolorio-1.0.9~dfsg0/src/core/ExponentOps.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/ExponentOps.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -29,6 +29,7 @@
 #include <cmath>
 #include <cstring>
 #include <sstream>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/ExponentTransform.cpp opencolorio-1.1.0~dfsg0/src/core/ExponentTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/ExponentTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/ExponentTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -123,9 +123,18 @@
     
     std::ostream& operator<< (std::ostream& os, const ExponentTransform& t)
     {
+        float exp[4];
+        t.getValue(exp);
+
         os << "<ExponentTransform ";
         os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "value=" << exp[0];
+        for (int i = 1; i < 4; ++i)
+        {
+          os << " " << exp[i];
+        }
+
+        os << ">";
         return os;
     }
     
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileFormatCDL.cpp opencolorio-1.1.0~dfsg0/src/core/FileFormatCDL.cpp
--- opencolorio-1.0.9~dfsg0/src/core/FileFormatCDL.cpp	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileFormatCDL.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,229 @@
+/*
+Copyright (c) 2014 Cinesite VFX Ltd, et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include <map>
+#include <tinyxml.h>
+
+#include <OpenColorIO/OpenColorIO.h>
+
+#include "CDLTransform.h"
+#include "FileTransform.h"
+#include "OpBuilders.h"
+#include "ParseUtils.h"
+#include "pystring/pystring.h"
+
+OCIO_NAMESPACE_ENTER
+{
+    ////////////////////////////////////////////////////////////////
+    
+    namespace
+    {
+        class LocalCachedFile : public CachedFile
+        {
+        public:
+            LocalCachedFile () {};
+            ~LocalCachedFile() {};
+            
+            CDLTransformMap transformMap;
+            CDLTransformVec transformVec;
+        };
+        
+        typedef OCIO_SHARED_PTR<LocalCachedFile> LocalCachedFileRcPtr;
+        typedef OCIO_SHARED_PTR<TiXmlDocument> TiXmlDocumentRcPtr;
+        
+        
+        
+        class LocalFileFormat : public FileFormat
+        {
+        public:
+            
+            ~LocalFileFormat() {};
+            
+            virtual void GetFormatInfo(FormatInfoVec & formatInfoVec) const;
+            
+            virtual CachedFileRcPtr Read(std::istream & istream) const;
+            
+            virtual void BuildFileOps(OpRcPtrVec & ops,
+                                      const Config& config,
+                                      const ConstContextRcPtr & context,
+                                      CachedFileRcPtr untypedCachedFile,
+                                      const FileTransform& fileTransform,
+                                      TransformDirection dir) const;
+        };
+        
+        void LocalFileFormat::GetFormatInfo(FormatInfoVec & formatInfoVec) const
+        {
+            FormatInfo info;
+            info.name = "ColorDecisionList";
+            info.extension = "cdl";
+            info.capabilities = FORMAT_CAPABILITY_READ;
+            formatInfoVec.push_back(info);
+        }
+        
+        // Try and load the format
+        // Raise an exception if it can't be loaded.
+        
+        CachedFileRcPtr LocalFileFormat::Read(std::istream & istream) const
+        {
+            std::ostringstream rawdata;
+            rawdata << istream.rdbuf();
+            
+            LocalCachedFileRcPtr cachedFile = LocalCachedFileRcPtr(new LocalCachedFile());
+            
+            TiXmlDocumentRcPtr doc = TiXmlDocumentRcPtr(new TiXmlDocument());
+            doc->Parse(rawdata.str().c_str());
+            
+            if(doc->Error())
+            {
+                std::ostringstream os;
+                os << "XML Parse Error. ";
+                os << doc->ErrorDesc() << " (line ";
+                os << doc->ErrorRow() << ", character ";
+                os << doc->ErrorCol() << ")";
+                throw Exception(os.str().c_str());
+            }
+            
+            TiXmlElement* rootElement = doc->RootElement();
+            GetCDLTransforms(cachedFile->transformMap,
+                             cachedFile->transformVec,
+                             rootElement);
+            return cachedFile;
+        }
+        
+        void
+        LocalFileFormat::BuildFileOps(OpRcPtrVec & ops,
+                                      const Config& config,
+                                      const ConstContextRcPtr & context,
+                                      CachedFileRcPtr untypedCachedFile,
+                                      const FileTransform& fileTransform,
+                                      TransformDirection dir) const
+        {
+            LocalCachedFileRcPtr cachedFile = DynamicPtrCast<LocalCachedFile>(untypedCachedFile);
+            
+            // This should never happen.
+            if(!cachedFile)
+            {
+                std::ostringstream os;
+                os << "Cannot build .cdl Op. Invalid cache type.";
+                throw Exception(os.str().c_str());
+            }
+            
+            TransformDirection newDir = CombineTransformDirections(dir,
+                fileTransform.getDirection());
+            if(newDir == TRANSFORM_DIR_UNKNOWN)
+            {
+                std::ostringstream os;
+                os << "Cannot build ASC FileTransform,";
+                os << " unspecified transform direction.";
+                throw Exception(os.str().c_str());
+            }
+            
+            // Below this point, we should throw ExceptionMissingFile on
+            // errors rather than Exception
+            // This is because we've verified that the cdl file is valid,
+            // at now we're only querying whether the specified cccid can
+            // be found.
+            //
+            // Using ExceptionMissingFile enables the missing looks fallback
+            // mechanism to function properly.
+            // At the time ExceptionMissingFile was named, we errently assumed
+            // a 1:1 relationship between files and color corrections, which is
+            // not true for .cdl files.
+            //
+            // In a future OCIO release, it may be more appropriate to
+            // rename ExceptionMissingFile -> ExceptionMissingCorrection.
+            // But either way, it's what we should throw below.
+            
+            std::string cccid = fileTransform.getCCCId();
+            cccid = context->resolveStringVar(cccid.c_str());
+            
+            if(cccid.empty())
+            {
+                std::ostringstream os;
+                os << "You must specify which cccid to load from the ccc file";
+                os << " (either by name or index).";
+                throw ExceptionMissingFile(os.str().c_str());
+            }
+            
+            bool success=false;
+            
+            // Try to parse the cccid as a string id
+            CDLTransformMap::const_iterator iter = cachedFile->transformMap.find(cccid);
+            if(iter != cachedFile->transformMap.end())
+            {
+                success = true;
+                BuildCDLOps(ops,
+                            config,
+                            *(iter->second),
+                            newDir);
+            }
+            
+            // Try to parse the cccid as an integer index
+            // We want to be strict, so fail if leftover chars in the parse.
+            if(!success)
+            {
+                int cccindex=0;
+                if(StringToInt(&cccindex, cccid.c_str(), true))
+                {
+                    int maxindex = ((int)cachedFile->transformVec.size())-1;
+                    if(cccindex<0 || cccindex>maxindex)
+                    {
+                        std::ostringstream os;
+                        os << "The specified cccindex " << cccindex;
+                        os << " is outside the valid range for this file [0,";
+                        os << maxindex << "]";
+                        throw ExceptionMissingFile(os.str().c_str());
+                    }
+                    
+                    success = true;
+                    BuildCDLOps(ops,
+                                config,
+                                *cachedFile->transformVec[cccindex],
+                                newDir);
+                }
+            }
+            
+            if(!success)
+            {
+                std::ostringstream os;
+                os << "You must specify a valid cccid to load from the ccc file";
+                os << " (either by name or index). id='" << cccid << "' ";
+                os << "is not found in the file, and is not parsable as an ";
+                os << "integer index.";
+                throw ExceptionMissingFile(os.str().c_str());
+            }
+        }
+    }
+    
+    FileFormat * CreateFileFormatCDL()
+    {
+        return new LocalFileFormat();
+    }
+}
+OCIO_NAMESPACE_EXIT
+
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileFormatCSP.cpp opencolorio-1.1.0~dfsg0/src/core/FileFormatCSP.cpp
--- opencolorio-1.0.9~dfsg0/src/core/FileFormatCSP.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileFormatCSP.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -34,6 +34,7 @@
 #include <iostream>
 #include <iterator>
 #include <sstream>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
@@ -330,7 +331,11 @@
         };
         typedef OCIO_SHARED_PTR<CachedFileCSP> CachedFileCSPRcPtr;
         
-        
+        inline bool
+        startswithU(const std::string & str, const std::string & prefix)
+        {
+            return pystring::startswith(pystring::upper(pystring::strip(str)), prefix);
+        }
         
         class LocalFileFormat : public FileFormat
         {
@@ -391,7 +396,7 @@
             // try and read the lut header
             std::string line;
             nextline (istream, line);
-            if (line != "CSPLUTV100")
+            if (!startswithU(line, "CSPLUTV100"))
             {
                 std::ostringstream os;
                 os << "Lut doesn't seem to be a csp file, expected 'CSPLUTV100'.";
@@ -401,7 +406,7 @@
 
             // next line tells us if we are reading a 1D or 3D lut
             nextline (istream, line);
-            if (line != "1D" && line != "3D")
+            if (!startswithU(line, "1D") && !startswithU(line, "3D"))
             {
                 std::ostringstream os;
                 os << "Unsupported CSP lut type. Require 1D or 3D. ";
@@ -414,12 +419,13 @@
             std::string metadata;
             bool lineUpdateNeeded = false;
             nextline (istream, line);
-            if (line == "BEGIN METADATA")
+            if(startswithU(line, "BEGIN METADATA"))
             {
-                while (line != "END METADATA" || !istream)
+                while (!startswithU(line, "END METADATA") ||
+                       !istream)
                 {
                     nextline (istream, line);
-                    if (line != "END METADATA")
+                    if (!startswithU(line, "END METADATA"))
                         metadata += line + "\n";
                 }
                 lineUpdateNeeded = true;
@@ -783,6 +789,7 @@
             // Write out the file
             ostream << "CSPLUTV100\n";
             ostream << "3D\n";
+            ostream << "\n";
             ostream << "BEGIN METADATA\n";
             std::string metadata = baker.getMetadata();
             if(!metadata.empty())
@@ -907,6 +914,26 @@
 namespace OCIO = OCIO_NAMESPACE;
 #include "UnitTest.h"
 
+void compareFloats(const std::string& floats1, const std::string& floats2)
+{
+    // number comparison
+    std::vector<std::string> strings1;
+    OCIO::pystring::split(OCIO::pystring::strip(floats1), strings1);
+    std::vector<float> numbers1;
+    OCIO::StringVecToFloatVec(numbers1, strings1);
+
+    std::vector<std::string> strings2;
+    OCIO::pystring::split(OCIO::pystring::strip(floats2), strings2);
+    std::vector<float> numbers2;
+    OCIO::StringVecToFloatVec(numbers2, strings2);
+
+    OIIO_CHECK_EQUAL(numbers1.size(), numbers2.size());
+    for(unsigned int j=0; j<numbers1.size(); ++j)
+    {
+        OIIO_CHECK_CLOSE(numbers1[j], numbers2[j], 1e-5f);
+    }
+}
+
 OIIO_ADD_TEST(FileFormatCSP, simple1D)
 {
     std::ostringstream strebuf;
@@ -924,8 +951,8 @@
     strebuf << "0.0 0.2 0.4 0.6 0.8 1.0" << "\n";
     strebuf << "0.0 0.4 0.8 1.2 1.6 2.0" << "\n";
     strebuf << "3"                       << "\n";
-    strebuf << "0.0 0.1 1.0"            << "\n";
-    strebuf << "0.0 0.2 2.0"            << "\n";
+    strebuf << "0.0 0.1 1.0"             << "\n";
+    strebuf << "0.0 0.2 2.0"             << "\n";
     strebuf << ""                        << "\n";
     strebuf << "6"                       << "\n";
     strebuf << "0.0 0.0 0.0"             << "\n";
@@ -946,7 +973,13 @@
     OCIO::LocalFileFormat tester;
     OCIO::CachedFileRcPtr cachedFile = tester.Read(simple1D);
     OCIO::CachedFileCSPRcPtr csplut = OCIO::DynamicPtrCast<OCIO::CachedFileCSP>(cachedFile);
-    
+
+    // check metadata
+    OIIO_CHECK_EQUAL(csplut->metadata, std::string("foobar\n"));
+
+    // check prelut data
+    OIIO_CHECK_ASSERT(csplut->hasprelut);
+
     // check prelut data (note: the spline is resampled into a 1D LUT)
     for(int c=0; c<3; ++c)
     {
@@ -957,6 +990,7 @@
             OIIO_CHECK_CLOSE(input*2.0f, output, 1e-4);
         }
     }
+
     // check 1D data
     // red
     unsigned int i;
@@ -969,6 +1003,8 @@
     for(i = 0; i < csplut->lut1D->luts[2].size(); ++i)
         OIIO_CHECK_EQUAL(blue[i], csplut->lut1D->luts[2][i]);
     
+    // check 3D data
+    OIIO_CHECK_EQUAL(csplut->lut3D->lut.size(), 0);
 }
 
 OIIO_ADD_TEST(FileFormatCSP, simple3D)
@@ -1014,14 +1050,26 @@
     OCIO::CachedFileRcPtr cachedFile = tester.Read(simple3D);
     OCIO::CachedFileCSPRcPtr csplut = OCIO::DynamicPtrCast<OCIO::CachedFileCSP>(cachedFile);
     
+    // check metadata
+    OIIO_CHECK_EQUAL(csplut->metadata, std::string("foobar\n"));
+
     // check prelut data
-    OIIO_CHECK_ASSERT(csplut->hasprelut == false);
+    OIIO_CHECK_ASSERT(!csplut->hasprelut); // as in & out preLut values are the same
+                                           // there is nothing to do.
     
     // check cube data
     for(unsigned int i = 0; i < csplut->lut3D->lut.size(); ++i) {
         OIIO_CHECK_EQUAL(cube[i], csplut->lut3D->lut[i]);
     }
-    
+
+    // check 1D data
+    OIIO_CHECK_EQUAL(csplut->lut1D->luts[0].size(), 0);
+    OIIO_CHECK_EQUAL(csplut->lut1D->luts[1].size(), 0);
+    OIIO_CHECK_EQUAL(csplut->lut1D->luts[2].size(), 0);
+}
+
+OIIO_ADD_TEST(FileFormatCSP, complete3D)
+{
     // check baker output
     OCIO::ConfigRcPtr config = OCIO::Config::Create();
     {
@@ -1051,39 +1099,39 @@
         cs->setTransform(transform1, OCIO::COLORSPACE_DIR_FROM_REFERENCE);
         config->addColorSpace(cs);
     }
-    
-    /*
-    std::string bout =
-    "CSPLUTV100\n"
-    "3D\n"
-    "\n"
-    "BEGIN METADATA\n"
-    "date: 2011:02:21 15:22:55\n"
-    "END METADATA\n"
-    "\n"
-    "10\n"
-    "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000\n"
-    "0.000000 0.429520 0.560744 0.655378 0.732058 0.797661 0.855604 0.907865 0.955710 1.000000\n"
-    "10\n"
-    "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000\n"
-    "0.000000 0.429520 0.560744 0.655378 0.732058 0.797661 0.855604 0.907865 0.955710 1.000000\n"
-    "10\n"
-    "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000\n"
-    "0.000000 0.429520 0.560744 0.655378 0.732058 0.797661 0.855604 0.907865 0.955710 1.000000\n"
-    "\n"
-    "2 2 2\n"
-    "0.100000 0.100000 0.100000\n"
-    "1.000000 0.100000 0.100000\n"
-    "0.100000 1.000000 0.100000\n"
-    "1.000000 1.000000 0.100000\n"
-    "0.100000 0.100000 1.000000\n"
-    "1.000000 0.100000 1.000000\n"
-    "0.100000 1.000000 1.000000\n"
-    "1.000000 1.000000 1.000000\n"
-    "\n";
+
+    std::ostringstream bout;
+    bout << "CSPLUTV100"                 << "\n";
+    bout << "3D"                         << "\n";
+    bout << ""                           << "\n";
+    bout << "BEGIN METADATA"             << "\n";
+    bout << "date: 2011:02:21 15:22:55"  << "\n";
+    bout << "END METADATA"               << "\n";
+    bout << ""                           << "\n";
+    bout << "10"                         << "\n";
+    bout << "0.000000 0.003303 0.020028 0.057476 0.121430 0.216916 0.348468 0.520265 0.736213 1.000000" << "\n";
+    bout << "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000" << "\n";
+    bout << "10"                         << "\n";
+    bout << "0.000000 0.003303 0.020028 0.057476 0.121430 0.216916 0.348468 0.520265 0.736213 1.000000" << "\n";
+    bout << "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000" << "\n";
+    bout << "10"                         << "\n";
+    bout << "0.000000 0.003303 0.020028 0.057476 0.121430 0.216916 0.348468 0.520265 0.736213 1.000000" << "\n";
+    bout << "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000" << "\n";
+    bout << ""                           << "\n";
+    bout << "2 2 2"                      << "\n";
+    bout << "0.100000 0.100000 0.100000" << "\n";
+    bout << "1.100000 0.100000 0.100000" << "\n";
+    bout << "0.100000 1.100000 0.100000" << "\n";
+    bout << "1.100000 1.100000 0.100000" << "\n";
+    bout << "0.100000 0.100000 1.100000" << "\n";
+    bout << "1.100000 0.100000 1.100000" << "\n";
+    bout << "0.100000 1.100000 1.100000" << "\n";
+    bout << "1.100000 1.100000 1.100000" << "\n";
+    bout << ""                           << "\n";
     
     OCIO::BakerRcPtr baker = OCIO::Baker::Create();
     baker->setConfig(config);
+    baker->setMetadata("date: 2011:02:21 15:22:55");
     baker->setFormat("cinespace");
     baker->setInputSpace("lnf");
     baker->setShaperSpace("shaper");
@@ -1097,15 +1145,234 @@
     std::vector<std::string> osvec;
     OCIO::pystring::splitlines(output.str(), osvec);
     std::vector<std::string> resvec;
-    OCIO::pystring::splitlines(bout, resvec);
+    OCIO::pystring::splitlines(bout.str(), resvec);
+    OIIO_CHECK_EQUAL(osvec.size(), resvec.size());
+    for(unsigned int i = 0; i < resvec.size(); ++i)
+    {
+        if(i>6)
+        {
+            // number comparison
+            compareFloats(osvec[i], resvec[i]);
+        }
+        else
+        {
+            // text comparison
+            OIIO_CHECK_EQUAL(osvec[i], resvec[i]);
+        }
+    }
+}
+
+OIIO_ADD_TEST(FileFormatCSP, shaper_hdr)
+{
+    // check baker output
+    OCIO::ConfigRcPtr config = OCIO::Config::Create();
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("lnf");
+        cs->setFamily("lnf");
+        config->addColorSpace(cs);
+        config->setRole(OCIO::ROLE_REFERENCE, cs->getName());
+    }
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("lnf_tweak");
+        cs->setFamily("lnf_tweak");
+        OCIO::CDLTransformRcPtr transform1 = OCIO::CDLTransform::Create();
+        float rgb[3] = {2.0f, -2.0f, 0.9f};
+        transform1->setOffset(rgb);
+        cs->setTransform(transform1, OCIO::COLORSPACE_DIR_FROM_REFERENCE);
+        config->addColorSpace(cs);
+    }
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("target");
+        cs->setFamily("target");
+        OCIO::CDLTransformRcPtr transform1 = OCIO::CDLTransform::Create();
+        float rgb[3] = {0.1f, 0.1f, 0.1f};
+        transform1->setOffset(rgb);
+        cs->setTransform(transform1, OCIO::COLORSPACE_DIR_FROM_REFERENCE);
+        config->addColorSpace(cs);
+    }
+
+    std::ostringstream bout;
+    bout << "CSPLUTV100"                 << "\n";
+    bout << "3D"                         << "\n";
+    bout << ""                           << "\n";
+    bout << "BEGIN METADATA"             << "\n";
+    bout << "date: 2011:02:21 15:22:55"  << "\n";
+    bout << "END METADATA"               << "\n";
+    bout << ""                           << "\n";
+    bout << "10"                         << "\n";
+    bout << "2.000000 2.111111 2.222222 2.333333 2.444444 2.555556 2.666667 2.777778 2.888889 3.000000" << "\n";
+    bout << "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000" << "\n";
+    bout << "10"                         << "\n";
+    bout << "-2.000000 -1.888889 -1.777778 -1.666667 -1.555556 -1.444444 -1.333333 -1.222222 -1.111111 -1.000000" << "\n";
+    bout << "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000" << "\n";
+    bout << "10"                         << "\n";
+    bout << "0.900000 1.011111 1.122222 1.233333 1.344444 1.455556 1.566667 1.677778 1.788889 1.900000" << "\n";
+    bout << "0.000000 0.111111 0.222222 0.333333 0.444444 0.555556 0.666667 0.777778 0.888889 1.000000" << "\n";
+    bout << ""                           << "\n";
+    bout << "2 2 2"                      << "\n";
+    bout << "0.100000 0.100000 0.100000" << "\n";
+    bout << "1.100000 0.100000 0.100000" << "\n";
+    bout << "0.100000 1.100000 0.100000" << "\n";
+    bout << "1.100000 1.100000 0.100000" << "\n";
+    bout << "0.100000 0.100000 1.100000" << "\n";
+    bout << "1.100000 0.100000 1.100000" << "\n";
+    bout << "0.100000 1.100000 1.100000" << "\n";
+    bout << "1.100000 1.100000 1.100000" << "\n";
+    bout << ""                           << "\n";
+
+    OCIO::BakerRcPtr baker = OCIO::Baker::Create();
+    baker->setConfig(config);
+    baker->setMetadata("date: 2011:02:21 15:22:55");
+    baker->setFormat("cinespace");
+    baker->setInputSpace("lnf_tweak");
+    baker->setShaperSpace("lnf");
+    baker->setTargetSpace("target");
+    baker->setShaperSize(10);
+    baker->setCubeSize(2);
+    std::ostringstream output;
+    baker->bake(output);
+    
+    //
+    std::vector<std::string> osvec;
+    OCIO::pystring::splitlines(output.str(), osvec);
+    std::vector<std::string> resvec;
+    OCIO::pystring::splitlines(bout.str(), resvec);
+    OIIO_CHECK_EQUAL(osvec.size(), resvec.size());
+    for(unsigned int i = 0; i < resvec.size(); ++i)
+    {
+        if(i>6)
+        {
+            // number comparison
+            compareFloats(osvec[i], resvec[i]);
+        }
+        else
+        {
+            // text comparison
+            OIIO_CHECK_EQUAL(osvec[i], resvec[i]);
+        }
+    }
+}
+
+OIIO_ADD_TEST(FileFormatCSP, no_shaper)
+{
+    // check baker output
+    OCIO::ConfigRcPtr config = OCIO::Config::Create();
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("lnf");
+        cs->setFamily("lnf");
+        config->addColorSpace(cs);
+        config->setRole(OCIO::ROLE_REFERENCE, cs->getName());
+    }
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("target");
+        cs->setFamily("target");
+        OCIO::CDLTransformRcPtr transform1 = OCIO::CDLTransform::Create();
+        float rgb[3] = {0.1f, 0.1f, 0.1f};
+        transform1->setOffset(rgb);
+        cs->setTransform(transform1, OCIO::COLORSPACE_DIR_FROM_REFERENCE);
+        config->addColorSpace(cs);
+    }
+
+    std::ostringstream bout;
+    bout << "CSPLUTV100"                 << "\n";
+    bout << "3D"                         << "\n";
+    bout << ""                           << "\n";
+    bout << "BEGIN METADATA"             << "\n";
+    bout << "date: 2011:02:21 15:22:55"  << "\n";
+    bout << "END METADATA"               << "\n";
+    bout << ""                           << "\n";
+    bout << "2"                          << "\n";
+    bout << "0.000000 1.000000"          << "\n";
+    bout << "0.000000 1.000000"          << "\n";
+    bout << "2"                          << "\n";
+    bout << "0.000000 1.000000"          << "\n";
+    bout << "0.000000 1.000000"          << "\n";
+    bout << "2"                          << "\n";
+    bout << "0.000000 1.000000"          << "\n";
+    bout << "0.000000 1.000000"          << "\n";
+    bout << ""                           << "\n";
+    bout << "2 2 2"                      << "\n";
+    bout << "0.100000 0.100000 0.100000" << "\n";
+    bout << "1.100000 0.100000 0.100000" << "\n";
+    bout << "0.100000 1.100000 0.100000" << "\n";
+    bout << "1.100000 1.100000 0.100000" << "\n";
+    bout << "0.100000 0.100000 1.100000" << "\n";
+    bout << "1.100000 0.100000 1.100000" << "\n";
+    bout << "0.100000 1.100000 1.100000" << "\n";
+    bout << "1.100000 1.100000 1.100000" << "\n";
+    bout << ""                           << "\n";
+    
+    OCIO::BakerRcPtr baker = OCIO::Baker::Create();
+    baker->setConfig(config);
+    baker->setMetadata("date: 2011:02:21 15:22:55");
+    baker->setFormat("cinespace");
+    baker->setInputSpace("lnf");
+    baker->setTargetSpace("target");
+    baker->setShaperSize(10);
+    baker->setCubeSize(2);
+    std::ostringstream output;
+    baker->bake(output);
+
+    //
+    std::vector<std::string> osvec;
+    OCIO::pystring::splitlines(output.str(), osvec);
+    std::vector<std::string> resvec;
+    OCIO::pystring::splitlines(bout.str(), resvec);
     OIIO_CHECK_EQUAL(osvec.size(), resvec.size());
     for(unsigned int i = 0; i < resvec.size(); ++i)
     {
-        // skip timestamp line
-        if(i != 4) OIIO_CHECK_EQUAL(osvec[i], resvec[i]);
+        OIIO_CHECK_EQUAL(osvec[i], resvec[i]);
     }
-    */
+}
+
+OIIO_ADD_TEST(FileFormatCSP, lessStrictParse)
+{
+    std::ostringstream strebuf;
+    strebuf << " CspluTV100 malformed"                       << "\n";
+    strebuf << "3D"                                          << "\n";
+    strebuf << ""                                            << "\n";
+    strebuf << " BegIN MEtadATA malformed malformed malfo"   << "\n";
+    strebuf << "foobar"                                      << "\n";
+    strebuf << "   end metadata malformed malformed m a l"   << "\n";
+    strebuf << ""                                            << "\n";
+    strebuf << "11"                                          << "\n";
+    strebuf << "0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0" << "\n";
+    strebuf << "0.0 0.1 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0" << "\n";
+    strebuf << "6"                                           << "\n";
+    strebuf << "0.0 0.2       0.4 0.6 0.8 1.0"               << "\n";
+    strebuf << "0.0 0.2000000 0.4 0.6 0.8 1.0"               << "\n";
+    strebuf << "5"                                           << "\n";
+    strebuf << "0.0 0.25       0.5 0.6 0.7"                  << "\n";
+    strebuf << "0.0 0.25000001 0.5 0.6 0.7"                  << "\n";
+    strebuf << ""                                            << "\n";
+    strebuf << "1 2 3"                                       << "\n";
+    strebuf << "0.0 0.0 0.0"                                 << "\n";
+    strebuf << "1.0 0.0 0.0"                                 << "\n";
+    strebuf << "0.0 0.5 0.0"                                 << "\n";
+    strebuf << "1.0 0.5 0.0"                                 << "\n";
+    strebuf << "0.0 1.0 0.0"                                 << "\n";
+    strebuf << "1.0 1.0 0.0"                                 << "\n";
     
+    std::istringstream simple3D;
+    simple3D.str(strebuf.str());
+    
+    // Load file
+    OCIO::LocalFileFormat tester;
+    OCIO::CachedFileRcPtr cachedFile;
+    OIIO_CHECK_NO_THROW(cachedFile = tester.Read(simple3D));
+    OCIO::CachedFileCSPRcPtr csplut = OCIO::DynamicPtrCast<OCIO::CachedFileCSP>(cachedFile);   
+    
+    // check metadata
+    OIIO_CHECK_EQUAL(csplut->metadata, std::string("foobar\n"));
+
+    // check prelut data
+    OIIO_CHECK_ASSERT(!csplut->hasprelut); // as in & out from the preLut are the same,
+                                           //  there is nothing to do.
 }
 
 // TODO: More strenuous tests of prelut resampling (non-noop preluts)
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileFormatHDL.cpp opencolorio-1.1.0~dfsg0/src/core/FileFormatHDL.cpp
--- opencolorio-1.0.9~dfsg0/src/core/FileFormatHDL.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileFormatHDL.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -778,7 +778,7 @@
                     {
                         LookTransformRcPtr transform = LookTransform::Create();
                         transform->setLooks(looks.c_str());
-                        transform->setSrc(inputSpace.c_str());
+                        transform->setSrc(shaperSpace.c_str());
                         transform->setDst(targetSpace.c_str());
                         cubeProc = config->getProcessor(transform,
                             TRANSFORM_DIR_FORWARD);
@@ -1478,4 +1478,142 @@
     */
 }
 
+
+OIIO_ADD_TEST(FileFormatHDL, LookTest)
+{
+    // Note this sets up a Look with the same parameters as the Bake3D1D test
+    // however it uses a different shaper space, to ensure we catch that case.
+    // Also ensure we detect the effects of the desaturation by using a 3 cubed
+    // LUT, which will thus test colour values other than the corner points of
+    // the cube
+
+    OCIO::ConfigRcPtr config = OCIO::Config::Create();
+    
+    // Add lnf space
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("lnf");
+        cs->setFamily("lnf");
+        config->addColorSpace(cs);
+        config->setRole(OCIO::ROLE_REFERENCE, cs->getName());
+    }
+    
+    // Add shaper space
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("shaper");
+        cs->setFamily("shaper");
+        OCIO::ExponentTransformRcPtr transform1 = OCIO::ExponentTransform::Create();
+        float test[4] = {2.2f, 2.2f, 2.2f, 1.0f};
+        transform1->setValue(test);
+        cs->setTransform(transform1, OCIO::COLORSPACE_DIR_TO_REFERENCE);
+        config->addColorSpace(cs);
+    }
+    
+    // Add Look process space
+    {
+        OCIO::ColorSpaceRcPtr cs = OCIO::ColorSpace::Create();
+        cs->setName("look_process");
+        cs->setFamily("look_process");
+        OCIO::ExponentTransformRcPtr transform1 = OCIO::ExponentTransform::Create();
+        float test[4] = {2.6f, 2.6f, 2.6f, 1.0f};
+        transform1->setValue(test);
+        cs->setTransform(transform1, OCIO::COLORSPACE_DIR_TO_REFERENCE);
+        config->addColorSpace(cs);
+    }
+
+    // Add Look process space
+    {
+        OCIO::LookRcPtr look = OCIO::Look::Create();
+        look->setName("look");
+        look->setProcessSpace("look_process");
+        OCIO::CDLTransformRcPtr transform1 = OCIO::CDLTransform::Create();
+
+        // Set saturation to cause channel crosstalk, making a 3D LUT
+        transform1->setSat(0.5f);
+
+        look->setTransform(transform1);
+        config->addLook(look);
+    }
+    
+    
+    std::string bout = 
+    "Version\t\t3\n"
+    "Format\t\tany\n"
+    "Type\t\t3D+1D\n"
+    "From\t\t0.000000 1.000000\n"
+    "To\t\t0.000000 1.000000\n"
+    "Black\t\t0.000000\n"
+    "White\t\t1.000000\n"
+    "Length\t\t3 10\n"
+    "LUT:\n"
+    "Pre {\n"
+    "\t0.000000\n"
+    "\t0.368344\n"
+    "\t0.504760\n"
+    "\t0.606913\n"
+    "\t0.691699\n"
+    "\t0.765539\n"
+    "\t0.831684\n"
+    "\t0.892049\n"
+    "\t0.947870\n"
+    "\t1.000000\n"
+    "}\n"
+    "3D {\n"
+    "\t0.000000 0.000000 0.000000\n"
+    "\t0.276787 0.035360 0.035360\n"
+    "\t0.553575 0.070720 0.070720\n"
+    "\t0.148309 0.416989 0.148309\n"
+    "\t0.478739 0.478739 0.201718\n"
+    "\t0.774120 0.528900 0.245984\n"
+    "\t0.296618 0.833978 0.296618\n"
+    "\t0.650361 0.902354 0.355417\n"
+    "\t0.957478 0.957478 0.403436\n"
+    "\t0.009867 0.009867 0.239325\n"
+    "\t0.296368 0.049954 0.296368\n"
+    "\t0.575308 0.086766 0.343137\n"
+    "\t0.166161 0.437812 0.437812\n"
+    "\t0.500000 0.500000 0.500000\n"
+    "\t0.796987 0.550484 0.550484\n"
+    "\t0.316402 0.857106 0.607391\n"
+    "\t0.672631 0.925760 0.672631\n"
+    "\t0.981096 0.981096 0.725386\n"
+    "\t0.019735 0.019735 0.478650\n"
+    "\t0.312132 0.062101 0.541651\n"
+    "\t0.592736 0.099909 0.592736\n"
+    "\t0.180618 0.454533 0.695009\n"
+    "\t0.517061 0.517061 0.761560\n"
+    "\t0.815301 0.567796 0.815301\n"
+    "\t0.332322 0.875624 0.875624\n"
+    "\t0.690478 0.944497 0.944497\n"
+    "\t1.000000 1.000000 1.000000\n"
+    "}\n";
+    
+    //
+    OCIO::BakerRcPtr baker = OCIO::Baker::Create();
+    baker->setConfig(config);
+    baker->setFormat("houdini");
+    baker->setInputSpace("lnf");
+    baker->setShaperSpace("shaper");
+    baker->setTargetSpace("shaper");
+    baker->setLooks("look");
+    baker->setShaperSize(10);
+    baker->setCubeSize(3);
+    std::ostringstream output;
+    baker->bake(output);
+
+    //std::cerr << "The LUT: " << std::endl << output.str() << std::endl;
+    //std::cerr << "Expected:" << std::endl << bout << std::endl;
+
+    //
+    std::vector<std::string> osvec;
+    OCIO::pystring::splitlines(output.str(), osvec);
+    std::vector<std::string> resvec;
+    OCIO::pystring::splitlines(bout, resvec);
+    OIIO_CHECK_EQUAL(osvec.size(), resvec.size());
+    
+    for(unsigned int i = 0; i < std::min(osvec.size(), resvec.size()); ++i)
+        OIIO_CHECK_EQUAL(OCIO::pystring::strip(osvec[i]), OCIO::pystring::strip(resvec[i]));
+}
+
 #endif // OCIO_BUILD_TESTS
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileFormatIridasItx.cpp opencolorio-1.1.0~dfsg0/src/core/FileFormatIridasItx.cpp
--- opencolorio-1.0.9~dfsg0/src/core/FileFormatIridasItx.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileFormatIridasItx.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -29,6 +29,7 @@
 #include <cstdio>
 #include <cstring>
 #include <iterator>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileFormatTruelight.cpp opencolorio-1.1.0~dfsg0/src/core/FileFormatTruelight.cpp
--- opencolorio-1.0.9~dfsg0/src/core/FileFormatTruelight.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileFormatTruelight.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -28,7 +28,9 @@
 
 #include <cstdio>
 #include <iostream>
+#include <iomanip>
 #include <iterator>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
@@ -90,6 +92,10 @@
             
             virtual CachedFileRcPtr Read(std::istream & istream) const;
             
+            virtual void Write(const Baker & baker,
+                               const std::string & formatName,
+                               std::ostream & ostream) const;
+            
             virtual void BuildFileOps(OpRcPtrVec & ops,
                          const Config& config,
                          const ConstContextRcPtr & context,
@@ -103,7 +109,7 @@
             FormatInfo info;
             info.name = "truelight";
             info.extension = "cub";
-            info.capabilities = FORMAT_CAPABILITY_READ;
+            info.capabilities = (FORMAT_CAPABILITY_READ | FORMAT_CAPABILITY_WRITE);
             formatInfoVec.push_back(info);
         }
         
@@ -287,6 +293,69 @@
             
             return cachedFile;
         }
+
+
+        void
+        LocalFileFormat::Write(const Baker & baker,
+                               const std::string & /*formatName*/,
+                               std::ostream & ostream) const
+        {
+            const int DEFAULT_CUBE_SIZE = 32;
+            const int DEFAULT_SHAPER_SIZE = 1024;
+
+            ConstConfigRcPtr config = baker.getConfig();
+            
+            int cubeSize = baker.getCubeSize();
+            if (cubeSize==-1) cubeSize = DEFAULT_CUBE_SIZE;
+            cubeSize = std::max(2, cubeSize); // smallest cube is 2x2x2
+
+            std::vector<float> cubeData;
+            cubeData.resize(cubeSize*cubeSize*cubeSize*3);
+            GenerateIdentityLut3D(&cubeData[0], cubeSize, 3, LUT3DORDER_FAST_RED);
+            PackedImageDesc cubeImg(&cubeData[0], cubeSize*cubeSize*cubeSize, 1, 3);
+            
+            // Apply processor to lut data
+            ConstProcessorRcPtr inputToTarget;
+            inputToTarget = config->getProcessor(baker.getInputSpace(), baker.getTargetSpace());
+            inputToTarget->apply(cubeImg);
+            
+            int shaperSize = baker.getShaperSize();
+            if (shaperSize==-1) shaperSize = DEFAULT_SHAPER_SIZE;
+            shaperSize = std::max(2, shaperSize); // smallest shaper is 2x2x2
+
+
+            // Write the header
+            ostream << "# Truelight Cube v2.0\n";
+            ostream << "# lutLength " << shaperSize << "\n";
+            ostream << "# iDims     3\n";
+            ostream << "# oDims     3\n";
+            ostream << "# width     " << cubeSize << " " << cubeSize << " " << cubeSize << "\n";
+            ostream << "\n";
+
+
+            // Write the shaper lut
+            // (We are just going to use a unity lut)
+            ostream << "# InputLUT\n";
+            ostream << std::setprecision(6) << std::fixed;
+            float v = 0.0f;
+            for (int i=0; i < shaperSize-1; i++)
+            {
+                v = ((float)i / (float)(shaperSize-1)) * (float)(cubeSize-1);
+                ostream << v << " " << v << " " << v << "\n";
+            }
+            v = (float) (cubeSize-1);
+            ostream << v << " " << v << " " << v << "\n"; // ensure that the last value is spot on
+            ostream << "\n";
+
+            // Write the cube
+            ostream << "# Cube\n";
+            for (int i=0; i<cubeSize*cubeSize*cubeSize; ++i)
+            {
+                ostream << cubeData[3*i+0] << " " << cubeData[3*i+1] << " " << cubeData[3*i+2] << "\n";
+            }
+            
+            ostream << "# end\n";
+        }
         
         void
         LocalFileFormat::BuildFileOps(OpRcPtrVec & ops,
@@ -422,7 +491,7 @@
     // Read file
     OCIO::LocalFileFormat tester;
     OCIO::CachedFileRcPtr cachedFile;
-    OIIO_CHECK_NO_THOW(cachedFile = tester.Read(lutIStream));
+    OIIO_CHECK_NO_THROW(cachedFile = tester.Read(lutIStream));
     OCIO::LocalCachedFileRcPtr lut = OCIO::DynamicPtrCast<OCIO::LocalCachedFile>(cachedFile);
     
     OIIO_CHECK_ASSERT(lut->has1D);
@@ -490,7 +559,7 @@
     // Read file
     OCIO::LocalFileFormat tester;
     OCIO::CachedFileRcPtr cachedFile;
-    OIIO_CHECK_NO_THOW(cachedFile = tester.Read(lutIStream));
+    OIIO_CHECK_NO_THROW(cachedFile = tester.Read(lutIStream));
     
     OCIO::LocalCachedFileRcPtr lut = OCIO::DynamicPtrCast<OCIO::LocalCachedFile>(cachedFile);
     
@@ -577,7 +646,7 @@
     // Read file
     OCIO::LocalFileFormat tester;
     OCIO::CachedFileRcPtr cachedFile;
-    OIIO_CHECK_NO_THOW(cachedFile = tester.Read(lutIStream));
+    OIIO_CHECK_NO_THROW(cachedFile = tester.Read(lutIStream));
     OCIO::LocalCachedFileRcPtr lut = OCIO::DynamicPtrCast<OCIO::LocalCachedFile>(cachedFile);
     
     OIIO_CHECK_ASSERT(!lut->has1D);
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileTransform.cpp opencolorio-1.1.0~dfsg0/src/core/FileTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/FileTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -165,8 +165,8 @@
         os << "<FileTransform ";
         os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
         os << "interpolation=" << InterpolationToString(t.getInterpolation()) << ", ";
-        os << "src='" << t.getSrc() << "', ";
-        os << "cccid='" << t.getCCCId() << "'";
+        os << "src=" << t.getSrc() << ", ";
+        os << "cccid=" << t.getCCCId();
         os << ">";
         
         return os;
@@ -204,6 +204,7 @@
     {
         registerFileFormat(CreateFileFormat3DL());
         registerFileFormat(CreateFileFormatCCC());
+        registerFileFormat(CreateFileFormatCDL());
         registerFileFormat(CreateFileFormatCC());
         registerFileFormat(CreateFileFormatCSP());
         registerFileFormat(CreateFileFormatHDL());
diff -Nru opencolorio-1.0.9~dfsg0/src/core/FileTransform.h opencolorio-1.1.0~dfsg0/src/core/FileTransform.h
--- opencolorio-1.0.9~dfsg0/src/core/FileTransform.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/FileTransform.h	2018-01-05 01:38:27.000000000 +0000
@@ -137,6 +137,7 @@
     // Registry Builders
     FileFormat * CreateFileFormat3DL();
     FileFormat * CreateFileFormatCCC();
+    FileFormat * CreateFileFormatCDL();
     FileFormat * CreateFileFormatCC();
     FileFormat * CreateFileFormatCSP();
     FileFormat * CreateFileFormatHDL();
diff -Nru opencolorio-1.0.9~dfsg0/src/core/GroupTransform.cpp opencolorio-1.1.0~dfsg0/src/core/GroupTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/GroupTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/GroupTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -104,7 +104,10 @@
     
     GroupTransform& GroupTransform::operator= (const GroupTransform & rhs)
     {
-        *m_impl = *rhs.m_impl;
+        if(this!=&rhs)
+        {
+            *m_impl = *rhs.m_impl;
+        }
         return *this;
     }
     
@@ -152,12 +155,15 @@
     
     std::ostream& operator<< (std::ostream& os, const GroupTransform& groupTransform)
     {
+        os << "<GroupTransform ";
+        os << "direction=" << TransformDirectionToString(groupTransform.getDirection()) << ", ";
+        os << "transforms=";
         for(int i=0; i<groupTransform.size(); ++i)
         {
-            if(i!=groupTransform.size()-1) os << "\n";
             ConstTransformRcPtr transform = groupTransform.getTransform(i);
-            os << "\t" << *transform;
+            os << "\n\t" << *transform;
         }
+        os << ">";
         return os;
     }
     
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Logging.cpp opencolorio-1.1.0~dfsg0/src/core/Logging.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Logging.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Logging.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -35,6 +35,7 @@
 #include "Logging.h"
 #include "Mutex.h"
 #include "pystring/pystring.h"
+#include "Platform.h"
 
 OCIO_NAMESPACE_ENTER
 {
@@ -56,11 +57,12 @@
             
             g_initialized = true;
             
-            char* levelstr = std::getenv(OCIO_LOGGING_LEVEL_ENVVAR);
-            if(levelstr)
+            std::string levelstr;
+            Platform::getenv(OCIO_LOGGING_LEVEL_ENVVAR, levelstr);
+            if(!levelstr.empty())
             {
                 g_loggingOverride = true;
-                g_logginglevel = LoggingLevelFromString(levelstr);
+                g_logginglevel = LoggingLevelFromString(levelstr.c_str());
                 
                 if(g_logginglevel == LOGGING_LEVEL_UNKNOWN)
                 {
diff -Nru opencolorio-1.0.9~dfsg0/src/core/LogOps.cpp opencolorio-1.1.0~dfsg0/src/core/LogOps.cpp
--- opencolorio-1.0.9~dfsg0/src/core/LogOps.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/LogOps.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -29,6 +29,7 @@
 #include <cmath>
 #include <cstring>
 #include <iostream>
+#include <algorithm>
 
 #include <OpenColorIO/OpenColorIO.h>
 
@@ -300,7 +301,7 @@
                 
                 float knew[3] = { m_k[0] / logf(m_base[0]),
                                   m_k[1] / logf(m_base[1]),
-                                  m_k[2] / logf(m_base[0]) };
+                                  m_k[2] / logf(m_base[2]) };
                 
                 float clampMin[3] = { FLTMIN, FLTMIN, FLTMIN };
                 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/LogTransform.cpp opencolorio-1.1.0~dfsg0/src/core/LogTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/LogTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/LogTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -122,8 +122,8 @@
     {
         os << "<LogTransform ";
         os << "base=" << t.getBase() << ", ";
-        os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "direction=" << TransformDirectionToString(t.getDirection());
+        os << ">";
         
         return os;
     }
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Look.cpp opencolorio-1.1.0~dfsg0/src/core/Look.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Look.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Look.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -49,6 +49,7 @@
     public:
         std::string name_;
         std::string processSpace_;
+        std::string description_;
         TransformRcPtr transform_;
         TransformRcPtr inverseTransform_;
         
@@ -62,6 +63,7 @@
         {
             name_ = rhs.name_;
             processSpace_ = rhs.processSpace_;
+            description_ = rhs.description_;
             
             transform_ = rhs.transform_;
             if(transform_) transform_ = transform_->createEditableCopy();
@@ -136,23 +138,32 @@
         getImpl()->inverseTransform_ = transform->createEditableCopy();
     }
     
-    
+    const char * Look::getDescription() const
+    {
+        return getImpl()->description_.c_str();
+    }
+
+    void Look::setDescription(const char * description)
+    {
+        getImpl()->description_ = description;
+    }
+
     std::ostream& operator<< (std::ostream& os, const Look& look)
     {
-        os << "<Look ";
-        os << "name=" << look.getName() << ", ";
-        os << "processSpace=" << look.getProcessSpace() << ", ";
+        os << "<Look";
+        os << " name=" << look.getName();
+        os << ", processSpace=" << look.getProcessSpace();
         
         if(look.getTransform())
         {
-            os << "\tTransform: ";
-            os << *look.getTransform();
+            os << ",\n    transform=";
+            os << "\n\t" << *look.getTransform();
         }
         
         if(look.getInverseTransform())
         {
-            os << "\tInverseTransform: ";
-            os << *look.getInverseTransform();
+            os << ",\n    inverseTransform=";
+            os << "\n\t" << *look.getInverseTransform();
         }
         
         os << ">";
diff -Nru opencolorio-1.0.9~dfsg0/src/core/LookTransform.cpp opencolorio-1.1.0~dfsg0/src/core/LookTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/LookTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/LookTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -146,12 +146,12 @@
     
     std::ostream& operator<< (std::ostream& os, const LookTransform& t)
     {
-        os << "<LookTransform ";
-        os << "src=" << t.getSrc() << ", ";
-        os << "dst=" << t.getDst() << ", ";
-        os << "looks=" << t.getLooks() << ", ";
-        os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "<LookTransform";
+        os << " src=" << t.getSrc();
+        os << ", dst=" << t.getDst();
+        os << ", looks=" << t.getLooks();
+        os << ", direction=" << TransformDirectionToString(t.getDirection());
+        os << ">";
         return os;
     }
     
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Lut1DOp.cpp opencolorio-1.1.0~dfsg0/src/core/Lut1DOp.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Lut1DOp.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Lut1DOp.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -156,8 +156,8 @@
             md5_byte_t digest[16];
             
             md5_init(&state);
-            md5_append(&state, (const md5_byte_t *)from_min, 3*sizeof(float));
-            md5_append(&state, (const md5_byte_t *)from_max, 3*sizeof(float));
+            md5_append(&state, (const md5_byte_t *)from_min, (int)(3*sizeof(float)));
+            md5_append(&state, (const md5_byte_t *)from_max, (int)(3*sizeof(float)));
             
             for(int i=0; i<3; ++i)
             {
@@ -297,7 +297,7 @@
             int indexLow = clamp(std::floor(index), 0.0f, maxIndex);
             int indexHigh = clamp(std::ceil(index), 0.0f, maxIndex);
             float delta = index - (float)indexLow;
-            return (1.0f-delta) * simple_lut[indexLow] + delta * simple_lut[indexHigh];
+            return simple_lut[indexLow] + delta * (simple_lut[indexHigh] - simple_lut[indexLow]);
         }
         
         void Lut1D_Linear(float* rgbaBuffer, long numPixels, const Lut1D & lut)
@@ -404,7 +404,7 @@
                 delta = (v - *lowbound) / (*highbound - *lowbound);
             }
             
-            return ((float)(lowbound - start) + delta) * invMaxIndex;
+            return std::max(((float)(lowbound - start) + delta) * invMaxIndex, 0.0f);
         }
         
         void Lut1D_LinearInverse(float* rgbaBuffer, long numPixels, const Lut1D & lut)
@@ -771,6 +771,48 @@
     }
 }
 
+
+OIIO_ADD_TEST(Lut1DOp, ExtrapolationErrors)
+{
+    OCIO::Lut1DRcPtr lut = OCIO::Lut1D::Create();
+    lut->from_min[0] = 0.0f;
+    lut->from_min[2] = 0.0f;
+    lut->from_min[2] = 0.0f;
+
+    lut->from_max[0] = 1.0f;
+    lut->from_max[1] = 1.0f;
+    lut->from_max[2] = 1.0f;
+
+    // Simple y=x+0.1 LUT
+    for(int c=0; c<3; ++c)
+    {
+        lut->luts[c].push_back(0.1f);
+        lut->luts[c].push_back(0.6f);
+        lut->luts[c].push_back(1.1f);
+    }
+
+    lut->maxerror = 1e-5f;
+    lut->errortype = OCIO::ERROR_RELATIVE;
+    OIIO_CHECK_EQUAL(lut->isNoOp(), false);
+
+    const int PIXELS = 5;
+    float inputBuffer_linearforward[PIXELS*4] = { -0.1f, -0.2f, -10.0f, 0.0f,
+                                                   0.5f, 1.0f, 1.1f, 0.0f,
+                                                   10.1f, 55.0f, 2.3f, 0.0f,
+                                                   9.1f, 1.0e6f, 1.0e9f, 0.0f,
+                                                   4.0e9f, 9.5e7f, 0.5f, 0.0f };
+    float outputBuffer_linearforward[PIXELS*4] = { 0.1f, 0.1f, 0.1f, 0.0f,
+                                                   0.6f, 1.1f, 1.1f, 0.0f,
+                                                   1.1f, 1.1f, 1.1f, 0.0f,
+                                                   1.1f, 1.1f, 1.1f, 0.0f,
+                                                   1.1f, 1.1f, 0.6f, 0.0f };
+    OCIO::Lut1D_Linear(inputBuffer_linearforward, PIXELS, *lut);
+    for(size_t i=0; i <sizeof(inputBuffer_linearforward)/sizeof(inputBuffer_linearforward[0]); ++i)
+    {
+        OIIO_CHECK_CLOSE(inputBuffer_linearforward[i], outputBuffer_linearforward[i], 1e-5f);
+    }
+}
+
 
 OIIO_ADD_TEST(Lut1DOp, Inverse)
 {
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Lut3DOp.cpp opencolorio-1.1.0~dfsg0/src/core/Lut3DOp.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Lut3DOp.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Lut3DOp.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -35,6 +35,7 @@
 #include <cmath>
 #include <limits>
 #include <sstream>
+#include <algorithm>
 
 OCIO_NAMESPACE_ENTER
 {
@@ -68,10 +69,10 @@
         
         md5_init(&state);
         
-        md5_append(&state, (const md5_byte_t *)from_min, 3*sizeof(float));
-        md5_append(&state, (const md5_byte_t *)from_max, 3*sizeof(float));
-        md5_append(&state, (const md5_byte_t *)size, 3*sizeof(int));
-        md5_append(&state, (const md5_byte_t *)&lut[0], (int) (lut.size()*sizeof(float)));
+        md5_append(&state, (const md5_byte_t *)from_min, (int)(3*sizeof(float)));
+        md5_append(&state, (const md5_byte_t *)from_max, (int)(3*sizeof(float)));
+        md5_append(&state, (const md5_byte_t *)size,     (int)(3*sizeof(int)));
+        md5_append(&state, (const md5_byte_t *)&lut[0],  (int)(lut.size()*sizeof(float)));
         
         md5_finish(&state, digest);
         
@@ -750,7 +751,9 @@
 
 #include <cstring>
 #include <cstdlib>
+#ifndef WIN32
 #include <sys/time.h>
+#endif
 
 namespace OCIO = OCIO_NAMESPACE;
 #include "UnitTest.h"
diff -Nru opencolorio-1.0.9~dfsg0/src/core/MatrixOps.cpp opencolorio-1.1.0~dfsg0/src/core/MatrixOps.cpp
--- opencolorio-1.0.9~dfsg0/src/core/MatrixOps.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/MatrixOps.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -379,8 +379,8 @@
             md5_state_t state;
             md5_byte_t digest[16];
             md5_init(&state);
-            md5_append(&state, (const md5_byte_t *)m_m44, 16*sizeof(float));
-            md5_append(&state, (const md5_byte_t *)m_offset4, 4*sizeof(float));
+            md5_append(&state, (const md5_byte_t *)m_m44,     (int)(16*sizeof(float)));
+            md5_append(&state, (const md5_byte_t *)m_offset4, (int)(4*sizeof(float)));
             md5_finish(&state, digest);
             
             std::ostringstream cacheIDStream;
diff -Nru opencolorio-1.0.9~dfsg0/src/core/MatrixTransform.cpp opencolorio-1.1.0~dfsg0/src/core/MatrixTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/MatrixTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/MatrixTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -356,11 +356,30 @@
     
     std::ostream& operator<< (std::ostream& os, const MatrixTransform& t)
     {
+        float matrix[16], offset[4];
+
+        t.getMatrix(matrix);
+        t.getOffset(offset);
+
         os << "<MatrixTransform ";
         os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "matrix=" << matrix[0];
+        for (int i = 1; i < 16; ++i)
+        {
+            os << " " << matrix[i];
+        }
+        os << ", offset=" << offset[0];
+        for (int i = 1; i < 4; ++i)
+        {
+            os << " " << offset[i];
+        }
+        os << ">";
         return os;
     }
+        TransformDirection dir_;
+        float matrix_[16];
+        float offset_[4];
+        
     
     
     ///////////////////////////////////////////////////////////////////////////
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Mutex.h opencolorio-1.1.0~dfsg0/src/core/Mutex.h
--- opencolorio-1.0.9~dfsg0/src/core/Mutex.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Mutex.h	2018-01-05 01:38:27.000000000 +0000
@@ -98,16 +98,13 @@
     };
 
 #ifndef NDEBUG
-    // add debug wrappers to mutex and spinlock
+    // add debug wrappers to mutex
     typedef DebugLock<_Mutex> Mutex;
-    typedef DebugLock<_SpinLock> SpinLock;
 #else
     typedef _Mutex Mutex;
-    typedef _SpinLock SpinLock;
 #endif
 
     typedef AutoLock<Mutex> AutoMutex;
-    typedef AutoLock<SpinLock> AutoSpin;
 
 }
 OCIO_NAMESPACE_EXIT
diff -Nru opencolorio-1.0.9~dfsg0/src/core/NoOps.cpp opencolorio-1.1.0~dfsg0/src/core/NoOps.cpp
--- opencolorio-1.0.9~dfsg0/src/core/NoOps.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/NoOps.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -411,13 +411,13 @@
         
         OpRcPtr LookNoOp::clone() const
         {
-            OpRcPtr op = OpRcPtr(new FileNoOp(m_look));
+            OpRcPtr op = OpRcPtr(new LookNoOp(m_look));
             return op;
         }
         
         bool LookNoOp::isSameType(const OpRcPtr & op) const
         {
-            FileNoOpRcPtr typedRcPtr = DynamicPtrCast<FileNoOp>(op);
+            LookNoOpRcPtr typedRcPtr = DynamicPtrCast<LookNoOp>(op);
             if(!typedRcPtr) return false;
             return true;
         }
@@ -508,9 +508,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 0);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 0);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     }
     
     {
@@ -524,9 +524,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 0);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 0);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     }
     
     {
@@ -542,9 +542,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 0);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 0);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     }
     
     {
@@ -561,9 +561,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 4);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 1);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     }
     
     {
@@ -578,9 +578,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 1);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 0);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     }
     
     {
@@ -600,9 +600,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 4);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 2);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     }
     
     {
@@ -624,9 +624,9 @@
     OIIO_CHECK_EQUAL(gpuLatticeOps.size(), 8);
     OIIO_CHECK_EQUAL(gpuPostOps.size(), 2);
     
-    OIIO_CHECK_NO_THOW( AssertPartitionIntegrity(gpuPreOps,
-                                                 gpuLatticeOps,
-                                                 gpuPostOps) );
+    OIIO_CHECK_NO_THROW( AssertPartitionIntegrity(gpuPreOps,
+                                                  gpuLatticeOps,
+                                                  gpuPostOps) );
     /*
     std::cerr << "gpuPreOps" << std::endl;
     std::cerr << SerializeOpVec(gpuPreOps, 4) << std::endl;
diff -Nru opencolorio-1.0.9~dfsg0/src/core/OCIOYaml.cpp opencolorio-1.1.0~dfsg0/src/core/OCIOYaml.cpp
--- opencolorio-1.0.9~dfsg0/src/core/OCIOYaml.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/OCIOYaml.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -30,1188 +30,1831 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
+#ifndef WIN32
+
+// fwd declare yaml-cpp visibility
+#pragma GCC visibility push(hidden)
+namespace YAML {
+    class Exception;
+    class BadDereference;
+    class RepresentationException;
+    class EmitterException;
+    class ParserException;
+    class InvalidScalar;
+    class KeyNotFound;
+    template <typename T> class TypedKeyNotFound;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
+    template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
+}
+#pragma GCC visibility pop
+
+#endif
+
+#ifdef WIN32
+#pragma warning( push )
+#pragma warning( disable: 4146 )
+#endif
+
+#include <yaml-cpp/yaml.h>
+
+#ifdef WIN32
+#pragma warning( pop )
+#endif
+
 #include "Logging.h"
 #include "MathUtils.h"
+#include "pystring/pystring.h"
+#include "PathUtils.h"
+#include "ParseUtils.h"
+#include "Display.h"
 #include "OCIOYaml.h"
 
 OCIO_NAMESPACE_ENTER
 {
-    ///////////////////////////////////////////////////////////////////////////
-    //  Core
     
-    void LogUnknownKeyWarning(const std::string & name, const YAML::Node& tag)
+    namespace
     {
-        std::string key;
-        tag >> key;
-        
-        std::ostringstream os;
-        os << "Unknown key in " << name << ": ";
-        os << "'" << key << "'. (line ";
-        os << (tag.GetMark().line+1) << ", column "; // (yaml line numbers start at 0)
-        os << tag.GetMark().column << ")";
-        LogWarning(os.str());
-    }
     
-    void operator >> (const YAML::Node& node, ColorSpaceRcPtr& cs)
-    {
-        if(node.Tag() != "ColorSpace")
-            return; // not a !<ColorSpace> tag
+#ifdef OLDYAML
+        typedef YAML::Iterator Iterator;
+#else
+        typedef YAML::const_iterator Iterator;
+#endif
+
+        // Iterator access
+        // Note: The ownership semantics have changed between yaml-cpp 0.3.x and 0.5.x .
+        // Returning a const reference to a yaml node screws with the internal yaml-cpp smart ptr 
+        // implementation in the newer version. Luckily, the compiler does not care if we maintain
+        // const YAML::Node & = get_first(iter) syntax at the call site even when returning an actual object
+        // (instead of the reference as expected).
+#ifdef OLDYAML
+        inline const YAML::Node& get_first(const Iterator &it)
+        {
+            return it.first();
+        }
+#else
+        inline YAML::Node get_first(const Iterator &it)
+        {
+            return it->first;
+        }
+#endif
+        
+#ifdef OLDYAML
+        inline const YAML::Node& get_second(const Iterator &it)
+        {
+            return it.second();
+        }
+#else
+        inline YAML::Node get_second(const Iterator &it)
+        {
+            return it->second;
+        }
+#endif
         
-        std::string key, stringval;
-        bool boolval;
+        // Basic types
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void load(const YAML::Node& node, bool& x)
         {
-            iter.first() >> key;
-            
-            if(key == "name")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    cs->setName(stringval.c_str());
-            }
-            else if(key == "description")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    cs->setDescription(stringval.c_str());
-            }
-            else if(key == "family")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    cs->setFamily(stringval.c_str());
-            }
-            else if(key == "equalitygroup")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    cs->setEqualityGroup(stringval.c_str());
-            }
-            else if(key == "bitdepth")
-            {
-                BitDepth ret;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<BitDepth>(ret))
-                    cs->setBitDepth(ret);
-            }
-            else if(key == "isdata")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<bool>(boolval))
-                    cs->setIsData(boolval);
-            }
-            else if(key == "allocation")
-            {
-                Allocation val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<Allocation>(val))
-                    cs->setAllocation(val);
-            }
-            else if(key == "allocationvars")
-            {
-                std::vector<float> val;
-                if (iter.second().Type() != YAML::NodeType::Null)
-                {
-                    iter.second() >> val;
-                    if(!val.empty())
-                    {
-                        cs->setAllocationVars(static_cast<int>(val.size()), &val[0]);
-                    }
-                }
-            }
-            else if(key == "to_reference")
-            {
-                TransformRcPtr val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformRcPtr>(val))
-                  cs->setTransform(val, COLORSPACE_DIR_TO_REFERENCE);
-            }
-            else if(key == "from_reference")
-            {
-                TransformRcPtr val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformRcPtr>(val))
-                  cs->setTransform(val, COLORSPACE_DIR_FROM_REFERENCE);
-            }
-            else
-            {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
-            }
+#ifdef OLDYAML
+            node.Read<bool>(x);
+#else
+            x = node.as<bool>();
+#endif
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ColorSpaceRcPtr cs)
-    {
-        out << YAML::VerbatimTag("ColorSpace");
-        out << YAML::BeginMap;
         
-        out << YAML::Key << "name" << YAML::Value << cs->getName();
-        out << YAML::Key << "family" << YAML::Value << cs->getFamily();
-        out << YAML::Key << "equalitygroup" << YAML::Value << cs->getEqualityGroup();
-        out << YAML::Key << "bitdepth" << YAML::Value << cs->getBitDepth();
-        if(strlen(cs->getDescription()) > 0)
+        inline void load(const YAML::Node& node, int& x)
         {
-            out << YAML::Key << "description";
-            out << YAML::Value << YAML::Literal << cs->getDescription();
+#ifdef OLDYAML
+            node.Read<int>(x);
+#else
+            x = node.as<int>();
+#endif
         }
-        out << YAML::Key << "isdata" << YAML::Value << cs->isData();
         
-        out << YAML::Key << "allocation" << YAML::Value << cs->getAllocation();
-        if(cs->getAllocationNumVars() > 0)
+        inline void load(const YAML::Node& node, float& x)
         {
-            std::vector<float> allocationvars(cs->getAllocationNumVars());
-            cs->getAllocationVars(&allocationvars[0]);
-            out << YAML::Key << "allocationvars";
-            out << YAML::Flow << YAML::Value << allocationvars;
+#ifdef OLDYAML
+            node.Read<float>(x);
+#else
+            x = node.as<float>();
+#endif
         }
         
-        ConstTransformRcPtr toref = \
-            cs->getTransform(COLORSPACE_DIR_TO_REFERENCE);
-        if(toref)
-            out << YAML::Key << "to_reference" << YAML::Value << toref;
+        inline void load(const YAML::Node& node, std::string& x)
+        {
+#ifdef OLDYAML
+            node.Read<std::string>(x);
+#else
+            x = node.as<std::string>();
+#endif
+        }
         
-        ConstTransformRcPtr fromref = \
-            cs->getTransform(COLORSPACE_DIR_FROM_REFERENCE);
-        if(fromref)
-            out << YAML::Key << "from_reference" << YAML::Value << fromref;
+        inline void load(const YAML::Node& node, std::vector<std::string>& x)
+        {
+#ifdef OLDYAML
+            node >> x;
+#else
+            x = node.as<std::vector<std::string> >();
+#endif
+        }
         
-        out << YAML::EndMap;
-        out << YAML::Newline;
+        inline void load(const YAML::Node& node, std::vector<float>& x)
+        {
+#ifdef OLDYAML
+            node >> x;
+#else
+            x = node.as<std::vector<float> >();
+#endif
+        }
         
-        return out;
-    }
-    
-    
-    ///////////////////////////////////////////////////////////////////////////
-    
-    // Look. (not the transform, the top-level class)
-    
-    void operator >> (const YAML::Node& node, LookRcPtr& look)
-    {
-        if(node.Tag() != "Look")
-            return;
+        // Enums
         
-        std::string key, stringval;
+        inline void load(const YAML::Node& node, BitDepth& depth)
+        {
+            std::string str;
+            load(node, str);
+            depth = BitDepthFromString(str.c_str());
+        }
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void save(YAML::Emitter& out, BitDepth depth)
         {
-            iter.first() >> key;
-            
-            if(key == "name")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    look->setName(stringval.c_str());
-            }
-            else if(key == "process_space")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                    look->setProcessSpace(stringval.c_str());
-            }
-            else if(key == "transform")
-            {
-                TransformRcPtr val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformRcPtr>(val))
-                    look->setTransform(val);
-            }
-            else if(key == "inverse_transform")
-            {
-                TransformRcPtr val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformRcPtr>(val))
-                    look->setInverseTransform(val);
-            }
-            else
-            {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
-            }
+            out << BitDepthToString(depth);
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, LookRcPtr look)
-    {
-        out << YAML::VerbatimTag("Look");
-        out << YAML::BeginMap;
-        out << YAML::Key << "name" << YAML::Value << look->getName();
-        out << YAML::Key << "process_space" << YAML::Value << look->getProcessSpace();
         
-        if(look->getTransform())
+        inline void load(const YAML::Node& node, Allocation& alloc)
         {
-            out << YAML::Key << "transform";
-            out << YAML::Value << look->getTransform();
+            std::string str;
+            load(node, str);
+            alloc = AllocationFromString(str.c_str());
         }
         
-        if(look->getInverseTransform())
+        inline void save(YAML::Emitter& out, Allocation alloc)
         {
-            out << YAML::Key << "inverse_transform";
-            out << YAML::Value << look->getInverseTransform();
+            out << AllocationToString(alloc);
         }
         
-        out << YAML::EndMap;
-        out << YAML::Newline;
+        inline void load(const YAML::Node& node, ColorSpaceDirection& dir)
+        {
+            std::string str;
+            load(node, str);
+            dir = ColorSpaceDirectionFromString(str.c_str());
+        }
         
-        return out;
-    }
-    
-    
-    
-    ///////////////////////////////////////////////////////////////////////////
-    
-    
-    namespace
-    {
-        void EmitBaseTransformKeyValues(YAML::Emitter & out,
-                                        const ConstTransformRcPtr & t)
+        inline void save(YAML::Emitter& out, ColorSpaceDirection dir)
         {
-            if(t->getDirection() != TRANSFORM_DIR_FORWARD)
-            {
-                out << YAML::Key << "direction";
-                out << YAML::Value << YAML::Flow << t->getDirection();
-            }
+            out << ColorSpaceDirectionToString(dir);
         }
-    }
-    
-    void operator >> (const YAML::Node& node, TransformRcPtr& t)
-    {
-        if(node.Type() != YAML::NodeType::Map)
+        
+        inline void load(const YAML::Node& node, TransformDirection& dir)
         {
-            std::ostringstream os;
-            os << "Unsupported Transform type encountered: (" << node.Type() << ") in OCIO profile. ";
-            os << "Only Mapping types supported. (line ";
-            os << (node.GetMark().line+1) << ", column "; // (yaml line numbers start at 0)
-            os << node.GetMark().column << ")";
-            throw Exception(os.str().c_str());
+            std::string str;
+            load(node, str);
+            dir = TransformDirectionFromString(str.c_str());
         }
         
-        std::string type = node.Tag();
+        inline void save(YAML::Emitter& out, TransformDirection dir)
+        {
+            out << TransformDirectionToString(dir);
+        }
         
-        if(type == "AllocationTransform") {
-            AllocationTransformRcPtr temp;
-            node.Read<AllocationTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "CDLTransform") {
-            CDLTransformRcPtr temp;
-            node.Read<CDLTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "ColorSpaceTransform")  {
-            ColorSpaceTransformRcPtr temp;
-            node.Read<ColorSpaceTransformRcPtr>(temp);
-            t = temp;
-        }
-        // TODO: DisplayTransform
-        else if(type == "ExponentTransform")  {
-            ExponentTransformRcPtr temp;
-            node.Read<ExponentTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "FileTransform")  {
-            FileTransformRcPtr temp;
-            node.Read<FileTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "GroupTransform") {
-            GroupTransformRcPtr temp;
-            node.Read<GroupTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "LogTransform") {
-            LogTransformRcPtr temp;
-            node.Read<LogTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "LookTransform") {
-            LookTransformRcPtr temp;
-            node.Read<LookTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "MatrixTransform")  {
-            MatrixTransformRcPtr temp;
-            node.Read<MatrixTransformRcPtr>(temp);
-            t = temp;
-        }
-        else if(type == "TruelightTransform")  {
-            TruelightTransformRcPtr temp;
-            node.Read<TruelightTransformRcPtr>(temp);
-            t = temp;
-        }
-        else
-        {
-            // TODO: add a new empty (better name?) aka passthru Transform()
-            // which does nothing. This is so upsupported !<tag> types don't
-            // throw an exception. Alternativly this could be caught in the
-            // GroupTransformRcPtr >> operator with some type of
-            // supported_tag() method
-            
-            // TODO: consider the forwards-compatibility implication of
-            // throwing an exception.  Should this be a warning, instead?
-            
-            //  t = EmptyTransformRcPtr(new EmptyTransform(), &deleter);
-            std::ostringstream os;
-            os << "Unsupported transform type !<" << type << "> in OCIO profile. ";
-            os << " (line ";
-            os << (node.GetMark().line+1) << ", column "; // (yaml line numbers start at 0)
-            os << node.GetMark().column << ")";
-            throw Exception(os.str().c_str());
+        inline void load(const YAML::Node& node, Interpolation& interp)
+        {
+            std::string str;
+            load(node, str);
+            interp = InterpolationFromString(str.c_str());
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstTransformRcPtr t)
-    {
-        if(ConstAllocationTransformRcPtr Allocation_tran = \
-            DynamicPtrCast<const AllocationTransform>(t))
-            out << Allocation_tran;
-        else if(ConstCDLTransformRcPtr CDL_tran = \
-            DynamicPtrCast<const CDLTransform>(t))
-            out << CDL_tran;
-        else if(ConstColorSpaceTransformRcPtr ColorSpace_tran = \
-            DynamicPtrCast<const ColorSpaceTransform>(t))
-            out << ColorSpace_tran;
-        else if(ConstExponentTransformRcPtr Exponent_tran = \
-            DynamicPtrCast<const ExponentTransform>(t))
-            out << Exponent_tran;
-        else if(ConstFileTransformRcPtr File_tran = \
-            DynamicPtrCast<const FileTransform>(t))
-            out << File_tran;
-        else if(ConstGroupTransformRcPtr Group_tran = \
-            DynamicPtrCast<const GroupTransform>(t))
-            out << Group_tran;
-        else if(ConstLogTransformRcPtr Log_tran = \
-            DynamicPtrCast<const LogTransform>(t))
-            out << Log_tran;
-        else if(ConstLookTransformRcPtr Look_tran = \
-            DynamicPtrCast<const LookTransform>(t))
-            out << Look_tran;
-        else if(ConstMatrixTransformRcPtr Matrix_tran = \
-            DynamicPtrCast<const MatrixTransform>(t))
-            out << Matrix_tran;
-        else if(ConstTruelightTransformRcPtr Truelight_tran = \
-            DynamicPtrCast<const TruelightTransform>(t))
-            out << Truelight_tran;
-        else
-            throw Exception("Unsupported Transform() type for serialization.");
         
-        return out;
-    }
-    
-    
-    ///////////////////////////////////////////////////////////////////////////
-    //  Transforms
-    
-    void operator >> (const YAML::Node& node, GroupTransformRcPtr& t)
-    {
-        t = GroupTransform::Create();
+        inline void save(YAML::Emitter& out, Interpolation interp)
+        {
+            out << InterpolationToString(interp);
+        }
+        
+        //
+        
+        inline void LogUnknownKeyWarning(const std::string & name,
+                                         const YAML::Node& tag)
+        {
+            std::string key;
+            load(tag, key);
         
-        std::string key;
+            std::ostringstream os;
+            os << "Unknown key in " << name << ": '" << key << "'.";
+            LogWarning(os.str());
+        }
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        // View
+        
+        inline void load(const YAML::Node& node, View& v)
         {
-            iter.first() >> key;
+            if(node.Tag() != "View")
+                return;
             
-            if(key == "children")
-            {
-                const YAML::Node & children = iter.second();
-                for(unsigned i = 0; i <children.size(); ++i)
+            std::string key, stringval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "name")
                 {
-                    TransformRcPtr childTransform;
-                    children[i].Read<TransformRcPtr>(childTransform);
-                    
-                    // TODO: consider the forwards-compatibility implication of
-                    // throwing an exception.  Should this be a warning, instead?
-                    if(!childTransform)
-                    {
-                        throw Exception("Child transform could not be parsed.");
-                    }
-                    
-                    t->push_back(childTransform);
+                    load(second, stringval);
+                    v.name = stringval;
+                }
+                else if(key == "colorspace")
+                {
+                    load(second, stringval);
+                    v.colorspace = stringval;
+                }
+                else if(key == "looks" || key == "look")
+                {
+                    load(second, stringval);
+                    v.looks = stringval;
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
                 }
             }
-            else if(key == "direction")
+            
+            if(v.name.empty())
             {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
+                throw Exception("View does not specify 'name'.");
             }
-            else
+            if(v.colorspace.empty())
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                std::ostringstream os;
+                os << "View '" << v.name << "' ";
+                os << "does not specify colorspace.";
+                throw Exception(os.str().c_str());
             }
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstGroupTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("GroupTransform");
-        out << YAML::BeginMap;
-        EmitBaseTransformKeyValues(out, t);
         
-        out << YAML::Key << "children";
-        out << YAML::Value;
-        
-        out << YAML::BeginSeq;
-        for(int i = 0; i < t->size(); ++i)
+        inline void save(YAML::Emitter& out, View view)
         {
-            out << t->getTransform(i);
+            out << YAML::VerbatimTag("View");
+            out << YAML::Flow;
+            out << YAML::BeginMap;
+            out << YAML::Key << "name" << YAML::Value << view.name;
+            out << YAML::Key << "colorspace" << YAML::Value << view.colorspace;
+            if(!view.looks.empty()) out << YAML::Key << "looks" << YAML::Value << view.looks;
+            out << YAML::EndMap;
         }
-        out << YAML::EndSeq;
-        
-        out << YAML::EndMap;
-        
-        return out;
-    }
-    
-    
-    
-    void operator >> (const YAML::Node& node, FileTransformRcPtr& t)
-    {
-        t = FileTransform::Create();
         
-        std::string key, stringval;
+        // Common Transform
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void EmitBaseTransformKeyValues(YAML::Emitter & out,
+                                               const ConstTransformRcPtr & t)
         {
-            iter.first() >> key;
-            
-            if(key == "src")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setSrc(stringval.c_str());
-            }
-            else if(key == "cccid")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setCCCId(stringval.c_str());
-            }
-            else if(key == "interpolation")
-            {
-                Interpolation val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<Interpolation>(val))
-                  t->setInterpolation(val);
-            }
-            else if(key == "direction")
-            {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
-            }
-            else
+            if(t->getDirection() != TRANSFORM_DIR_FORWARD)
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                out << YAML::Key << "direction";
+                out << YAML::Value << YAML::Flow;
+                save(out, t->getDirection());
             }
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstFileTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("FileTransform");
-        out << YAML::Flow << YAML::BeginMap;
-        out << YAML::Key << "src" << YAML::Value << t->getSrc();
-        const char * cccid = t->getCCCId();
-        if(cccid && *cccid)
-        {
-            out << YAML::Key << "cccid" << YAML::Value << t->getCCCId();
-        }
-        out << YAML::Key << "interpolation";
-        out << YAML::Value << t->getInterpolation();
-        
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, ColorSpaceTransformRcPtr& t)
-    {
-        t = ColorSpaceTransform::Create();
         
-        std::string key, stringval;
+        // AllocationTransform
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void load(const YAML::Node& node, AllocationTransformRcPtr& t)
         {
-            iter.first() >> key;
+            t = AllocationTransform::Create();
             
-            if(key == "src")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setSrc(stringval.c_str());
-            }
-            else if(key == "dst")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setDst(stringval.c_str());
-            }
-            else if(key == "direction")
-            {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
-            }
-            else
-            {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+            std::string key;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "allocation")
+                {
+                    Allocation val;
+                    load(second, val);
+                    t->setAllocation(val);
+                }
+                else if(key == "vars")
+                {
+                    std::vector<float> val;
+                    load(second, val);
+                    if(!val.empty())
+                    {
+                        t->setVars(static_cast<int>(val.size()), &val[0]);
+                    }
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
             }
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstColorSpaceTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("ColorSpaceTransform");
-        out << YAML::Flow << YAML::BeginMap;
-        out << YAML::Key << "src" << YAML::Value << t->getSrc();
-        out << YAML::Key << "dst" << YAML::Value << t->getDst();
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, LookTransformRcPtr& t)
-    {
-        t = LookTransform::Create();
-        
-        std::string key, stringval;
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void save(YAML::Emitter& out, ConstAllocationTransformRcPtr t)
         {
-            iter.first() >> key;
+            out << YAML::VerbatimTag("AllocationTransform");
+            out << YAML::Flow << YAML::BeginMap;
             
-            if(key == "src")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setSrc(stringval.c_str());
-            }
-            else if(key == "dst")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setDst(stringval.c_str());
-            }
-            else if(key == "looks")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setLooks(stringval.c_str());
-            }
-            else if(key == "direction")
-            {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
-            }
-            else
+            out << YAML::Key << "allocation";
+            out << YAML::Value << YAML::Flow;
+            save(out, t->getAllocation());
+            
+            if(t->getNumVars() > 0)
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                std::vector<float> vars(t->getNumVars());
+                t->getVars(&vars[0]);
+                out << YAML::Key << "vars";
+                out << YAML::Flow << YAML::Value << vars;
             }
+            
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstLookTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("LookTransform");
-        out << YAML::Flow << YAML::BeginMap;
-        out << YAML::Key << "src" << YAML::Value << t->getSrc();
-        out << YAML::Key << "dst" << YAML::Value << t->getDst();
-        out << YAML::Key << "looks" << YAML::Value << t->getLooks();
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, ExponentTransformRcPtr& t)
-    {
-        t = ExponentTransform::Create();
         
-        std::string key;
+        // CDLTransform
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void load(const YAML::Node& node, CDLTransformRcPtr& t)
         {
-            iter.first() >> key;
+            t = CDLTransform::Create();
             
-            if(key == "value")
-            {
-                std::vector<float> val;
-                if (iter.second().Type() != YAML::NodeType::Null)
+            std::string key;
+            std::vector<float> floatvecval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "slope")
                 {
-                    iter.second() >> val;
-                    if(val.size() != 4)
+                    load(second, floatvecval);
+                    if(floatvecval.size() != 3)
                     {
                         std::ostringstream os;
-                        os << "ExponentTransform parse error, value field must be 4 ";
-                        os << "floats. Found '" << val.size() << "'.";
+                        os << "CDLTransform parse error, 'slope' field must be 3 ";
+                        os << "floats. Found '" << floatvecval.size() << "'.";
                         throw Exception(os.str().c_str());
                     }
-                    t->setValue(&val[0]);
+                    t->setSlope(&floatvecval[0]);
                 }
-            }
-            else if(key == "direction")
-            {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
-            }
-            else
-            {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
-            }
-        }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstExponentTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("ExponentTransform");
-        out << YAML::Flow << YAML::BeginMap;
-        
-        std::vector<float> value(4, 0.0);
-        t->getValue(&value[0]);
-        out << YAML::Key << "value";
-        out << YAML::Value << YAML::Flow << value;
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, LogTransformRcPtr& t)
-    {
-        t = LogTransform::Create();
-        
-        std::string key;
-        
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
-        {
-            iter.first() >> key;
-            
-            if(key == "base")
-            {
-                float val = 0.0f;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<float>(val))
-                  t->setBase(val);
-            }
-            else if(key == "direction")
-            {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
-            }
-            else
-            {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
-            }
-        }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstLogTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("LogTransform");
-        out << YAML::Flow << YAML::BeginMap;
-        out << YAML::Key << "base" << YAML::Value << t->getBase();
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, MatrixTransformRcPtr& t)
-    {
-        t = MatrixTransform::Create();
-        
-        std::string key;
-        
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
-        {
-            iter.first() >> key;
-            
-            if(key == "matrix")
-            {
-                std::vector<float> val;
-                if (iter.second().Type() != YAML::NodeType::Null)
+                else if(key == "offset")
                 {
-                    iter.second() >> val;
-                    if(val.size() != 16)
+                    load(second, floatvecval);
+                    if(floatvecval.size() != 3)
                     {
                         std::ostringstream os;
-                        os << "MatrixTransform parse error, matrix field must be 16 ";
-                        os << "floats. Found '" << val.size() << "'.";
+                        os << "CDLTransform parse error, 'offset' field must be 3 ";
+                        os << "floats. Found '" << floatvecval.size() << "'.";
                         throw Exception(os.str().c_str());
                     }
-                    t->setMatrix(&val[0]);
+                    t->setOffset(&floatvecval[0]);
                 }
-            }
-            else if(key == "offset")
-            {
-                std::vector<float> val;
-                if (iter.second().Type() != YAML::NodeType::Null)
+                else if(key == "power")
                 {
-                    iter.second() >> val;
-                    if(val.size() != 4)
+                    load(second, floatvecval);
+                    if(floatvecval.size() != 3)
                     {
                         std::ostringstream os;
-                        os << "MatrixTransform parse error, offset field must be 4 ";
-                        os << "floats. Found '" << val.size() << "'.";
+                        os << "CDLTransform parse error, 'power' field must be 3 ";
+                        os << "floats. Found '" << floatvecval.size() << "'.";
                         throw Exception(os.str().c_str());
                     }
-                    t->setOffset(&val[0]);
+                    t->setPower(&floatvecval[0]);
+                }
+                else if(key == "saturation" || key == "sat")
+                {
+                    float val = 0.0f;
+                    load(second, val);
+                    t->setSat(val);
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
                 }
             }
-            else if(key == "direction")
+        }
+        
+        inline void save(YAML::Emitter& out, ConstCDLTransformRcPtr t)
+        {
+            out << YAML::VerbatimTag("CDLTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            
+            std::vector<float> slope(3);
+            t->getSlope(&slope[0]);
+            if(!IsVecEqualToOne(&slope[0], 3))
             {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
+                out << YAML::Key << "slope";
+                out << YAML::Value << YAML::Flow << slope;
             }
-            else
+            
+            std::vector<float> offset(3);
+            t->getOffset(&offset[0]);
+            if(!IsVecEqualToZero(&offset[0], 3))
+            {
+                out << YAML::Key << "offset";
+                out << YAML::Value << YAML::Flow << offset;
+            }
+            
+            std::vector<float> power(3);
+            t->getPower(&power[0]);
+            if(!IsVecEqualToOne(&power[0], 3))
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                out << YAML::Key << "power";
+                out << YAML::Value << YAML::Flow << power;
             }
+            
+            if(!IsScalarEqualToOne(t->getSat()))
+            {
+                out << YAML::Key << "sat" << YAML::Value << t->getSat();
+            }
+            
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstMatrixTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("MatrixTransform");
-        out << YAML::Flow << YAML::BeginMap;
         
-        std::vector<float> matrix(16, 0.0);
-        t->getMatrix(&matrix[0]);
-        if(!IsM44Identity(&matrix[0]))
+        // ColorSpaceTransform
+        
+        inline void load(const YAML::Node& node, ColorSpaceTransformRcPtr& t)
         {
-            out << YAML::Key << "matrix";
-            out << YAML::Value << YAML::Flow << matrix;
+            t = ColorSpaceTransform::Create();
+            
+            std::string key, stringval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "src")
+                {
+                    load(second, stringval);
+                    t->setSrc(stringval.c_str());
+                }
+                else if(key == "dst")
+                {
+                    load(second, stringval);
+                    t->setDst(stringval.c_str());
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
+            }
         }
         
-        std::vector<float> offset(4, 0.0);
-        t->getOffset(&offset[0]);
-        if(!IsVecEqualToZero(&offset[0],4))
+        inline void save(YAML::Emitter& out, ConstColorSpaceTransformRcPtr t)
         {
-            out << YAML::Key << "offset";
-            out << YAML::Value << YAML::Flow << offset;
+            out << YAML::VerbatimTag("ColorSpaceTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            out << YAML::Key << "src" << YAML::Value << t->getSrc();
+            out << YAML::Key << "dst" << YAML::Value << t->getDst();
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
         }
         
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, CDLTransformRcPtr& t)
-    {
-        t = CDLTransform::Create();
-        
-        std::string key;
-        std::vector<float> floatvecval;
+        // ExponentTransform
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void load(const YAML::Node& node, ExponentTransformRcPtr& t)
         {
-            iter.first() >> key;
+            t = ExponentTransform::Create();
             
-            if(key == "slope")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null)
+            std::string key;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "value")
                 {
-                    iter.second() >> floatvecval;
-                    if(floatvecval.size() != 3)
+                    std::vector<float> val;
+                    load(second, val);
+                    if(val.size() != 4)
                     {
                         std::ostringstream os;
-                        os << "CDLTransform parse error, 'slope' field must be 3 ";
-                        os << "floats. Found '" << floatvecval.size() << "'.";
+                        os << "ExponentTransform parse error, value field must be 4 ";
+                        os << "floats. Found '" << val.size() << "'.";
                         throw Exception(os.str().c_str());
                     }
-                    t->setSlope(&floatvecval[0]);
+                    t->setValue(&val[0]);
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
                 }
             }
-            else if(key == "offset")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null)
+        }
+        
+        inline void save(YAML::Emitter& out, ConstExponentTransformRcPtr t)
+        {
+            out << YAML::VerbatimTag("ExponentTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            
+            std::vector<float> value(4, 0.0);
+            t->getValue(&value[0]);
+            out << YAML::Key << "value";
+            out << YAML::Value << YAML::Flow << value;
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
+        }
+        
+        // FileTransform
+        
+        inline void load(const YAML::Node& node, FileTransformRcPtr& t)
+        {
+            t = FileTransform::Create();
+            
+            std::string key, stringval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "src")
                 {
-                    iter.second() >> floatvecval;
-                    if(floatvecval.size() != 3)
-                    {
-                        std::ostringstream os;
-                        os << "CDLTransform parse error, 'offset' field must be 3 ";
-                        os << "floats. Found '" << floatvecval.size() << "'.";
-                        throw Exception(os.str().c_str());
-                    }
-                    t->setOffset(&floatvecval[0]);
+                    load(second, stringval);
+                    t->setSrc(stringval.c_str());
+                }
+                else if(key == "cccid")
+                {
+                    load(second, stringval);
+                    t->setCCCId(stringval.c_str());
+                }
+                else if(key == "interpolation")
+                {
+                    Interpolation val;
+                    load(second, val);
+                    t->setInterpolation(val);
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
                 }
             }
-            else if(key == "power")
-            {
-                if (iter.second().Type() != YAML::NodeType::Null)
+        }
+        
+        inline void save(YAML::Emitter& out, ConstFileTransformRcPtr t)
+        {
+            out << YAML::VerbatimTag("FileTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            out << YAML::Key << "src" << YAML::Value << t->getSrc();
+            const char * cccid = t->getCCCId();
+            if(cccid && *cccid)
+            {
+                out << YAML::Key << "cccid" << YAML::Value << t->getCCCId();
+            }
+            out << YAML::Key << "interpolation";
+            out << YAML::Value;
+            save(out, t->getInterpolation());
+            
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
+        }
+        
+        // GroupTransform
+        
+        void load(const YAML::Node& node, TransformRcPtr& t);
+        void save(YAML::Emitter& out, ConstTransformRcPtr t);
+        
+        inline void load(const YAML::Node& node, GroupTransformRcPtr& t)
+        {
+            t = GroupTransform::Create();
+            
+            std::string key;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "children")
                 {
-                    iter.second() >> floatvecval;
-                    if(floatvecval.size() != 3)
+                    for(unsigned i = 0; i < second.size(); ++i)
                     {
-                        std::ostringstream os;
-                        os << "CDLTransform parse error, 'power' field must be 3 ";
-                        os << "floats. Found '" << floatvecval.size() << "'.";
-                        throw Exception(os.str().c_str());
+                        TransformRcPtr childTransform;
+                        load(second[i], childTransform);
+                        
+                        // TODO: consider the forwards-compatibility implication of
+                        // throwing an exception.  Should this be a warning, instead?
+                        if(!childTransform)
+                        {
+                            throw Exception("Child transform could not be parsed.");
+                        }
+                        
+                        t->push_back(childTransform);
                     }
-                    t->setPower(&floatvecval[0]);
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
                 }
             }
-            else if(key == "saturation" || key == "sat")
-            {
-                float val = 0.0f;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<float>(val))
-                  t->setSat(val);
-            }
-            else if(key == "direction")
-            {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
-            }
-            else
+        }
+        
+        inline void save(YAML::Emitter& out, ConstGroupTransformRcPtr t)
+        {
+            out << YAML::VerbatimTag("GroupTransform");
+            out << YAML::BeginMap;
+            EmitBaseTransformKeyValues(out, t);
+            
+            out << YAML::Key << "children";
+            out << YAML::Value;
+            
+            out << YAML::BeginSeq;
+            for(int i = 0; i < t->size(); ++i)
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                save(out, t->getTransform(i));
             }
+            out << YAML::EndSeq;
+            
+            out << YAML::EndMap;
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstCDLTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("CDLTransform");
-        out << YAML::Flow << YAML::BeginMap;
         
-        std::vector<float> slope(3);
-        t->getSlope(&slope[0]);
-        if(!IsVecEqualToOne(&slope[0], 3))
+        // LogTransform
+        
+        inline void load(const YAML::Node& node, LogTransformRcPtr& t)
         {
-            out << YAML::Key << "slope";
-            out << YAML::Value << YAML::Flow << slope;
+            t = LogTransform::Create();
+            
+            std::string key;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "base")
+                {
+                    float val = 0.0f;
+                    load(second, val);
+                    t->setBase(val);
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
+            }
         }
         
-        std::vector<float> offset(3);
-        t->getOffset(&offset[0]);
-        if(!IsVecEqualToZero(&offset[0], 3))
+        inline void save(YAML::Emitter& out, ConstLogTransformRcPtr t)
         {
-            out << YAML::Key << "offset";
-            out << YAML::Value << YAML::Flow << offset;
+            out << YAML::VerbatimTag("LogTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            out << YAML::Key << "base" << YAML::Value << t->getBase();
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
         }
         
-        std::vector<float> power(3);
-        t->getPower(&power[0]);
-        if(!IsVecEqualToOne(&power[0], 3))
+        // LookTransform
+        
+        inline void load(const YAML::Node& node, LookTransformRcPtr& t)
         {
-            out << YAML::Key << "power";
-            out << YAML::Value << YAML::Flow << power;
+            t = LookTransform::Create();
+            
+            std::string key, stringval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "src")
+                {
+                    load(second, stringval);
+                    t->setSrc(stringval.c_str());
+                }
+                else if(key == "dst")
+                {
+                    load(second, stringval);
+                    t->setDst(stringval.c_str());
+                }
+                else if(key == "looks")
+                {
+                    load(second, stringval);
+                    t->setLooks(stringval.c_str());
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
+            }
         }
         
-        if(!IsScalarEqualToOne(t->getSat()))
+        inline void save(YAML::Emitter& out, ConstLookTransformRcPtr t)
         {
-            out << YAML::Key << "sat" << YAML::Value << t->getSat();
+            out << YAML::VerbatimTag("LookTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            out << YAML::Key << "src" << YAML::Value << t->getSrc();
+            out << YAML::Key << "dst" << YAML::Value << t->getDst();
+            out << YAML::Key << "looks" << YAML::Value << t->getLooks();
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
         }
         
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, AllocationTransformRcPtr& t)
-    {
-        t = AllocationTransform::Create();
-        
-        std::string key;
+        // MatrixTransform
         
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void load(const YAML::Node& node, MatrixTransformRcPtr& t)
         {
-            iter.first() >> key;
+            t = MatrixTransform::Create();
             
-            if(key == "allocation")
-            {
-                Allocation val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<Allocation>(val))
-                  t->setAllocation(val);
-            }
-            else if(key == "vars")
-            {
-                std::vector<float> val;
-                if (iter.second().Type() != YAML::NodeType::Null)
+            std::string key;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "matrix")
                 {
-                    iter.second() >> val;
-                    if(!val.empty())
+                    std::vector<float> val;
+                    load(second, val);
+                    if(val.size() != 16)
                     {
-                        t->setVars(static_cast<int>(val.size()), &val[0]);
+                        std::ostringstream os;
+                        os << "MatrixTransform parse error, matrix field must be 16 ";
+                        os << "floats. Found '" << val.size() << "'.";
+                        throw Exception(os.str().c_str());
+                    }
+                    t->setMatrix(&val[0]);
+                }
+                else if(key == "offset")
+                {
+                    std::vector<float> val;
+                    load(second, val);
+                    if(val.size() != 4)
+                    {
+                        std::ostringstream os;
+                        os << "MatrixTransform parse error, offset field must be 4 ";
+                        os << "floats. Found '" << val.size() << "'.";
+                        throw Exception(os.str().c_str());
                     }
+                    t->setOffset(&val[0]);
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
                 }
             }
-            else if(key == "direction")
+        }
+        
+        inline void save(YAML::Emitter& out, ConstMatrixTransformRcPtr t)
+        {
+            out << YAML::VerbatimTag("MatrixTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            
+            std::vector<float> matrix(16, 0.0);
+            t->getMatrix(&matrix[0]);
+            if(!IsM44Identity(&matrix[0]))
             {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
+                out << YAML::Key << "matrix";
+                out << YAML::Value << YAML::Flow << matrix;
             }
-            else
+            
+            std::vector<float> offset(4, 0.0);
+            t->getOffset(&offset[0]);
+            if(!IsVecEqualToZero(&offset[0],4))
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                out << YAML::Key << "offset";
+                out << YAML::Value << YAML::Flow << offset;
             }
+            
+            EmitBaseTransformKeyValues(out, t);
+            out << YAML::EndMap;
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstAllocationTransformRcPtr t)
-    {
-        out << YAML::VerbatimTag("AllocationTransform");
-        out << YAML::Flow << YAML::BeginMap;
         
-        out << YAML::Key << "allocation";
-        out << YAML::Value << YAML::Flow << t->getAllocation();
+        // TruelightTransform
         
-        if(t->getNumVars() > 0)
+        inline void load(const YAML::Node& node, TruelightTransformRcPtr& t)
         {
-            std::vector<float> vars(t->getNumVars());
-            t->getVars(&vars[0]);
-            out << YAML::Key << "vars";
-            out << YAML::Flow << YAML::Value << vars;
+            t = TruelightTransform::Create();
+            
+            std::string key, stringval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "config_root")
+                {
+                    load(second, stringval);
+                    t->setConfigRoot(stringval.c_str());
+                }
+                else if(key == "profile")
+                {
+                    load(second, stringval);
+                    t->setProfile(stringval.c_str());
+                }
+                else if(key == "camera")
+                {
+                    load(second, stringval);
+                    t->setCamera(stringval.c_str());
+                }
+                else if(key == "input_display")
+                {
+                    load(second, stringval);
+                    t->setInputDisplay(stringval.c_str());
+                }
+                else if(key == "recorder")
+                {
+                    load(second, stringval);
+                    t->setRecorder(stringval.c_str());
+                }
+                else if(key == "print")
+                {
+                    load(second, stringval);
+                    t->setPrint(stringval.c_str());
+                }
+                else if(key == "lamp")
+                {
+                    load(second, stringval);
+                    t->setLamp(stringval.c_str());
+                }
+                else if(key == "output_camera")
+                {
+                    load(second, stringval);
+                    t->setOutputCamera(stringval.c_str());
+                }
+                else if(key == "display")
+                {
+                    load(second, stringval);
+                    t->setDisplay(stringval.c_str());
+                }
+                else if(key == "cube_input")
+                {
+                    load(second, stringval);
+                     t->setCubeInput(stringval.c_str());
+                }
+                else if(key == "direction")
+                {
+                    TransformDirection val;
+                    load(second, val);
+                    t->setDirection(val);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
+            }
         }
         
-        EmitBaseTransformKeyValues(out, t);
-        out << YAML::EndMap;
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, TruelightTransformRcPtr& t)
-    {
-        t = TruelightTransform::Create();
-        
-        std::string key, stringval;
-        
-        for (YAML::Iterator iter = node.begin();
-             iter != node.end();
-             ++iter)
+        inline void save(YAML::Emitter& out, ConstTruelightTransformRcPtr t)
         {
-            iter.first() >> key;
             
-            if(key == "config_root")
+            out << YAML::VerbatimTag("TruelightTransform");
+            out << YAML::Flow << YAML::BeginMap;
+            if(strcmp(t->getConfigRoot(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setConfigRoot(stringval.c_str());
+                out << YAML::Key << "config_root";
+                out << YAML::Value << YAML::Flow << t->getConfigRoot();
             }
-            else if(key == "profile")
+            if(strcmp(t->getProfile(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setProfile(stringval.c_str());
+                out << YAML::Key << "profile";
+                out << YAML::Value << YAML::Flow << t->getProfile();
             }
-            else if(key == "camera")
+            if(strcmp(t->getCamera(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setCamera(stringval.c_str());
+                out << YAML::Key << "camera";
+                out << YAML::Value << YAML::Flow << t->getCamera();
             }
-            else if(key == "input_display")
+            if(strcmp(t->getInputDisplay(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setInputDisplay(stringval.c_str());
+                out << YAML::Key << "input_display";
+                out << YAML::Value << YAML::Flow << t->getInputDisplay();
             }
-            else if(key == "recorder")
+            if(strcmp(t->getRecorder(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setRecorder(stringval.c_str());
+                out << YAML::Key << "recorder";
+                out << YAML::Value << YAML::Flow << t->getRecorder();
             }
-            else if(key == "print")
+            if(strcmp(t->getPrint(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setPrint(stringval.c_str());
+                out << YAML::Key << "print";
+                out << YAML::Value << YAML::Flow << t->getPrint();
             }
-            else if(key == "lamp")
+            if(strcmp(t->getLamp(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setLamp(stringval.c_str());
+                out << YAML::Key << "lamp";
+                out << YAML::Value << YAML::Flow << t->getLamp();
             }
-            else if(key == "output_camera")
+            if(strcmp(t->getOutputCamera(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setOutputCamera(stringval.c_str());
+                out << YAML::Key << "output_camera";
+                out << YAML::Value << YAML::Flow << t->getOutputCamera();
             }
-            else if(key == "display")
+            if(strcmp(t->getDisplay(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setDisplay(stringval.c_str());
+                out << YAML::Key << "display";
+                out << YAML::Value << YAML::Flow << t->getDisplay();
             }
-            else if(key == "cube_input")
+            if(strcmp(t->getCubeInput(), "") != 0)
             {
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<std::string>(stringval))
-                  t->setCubeInput(stringval.c_str());
+                out << YAML::Key << "cube_input";
+                out << YAML::Value << YAML::Flow << t->getCubeInput();
             }
-            else if(key == "direction")
+            
+            EmitBaseTransformKeyValues(out, t);
+            
+            out << YAML::EndMap;
+        }
+        
+        // Transform
+        
+        void load(const YAML::Node& node, TransformRcPtr& t)
+        {
+            if(node.Type() != YAML::NodeType::Map)
             {
-                TransformDirection val;
-                if (iter.second().Type() != YAML::NodeType::Null && 
-                    iter.second().Read<TransformDirection>(val))
-                  t->setDirection(val);
+                std::ostringstream os;
+                os << "Unsupported Transform type encountered: (" << node.Type() << ") in OCIO profile. ";
+                os << "Only Mapping types supported.";
+                throw Exception(os.str().c_str());
+            }
+            
+            std::string type = node.Tag();
+            
+            if(type == "AllocationTransform") {
+                AllocationTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "CDLTransform") {
+                CDLTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "ColorSpaceTransform")  {
+                ColorSpaceTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            // TODO: DisplayTransform
+            else if(type == "ExponentTransform")  {
+                ExponentTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "FileTransform")  {
+                FileTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "GroupTransform") {
+                GroupTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "LogTransform") {
+                LogTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "LookTransform") {
+                LookTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "MatrixTransform")  {
+                MatrixTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
+            }
+            else if(type == "TruelightTransform")  {
+                TruelightTransformRcPtr temp;
+                load(node, temp);
+                t = temp;
             }
             else
             {
-                LogUnknownKeyWarning(node.Tag(), iter.first());
+                // TODO: add a new empty (better name?) aka passthru Transform()
+                // which does nothing. This is so upsupported !<tag> types don't
+                // throw an exception. Alternativly this could be caught in the
+                // GroupTransformRcPtr >> operator with some type of
+                // supported_tag() method
+                
+                // TODO: consider the forwards-compatibility implication of
+                // throwing an exception.  Should this be a warning, instead?
+                
+                //  t = EmptyTransformRcPtr(new EmptyTransform(), &deleter);
+                std::ostringstream os;
+                os << "Unsupported transform type !<" << type << "> in OCIO profile. ";
+                throw Exception(os.str().c_str());
             }
         }
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ConstTruelightTransformRcPtr t)
-    {
         
-        out << YAML::VerbatimTag("TruelightTransform");
-        out << YAML::Flow << YAML::BeginMap;
-        if(strcmp(t->getConfigRoot(), "") != 0)
-        {
-            out << YAML::Key << "config_root";
-            out << YAML::Value << YAML::Flow << t->getConfigRoot();
-        }
-        if(strcmp(t->getProfile(), "") != 0)
-        {
-            out << YAML::Key << "profile";
-            out << YAML::Value << YAML::Flow << t->getProfile();
-        }
-        if(strcmp(t->getCamera(), "") != 0)
-        {
-            out << YAML::Key << "camera";
-            out << YAML::Value << YAML::Flow << t->getCamera();
-        }
-        if(strcmp(t->getInputDisplay(), "") != 0)
-        {
-            out << YAML::Key << "input_display";
-            out << YAML::Value << YAML::Flow << t->getInputDisplay();
+        void save(YAML::Emitter& out, ConstTransformRcPtr t)
+        {
+            if(ConstAllocationTransformRcPtr Allocation_tran = \
+                DynamicPtrCast<const AllocationTransform>(t))
+                save(out, Allocation_tran);
+            else if(ConstCDLTransformRcPtr CDL_tran = \
+                DynamicPtrCast<const CDLTransform>(t))
+                save(out, CDL_tran);
+            else if(ConstColorSpaceTransformRcPtr ColorSpace_tran = \
+                DynamicPtrCast<const ColorSpaceTransform>(t))
+                save(out, ColorSpace_tran);
+            else if(ConstExponentTransformRcPtr Exponent_tran = \
+                DynamicPtrCast<const ExponentTransform>(t))
+                save(out, Exponent_tran);
+            else if(ConstFileTransformRcPtr File_tran = \
+                DynamicPtrCast<const FileTransform>(t))
+                save(out, File_tran);
+            else if(ConstGroupTransformRcPtr Group_tran = \
+                DynamicPtrCast<const GroupTransform>(t))
+                save(out, Group_tran);
+            else if(ConstLogTransformRcPtr Log_tran = \
+                DynamicPtrCast<const LogTransform>(t))
+                save(out, Log_tran);
+            else if(ConstLookTransformRcPtr Look_tran = \
+                DynamicPtrCast<const LookTransform>(t))
+                save(out, Look_tran);
+            else if(ConstMatrixTransformRcPtr Matrix_tran = \
+                DynamicPtrCast<const MatrixTransform>(t))
+                save(out, Matrix_tran);
+            else if(ConstTruelightTransformRcPtr Truelight_tran = \
+                DynamicPtrCast<const TruelightTransform>(t))
+                save(out, Truelight_tran);
+            else
+                throw Exception("Unsupported Transform() type for serialization.");
         }
-        if(strcmp(t->getRecorder(), "") != 0)
+        
+        // ColorSpace
+        
+        inline void load(const YAML::Node& node, ColorSpaceRcPtr& cs)
         {
-            out << YAML::Key << "recorder";
-            out << YAML::Value << YAML::Flow << t->getRecorder();
+            if(node.Tag() != "ColorSpace")
+                return; // not a !<ColorSpace> tag
+            
+            std::string key, stringval;
+            bool boolval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "name")
+                {
+                    load(second, stringval);
+                    cs->setName(stringval.c_str());
+                }
+                else if(key == "description")
+                {
+                    load(second, stringval);
+                    cs->setDescription(stringval.c_str());
+                }
+                else if(key == "family")
+                {
+                    load(second, stringval);
+                    cs->setFamily(stringval.c_str());
+                }
+                else if(key == "equalitygroup")
+                {
+                    load(second, stringval);
+                    cs->setEqualityGroup(stringval.c_str());
+                }
+                else if(key == "bitdepth")
+                {
+                    BitDepth ret;
+                    load(second, ret);
+                    cs->setBitDepth(ret);
+                }
+                else if(key == "isdata")
+                {
+                    load(second, boolval);
+                    cs->setIsData(boolval);
+                }
+                else if(key == "allocation")
+                {
+                    Allocation val;
+                    load(second, val);
+                    cs->setAllocation(val);
+                }
+                else if(key == "allocationvars")
+                {
+                    std::vector<float> val;
+                    load(second, val);
+                    if(!val.empty())
+                        cs->setAllocationVars(static_cast<int>(val.size()), &val[0]);
+                }
+                else if(key == "to_reference")
+                {
+                    TransformRcPtr val;
+                    load(second, val);
+                    cs->setTransform(val, COLORSPACE_DIR_TO_REFERENCE);
+                }
+                else if(key == "from_reference")
+                {
+                    TransformRcPtr val;
+                    load(second, val);
+                    cs->setTransform(val, COLORSPACE_DIR_FROM_REFERENCE);
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
+            }
         }
-        if(strcmp(t->getPrint(), "") != 0)
+        
+        inline void save(YAML::Emitter& out, ConstColorSpaceRcPtr cs)
         {
-            out << YAML::Key << "print";
-            out << YAML::Value << YAML::Flow << t->getPrint();
+            out << YAML::VerbatimTag("ColorSpace");
+            out << YAML::BeginMap;
+            
+            out << YAML::Key << "name" << YAML::Value << cs->getName();
+            out << YAML::Key << "family" << YAML::Value << cs->getFamily();
+            out << YAML::Key << "equalitygroup" << YAML::Value << cs->getEqualityGroup();
+            out << YAML::Key << "bitdepth" << YAML::Value;
+            save(out, cs->getBitDepth());
+            if(cs->getDescription() != NULL && strlen(cs->getDescription()) > 0)
+            {
+                out << YAML::Key << "description";
+                out << YAML::Value << YAML::Literal << cs->getDescription();
+            }
+            out << YAML::Key << "isdata" << YAML::Value << cs->isData();
+            
+            out << YAML::Key << "allocation" << YAML::Value;
+            save(out, cs->getAllocation());
+            if(cs->getAllocationNumVars() > 0)
+            {
+                std::vector<float> allocationvars(cs->getAllocationNumVars());
+                cs->getAllocationVars(&allocationvars[0]);
+                out << YAML::Key << "allocationvars";
+                out << YAML::Flow << YAML::Value << allocationvars;
+            }
+            
+            ConstTransformRcPtr toref = \
+                cs->getTransform(COLORSPACE_DIR_TO_REFERENCE);
+            if(toref)
+            {
+                out << YAML::Key << "to_reference" << YAML::Value;
+                save(out, toref);
+            }
+            
+            ConstTransformRcPtr fromref = \
+                cs->getTransform(COLORSPACE_DIR_FROM_REFERENCE);
+            if(fromref)
+            {
+                out << YAML::Key << "from_reference" << YAML::Value;
+                save(out, fromref);
+            }
+            
+            out << YAML::EndMap;
+            out << YAML::Newline;
         }
-        if(strcmp(t->getLamp(), "") != 0)
+        
+        // Look
+        
+        inline void load(const YAML::Node& node, LookRcPtr& look)
         {
-            out << YAML::Key << "lamp";
-            out << YAML::Value << YAML::Flow << t->getLamp();
+            if(node.Tag() != "Look")
+                return;
+            
+            std::string key, stringval;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "name")
+                {
+                    load(second, stringval);
+                    look->setName(stringval.c_str());
+                }
+                else if(key == "process_space")
+                {
+                    load(second, stringval);
+                    look->setProcessSpace(stringval.c_str());
+                }
+                else if(key == "transform")
+                {
+                    TransformRcPtr val;
+                    load(second, val);
+                    look->setTransform(val);
+                }
+                else if(key == "inverse_transform")
+                {
+                    TransformRcPtr val;
+                    load(second, val);
+                    look->setInverseTransform(val);
+                }
+                else if(key == "description")
+                {
+                    load(second, stringval);
+                    look->setDescription(stringval.c_str());
+                }
+                else
+                {
+                    LogUnknownKeyWarning(node.Tag(), first);
+                }
+            }
         }
-        if(strcmp(t->getOutputCamera(), "") != 0)
+        
+        inline void save(YAML::Emitter& out, ConstLookRcPtr look)
         {
-            out << YAML::Key << "output_camera";
-            out << YAML::Value << YAML::Flow << t->getOutputCamera();
+            out << YAML::VerbatimTag("Look");
+            out << YAML::BeginMap;
+            out << YAML::Key << "name" << YAML::Value << look->getName();
+            out << YAML::Key << "process_space" << YAML::Value << look->getProcessSpace();
+            if (look->getDescription() != NULL &&
+                strlen(look->getDescription()) > 0)
+            {
+                out << YAML::Key << "description";
+                out << YAML::Value << YAML::Literal << look->getDescription();
+            }
+
+            
+            if(look->getTransform())
+            {
+                out << YAML::Key << "transform";
+                out << YAML::Value;
+                save(out, look->getTransform());
+            }
+            
+            if(look->getInverseTransform())
+            {
+                out << YAML::Key << "inverse_transform";
+                out << YAML::Value;
+                save(out, look->getInverseTransform());
+            }
+            
+            out << YAML::EndMap;
+            out << YAML::Newline;
         }
-        if(strcmp(t->getDisplay(), "") != 0)
+        
+        // Config
+        
+        inline void load(const YAML::Node& node, ConfigRcPtr& c, const char* filename)
         {
-            out << YAML::Key << "display";
-            out << YAML::Value << YAML::Flow << t->getDisplay();
+            
+            // check profile version
+            int profile_version = 0;
+#ifdef OLDYAML
+            if(node.FindValue("ocio_profile_version") == NULL)
+#else
+            if(node["ocio_profile_version"] == NULL)
+#endif
+            {
+                std::ostringstream os;
+                os << "The specified file ";
+                os << "does not appear to be an OCIO configuration.";
+                throw Exception (os.str().c_str());
+            }
+            
+            load(node["ocio_profile_version"], profile_version);
+            if(profile_version > 1)
+            {
+                std::ostringstream os;
+                os << "This .ocio config ";
+                if(filename && *filename)
+                {
+                    os << " '" << filename << "' ";
+                }
+                os << "is version " << profile_version << ". ";
+                os << "This version of the OpenColorIO library (" << OCIO_VERSION ") ";
+                os << "is not known to be able to load this profile. ";
+                os << "An attempt will be made, but there are no guarantees that the ";
+                os << "results will be accurate. Continue at your own risk.";
+                LogWarning(os.str());
+            }
+            
+            std::string key, stringval;
+            bool boolval = false;
+            EnvironmentMode mode = ENV_ENVIRONMENT_LOAD_ALL;
+            
+            for (Iterator iter = node.begin();
+                 iter != node.end();
+                 ++iter)
+            {
+                const YAML::Node& first = get_first(iter);
+                const YAML::Node& second = get_second(iter);
+                
+                load(first, key);
+                
+                if (second.Type() == YAML::NodeType::Null) continue;
+                
+                if(key == "ocio_profile_version") { } // Already handled above.
+                else if(key == "environment")
+                {
+                    mode = ENV_ENVIRONMENT_LOAD_PREDEFINED;
+                    if(second.Type() != YAML::NodeType::Map)
+                    {
+                        std::ostringstream os;
+                        os << "'environment' field needs to be a (name: key) map.";
+                        throw Exception(os.str().c_str());
+                    }
+                    for (Iterator it = second.begin();
+                         it != second.end();
+                         ++it)
+                    {
+                        std::string k, v;
+                        load(get_first(it), k);
+                        load(get_second(it), v);
+                        c->addEnvironmentVar(k.c_str(), v.c_str());
+                    }
+                }
+                else if(key == "search_path" || key == "resource_path")
+                {
+                    load(second, stringval);
+                    c->setSearchPath(stringval.c_str());
+                }
+                else if(key == "strictparsing")
+                {
+                    load(second, boolval);
+                    c->setStrictParsingEnabled(boolval);
+                }
+                else if(key == "description")
+                {
+                    load(second, stringval);
+                    c->setDescription(stringval.c_str());
+                }
+                else if(key == "luma")
+                {
+                    std::vector<float> val;
+                    load(second, val);
+                    if(val.size() != 3)
+                    {
+                        std::ostringstream os;
+                        os << "'luma' field must be 3 ";
+                        os << "floats. Found '" << val.size() << "'.";
+                        throw Exception(os.str().c_str());
+                    }
+                    c->setDefaultLumaCoefs(&val[0]);
+                }
+                else if(key == "roles")
+                {
+                    if(second.Type() != YAML::NodeType::Map)
+                    {
+                        std::ostringstream os;
+                        os << "'roles' field needs to be a (name: key) map.";
+                        throw Exception(os.str().c_str());
+                    }
+                    for (Iterator it = second.begin();
+                         it != second.end();
+                         ++it)
+                    {
+                        std::string k, v;
+                        load(get_first(it), k);
+                        load(get_second(it), v);
+                        c->setRole(k.c_str(), v.c_str());
+                    }
+                }
+                else if(key == "displays")
+                {
+                    if(second.Type() != YAML::NodeType::Map)
+                    {
+                        std::ostringstream os;
+                        os << "'displays' field needs to be a (name: key) map.";
+                        throw Exception(os.str().c_str());
+                    }
+                    for (Iterator it = second.begin();
+                         it != second.end();
+                         ++it)
+                    {
+                        std::string display;
+                        load(get_first(it), display);
+                        const YAML::Node& dsecond = get_second(it);
+                        for(unsigned i = 0; i < dsecond.size(); ++i)
+                        {
+                            View view;
+                            load(dsecond[i], view);
+                            c->addDisplay(display.c_str(), view.name.c_str(),
+                                          view.colorspace.c_str(), view.looks.c_str());
+                        }
+                    }
+                }
+                else if(key == "active_displays")
+                {
+                    std::vector<std::string> display;
+                    load(second, display);
+                    std::string displays = JoinStringEnvStyle(display);
+                    c->setActiveDisplays(displays.c_str());
+                }
+                else if(key == "active_views")
+                {
+                    std::vector<std::string> view;
+                    load(second, view);
+                    std::string views = JoinStringEnvStyle(view);
+                    c->setActiveViews(views.c_str());
+                }
+                else if(key == "colorspaces")
+                {
+                    if(second.Type() != YAML::NodeType::Sequence)
+                    {
+                        std::ostringstream os;
+                        os << "'colorspaces' field needs to be a (- !<ColorSpace>) list.";
+                        throw Exception(os.str().c_str());
+                    }
+                    for(unsigned i = 0; i < second.size(); ++i)
+                    {
+                        if(second[i].Tag() == "ColorSpace")
+                        {
+                            ColorSpaceRcPtr cs = ColorSpace::Create();
+                            load(second[i], cs);
+                            for(int ii = 0; ii < c->getNumColorSpaces(); ++ii)
+                            {
+                                if(strcmp(c->getColorSpaceNameByIndex(ii), cs->getName()) == 0)
+                                {
+                                    std::ostringstream os;
+                                    os << "Colorspace with name '" << cs->getName() << "' already defined.";
+                                    throw Exception(os.str().c_str());
+                                }
+                            }
+                            c->addColorSpace(cs);
+                        }
+                        else
+                        {
+                            std::ostringstream os;
+                            os << "Unknown element found in colorspaces:";
+                            os << second[i].Tag() << ". Only ColorSpace(s)";
+                            os << " currently handled.";
+                            LogWarning(os.str());
+                        }
+                    }
+                }
+                else if(key == "looks")
+                {
+                    if(second.Type() != YAML::NodeType::Sequence)
+                    {
+                        std::ostringstream os;
+                        os << "'looks' field needs to be a (- !<Look>) list.";
+                        throw Exception(os.str().c_str());
+                    }
+                    
+                    for(unsigned i = 0; i < second.size(); ++i)
+                    {
+                        if(second[i].Tag() == "Look")
+                        {
+                            LookRcPtr look = Look::Create();
+                            load(second[i], look);
+                            c->addLook(look);
+                        }
+                        else
+                        {
+                            std::ostringstream os;
+                            os << "Unknown element found in looks:";
+                            os << second[i].Tag() << ". Only Look(s)";
+                            os << " currently handled.";
+                            LogWarning(os.str());
+                        }
+                    }
+                }
+                else
+                {
+                    LogUnknownKeyWarning("profile", first);
+                }
+            }
+            
+            if(filename)
+            {
+                std::string realfilename = pystring::os::path::abspath(filename);
+                std::string configrootdir = pystring::os::path::dirname(realfilename);
+                c->setWorkingDir(configrootdir.c_str());
+            }
+            
+            c->setEnvironmentMode(mode);
+            c->loadEnvironment();
+            
+            if(mode == ENV_ENVIRONMENT_LOAD_ALL)
+            {
+                std::ostringstream os;
+                os << "This .ocio config ";
+                if(filename && *filename)
+                {
+                    os << " '" << filename << "' ";
+                }
+                os << "has no environment section defined. The default behaviour is to ";
+                os << "load all environment variables (" << c->getNumEnvironmentVars() << ")";
+                os << ", which reduces the efficiency of OCIO's caching. Considering ";
+                os << "predefining the environment variables used.";
+                LogDebug(os.str());
+            }
+            
         }
-        if(strcmp(t->getCubeInput(), "") != 0)
+        
+        inline void save(YAML::Emitter& out, const Config* c)
         {
-            out << YAML::Key << "cube_input";
-            out << YAML::Value << YAML::Flow << t->getCubeInput();
+            out << YAML::Block;
+            out << YAML::BeginMap;
+            out << YAML::Key << "ocio_profile_version" << YAML::Value << 1;
+            out << YAML::Newline;
+#ifndef OLDYAML
+            out << YAML::Newline;
+#endif
+            
+            if(c->getNumEnvironmentVars() > 0)
+            {
+                out << YAML::Key << "environment";
+                out << YAML::Value << YAML::BeginMap;
+                for(int i = 0; i < c->getNumEnvironmentVars(); ++i)
+                {   
+                    const char* name = c->getEnvironmentVarNameByIndex(i);
+                    out << YAML::Key << name;
+                    out << YAML::Value << c->getEnvironmentVarDefault(name);
+                }
+                out << YAML::EndMap;
+                out << YAML::Newline;
+            }
+            out << YAML::Key << "search_path" << YAML::Value << c->getSearchPath();
+            out << YAML::Key << "strictparsing" << YAML::Value << c->isStrictParsingEnabled();
+            
+            std::vector<float> luma(3, 0.f);
+            c->getDefaultLumaCoefs(&luma[0]);
+            out << YAML::Key << "luma" << YAML::Value << YAML::Flow << luma;
+            
+            if(c->getDescription() != NULL && strlen(c->getDescription()) > 0)
+            {
+                out << YAML::Newline;
+                out << YAML::Key << "description";
+                out << YAML::Value << c->getDescription();
+                out << YAML::Newline;
+            }
+            
+            // Roles
+            out << YAML::Newline;
+#ifndef OLDYAML
+            out << YAML::Newline;
+#endif
+            out << YAML::Key << "roles";
+            out << YAML::Value << YAML::BeginMap;
+            for(int i = 0; i < c->getNumRoles(); ++i)
+            {
+                const char* role = c->getRoleName(i);
+                if(role && *role)
+                {
+                    ConstColorSpaceRcPtr colorspace = c->getColorSpace(role);
+                    if(colorspace)
+                    {
+                        out << YAML::Key << role;
+                        out << YAML::Value << c->getColorSpace(role)->getName();
+                    }
+                    else
+                    {
+                        std::ostringstream os;
+                        os << "Colorspace associated to the role '" << role << "', does not exist.";
+                        throw Exception(os.str().c_str());
+                    }
+                }
+            }
+            out << YAML::EndMap;
+#ifndef OLDYAML
+            out << YAML::Newline;
+#endif
+            
+            // Displays
+            out << YAML::Newline;
+            out << YAML::Key << "displays";
+            out << YAML::Value << YAML::BeginMap;
+            for(int i = 0; i < c->getNumDisplays(); ++i)
+            {
+                const char* display = c->getDisplay(i);
+                out << YAML::Key << display;
+                out << YAML::Value << YAML::BeginSeq;
+                for(int v = 0; v < c->getNumViews(display); ++v)
+                {
+                    View dview;
+                    dview.name = c->getView(display, v);
+                    dview.colorspace = c->getDisplayColorSpaceName(display, dview.name.c_str());
+                    if(c->getDisplayLooks(display, dview.name.c_str()) != NULL)
+                        dview.looks = c->getDisplayLooks(display, dview.name.c_str());
+                    save(out, dview);
+                
+                }
+                out << YAML::EndSeq;
+            }
+            out << YAML::EndMap;
+            
+#ifndef OLDYAML
+            out << YAML::Newline;
+#endif
+            out << YAML::Newline;
+            out << YAML::Key << "active_displays";
+            std::vector<std::string> active_displays;
+            if(c->getActiveDisplays() != NULL && strlen(c->getActiveDisplays()) > 0)
+                SplitStringEnvStyle(active_displays, c->getActiveDisplays());
+            out << YAML::Value << YAML::Flow << active_displays;
+            out << YAML::Key << "active_views";
+            std::vector<std::string> active_views;
+            if(c->getActiveViews() != NULL && strlen(c->getActiveViews()) > 0)
+                SplitStringEnvStyle(active_views, c->getActiveViews());
+            out << YAML::Value << YAML::Flow << active_views;
+#ifndef OLDYAML
+            out << YAML::Newline;
+#endif
+            
+            // Looks
+            if(c->getNumLooks() > 0)
+            {
+                out << YAML::Newline;
+                out << YAML::Key << "looks";
+                out << YAML::Value << YAML::BeginSeq;
+                for(int i = 0; i < c->getNumLooks(); ++i)
+                {
+                    const char* name = c->getLookNameByIndex(i);
+                    save(out, c->getLook(name));
+                }
+                out << YAML::EndSeq;
+                out << YAML::Newline;
+            }
+            
+            // ColorSpaces
+            {
+                out << YAML::Newline;
+                out << YAML::Key << "colorspaces";
+                out << YAML::Value << YAML::BeginSeq;
+                for(int i = 0; i < c->getNumColorSpaces(); ++i)
+                {
+                    const char* name = c->getColorSpaceNameByIndex(i);
+                    save(out, c->getColorSpace(name));
+                }
+                out << YAML::EndSeq;
+            }
+            
+            out << YAML::EndMap;
         }
         
-        EmitBaseTransformKeyValues(out, t);
-        
-        out << YAML::EndMap;
-        return out;
     }
     
     ///////////////////////////////////////////////////////////////////////////
-    //  Enums
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, BitDepth depth) {
-        out << BitDepthToString(depth);
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, BitDepth& depth) {
-        std::string str;
-        node.Read<std::string>(str);
-        depth = BitDepthFromString(str.c_str());
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, Allocation alloc) {
-        out << AllocationToString(alloc);
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, Allocation& alloc) {
-        std::string str;
-        node.Read<std::string>(str);
-        alloc = AllocationFromString(str.c_str());
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, ColorSpaceDirection dir) {
-        out << ColorSpaceDirectionToString(dir);
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, ColorSpaceDirection& dir) {
-        std::string str;
-        node.Read<std::string>(str);
-        dir = ColorSpaceDirectionFromString(str.c_str());
-    }
-    
-    YAML::Emitter& operator << (YAML::Emitter& out, TransformDirection dir) {
-        out << TransformDirectionToString(dir);
-        return out;
-    }
-    
-    void operator >> (const YAML::Node& node, TransformDirection& dir) {
-        std::string str;
-        node.Read<std::string>(str);
-        dir = TransformDirectionFromString(str.c_str());
-    }
     
-    YAML::Emitter& operator << (YAML::Emitter& out, Interpolation interp) {
-        out << InterpolationToString(interp);
-        return out;
+    void OCIOYaml::open(std::istream& istream, ConfigRcPtr& c, const char* filename) const
+    {
+        try
+        {
+#ifdef OLDYAML
+            YAML::Parser parser(istream);
+            YAML::Node node;
+            parser.GetNextDocument(node);
+#else
+            YAML::Node node = YAML::Load(istream);
+#endif
+            load(node, c, filename);
+        }
+        catch(const std::exception & e)
+        {
+            std::ostringstream os;
+            os << "Error: Loading the OCIO profile ";
+            if(filename) os << "'" << filename << "' ";
+            os << "failed. " << e.what();
+            throw Exception(os.str().c_str());
+        }
     }
     
-    void operator >> (const YAML::Node& node, Interpolation& interp) {
-        std::string str;
-        node.Read<std::string>(str);
-        interp = InterpolationFromString(str.c_str());
+    void OCIOYaml::write(std::ostream& ostream, const Config* c) const
+    {
+        YAML::Emitter out;
+        save(out, c);
+        ostream << out.c_str();
     }
     
 }
diff -Nru opencolorio-1.0.9~dfsg0/src/core/OCIOYaml.h opencolorio-1.1.0~dfsg0/src/core/OCIOYaml.h
--- opencolorio-1.0.9~dfsg0/src/core/OCIOYaml.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/OCIOYaml.h	2018-01-05 01:38:27.000000000 +0000
@@ -28,97 +28,19 @@
 
 #include <OpenColorIO/OpenColorIO.h>
 
-#include "Platform.h"
-
-#ifndef WINDOWS
-
-// fwd declare yaml-cpp visibility
-#pragma GCC visibility push(hidden)
-namespace YAML {
-    class Exception;
-    class BadDereference;
-    class RepresentationException;
-    class EmitterException;
-    class ParserException;
-    class InvalidScalar;
-    class KeyNotFound;
-    template <typename T> class TypedKeyNotFound;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
-    
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
-    template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
-}
-#pragma GCC visibility pop
-
-#endif 
-
-#include <yaml-cpp/yaml.h>
-
 #ifndef INCLUDED_OCIO_YAML_H
 #define INCLUDED_OCIO_YAML_H
 
 OCIO_NAMESPACE_ENTER
 {
     
-    // Core
-    OCIOHIDDEN void operator >> (const YAML::Node& node, ColorSpaceRcPtr& cs);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ColorSpaceRcPtr cs);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, GroupTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstGroupTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, TransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, LookRcPtr& cs);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, LookRcPtr cs);
-    
-    // Transforms
-    OCIOHIDDEN void operator >> (const YAML::Node& node, AllocationTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstAllocationTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, CDLTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstCDLTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, ColorSpaceTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstColorSpaceTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, ExponentTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstExponentTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, FileTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstFileTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, LogTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstLogTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, LookTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstLookTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, MatrixTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstMatrixTransformRcPtr t);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, TruelightTransformRcPtr& t);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ConstTruelightTransformRcPtr t);
-    
-    // Enums
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, BitDepth depth);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, BitDepth& depth);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, Allocation alloc);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, Allocation& alloc);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, ColorSpaceDirection dir);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, ColorSpaceDirection& dir);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, TransformDirection dir);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, TransformDirection& dir);
-    OCIOHIDDEN YAML::Emitter& operator << (YAML::Emitter& out, Interpolation iterp);
-    OCIOHIDDEN void operator >> (const YAML::Node& node, Interpolation& iterp);
+    class OCIOYaml
+    {
+    public:
+        void open(std::istream& istream, ConfigRcPtr& c, const char* filename = NULL) const;
+        void write(std::ostream& ostream, const Config* c) const;
+    };
     
-    void LogUnknownKeyWarning(const std::string & name, const YAML::Node& tag);
 }
 OCIO_NAMESPACE_EXIT
 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/OpOptimizers.cpp opencolorio-1.1.0~dfsg0/src/core/OpOptimizers.cpp
--- opencolorio-1.0.9~dfsg0/src/core/OpOptimizers.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/OpOptimizers.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -33,6 +33,7 @@
 
 #include <iterator>
 #include <sstream>
+#include <algorithm>
 
 OCIO_NAMESPACE_ENTER
 {
diff -Nru opencolorio-1.0.9~dfsg0/src/core/ParseUtils.cpp opencolorio-1.1.0~dfsg0/src/core/ParseUtils.cpp
--- opencolorio-1.0.9~dfsg0/src/core/ParseUtils.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/ParseUtils.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -359,6 +359,10 @@
         while ( istream.good() )
         {
             std::getline(istream, line);
+            if(line.size() > 0 && line[line.size() - 1] == '\r')
+            {
+                line.resize(line.size() - 1);
+            }
             if(!pystring::strip(line).empty())
             {
                 return true;
diff -Nru opencolorio-1.0.9~dfsg0/src/core/PathUtils.cpp opencolorio-1.1.0~dfsg0/src/core/PathUtils.cpp
--- opencolorio-1.0.9~dfsg0/src/core/PathUtils.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/PathUtils.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -31,6 +31,7 @@
 #include <limits>
 #include <sstream>
 #include <sys/stat.h>
+#include <errno.h>
 
 #include <OpenColorIO/OpenColorIO.h>
 
@@ -48,6 +49,7 @@
 
 #if defined(__APPLE__) && !defined(__IPHONE__)
 #include <crt_externs.h> // _NSGetEnviron()
+#include <unistd.h>
 #elif !defined(WINDOWS)
 #include <unistd.h>
 extern char **environ;
@@ -150,9 +152,17 @@
             _getcwd(path, MAXPATHLEN);
             return path;
 #else
-            char path[MAXPATHLEN];
-            ::getcwd(path, MAXPATHLEN);
-            return path;
+            std::vector<char> current_dir;
+#ifdef PATH_MAX
+            current_dir.resize(PATH_MAX);
+#else
+            current_dir.resize(1024);
+#endif
+            while (::getcwd(&current_dir[0], current_dir.size()) == NULL && errno == ERANGE) {
+                current_dir.resize(current_dir.size() + 1024);
+            }
+
+            return std::string(&current_dir[0]);
 #endif
         }
         
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Platform.cpp opencolorio-1.1.0~dfsg0/src/core/Platform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Platform.cpp	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Platform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,100 @@
+//
+// made by Autodesk Inc. under the terms of the OpenColorIO BSD 3 Clause License
+//
+//
+
+#include <OpenColorIO/OpenColorIO.h>
+
+#include "Platform.h"
+
+OCIO_NAMESPACE_ENTER
+{
+
+    namespace Platform
+    {
+        // Unlike the ::getenv(), the method does not use any static buffer 
+        // for the Windows platform only. *nix platforms are still using
+        // the ::getenv method, but reducing the static vairable usage.
+        // 
+        void getenv (const char* name, std::string& value)
+        {
+#ifdef WINDOWS
+            // To remove the security compilation warning, the _dupenv_s method
+            // must be used (instead of the getenv). The improvement is that
+            // the buffer length is now under control to mitigate buffer overflow attacks.
+            //
+            char * val;
+            size_t len = 0;
+            // At least _dupenv_s validates the memory size by returning ENOMEM
+            //  in case of allocation size issue.
+            const errno_t err = ::_dupenv_s(&val, &len, name);
+            if(err!=0 || len==0 || !val || !*val)
+            {
+                if(val) free(val);
+                value.resize(0);
+            }
+            else
+            {
+                value.resize(len+1);
+                ::snprintf(&value[0], len, "%s", val);
+                if(val) free(val);
+            }
+#else
+            const char* val = ::getenv(name);
+            value = (val && *val) ? val : "";
+#endif 
+        }
+
+    }//namespace platform
+
+}
+OCIO_NAMESPACE_EXIT
+
+///////////////////////////////////////////////////////////////////////////////
+
+#ifdef OCIO_UNIT_TEST
+
+namespace OCIO = OCIO_NAMESPACE;
+#include "UnitTest.h"
+
+OIIO_ADD_TEST(Platform, getenv)
+{
+    {
+        std::string env;
+        OCIO::Platform::getenv("NotExistingEnvVariable", env);
+        OIIO_CHECK_ASSERT(env.empty());
+    }
+
+    {
+        std::string env;
+        OCIO::Platform::getenv("PATH", env);
+        OIIO_CHECK_ASSERT(!env.empty());
+    }
+
+    {
+        std::string env;
+        OCIO::Platform::getenv("PATH", env);
+        OCIO::Platform::getenv("NotExistingEnvVariable", env);
+        OIIO_CHECK_ASSERT(env.empty());
+    }
+
+    {
+        std::string env;
+        OCIO::Platform::getenv("NotExistingEnvVariable", env);
+        OCIO::Platform::getenv("PATH", env);
+        OIIO_CHECK_ASSERT(!env.empty());
+    }
+}
+
+OIIO_ADD_TEST(Platform, putenv)
+{
+    {
+        ::putenv("MY_DUMMY_ENV=SomeValue");
+        std::string env;
+        OCIO::Platform::getenv("MY_DUMMY_ENV", env);
+        OIIO_CHECK_ASSERT(!env.empty());
+        OIIO_CHECK_ASSERT(0==strcmp("SomeValue", env.c_str()));
+    }
+}
+
+#endif // OCIO_UNIT_TEST
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Platform.h opencolorio-1.1.0~dfsg0/src/core/Platform.h
--- opencolorio-1.0.9~dfsg0/src/core/Platform.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Platform.h	2018-01-05 01:38:27.000000000 +0000
@@ -82,20 +82,16 @@
 #include <process.h>
 
 #else
+// assume linux/unix/posix
 
-// linux/unix/posix
 #include <stdlib.h>
 #if !defined(__FreeBSD__)
 #include <alloca.h>
 #endif
 #include <string.h>
 #include <pthread.h>
-// OS for spinlock
-#ifdef __APPLE__
-#include <libkern/OSAtomic.h>
-#include <sys/types.h>
-#endif
-#endif
+
+#endif // defined(_WIN32) || defined(_WIN64) || defined(_WINDOWS) || defined(_MSC_VER)
 
 // general includes
 #include <stdio.h>
@@ -106,6 +102,8 @@
 #ifdef WINDOWS
 #define snprintf sprintf_s
 #define strtok_r strtok_s
+#define sscanf sscanf_s
+#define putenv _putenv
 typedef __int64 FilePos;
 #define fseeko _fseeki64
 #define ftello _ftelli64
@@ -116,7 +114,7 @@
 
 #else
 typedef off_t FilePos;
-#endif
+#endif // WINDOWS
     
 
 OCIO_NAMESPACE_ENTER
@@ -127,7 +125,7 @@
 #define OCIO_LITTLE_ENDIAN 1  // This is correct on x86
 
     /*
-     * Mutex/SpinLock classes
+     * Mutex classes
      */
 
 #ifdef WINDOWS
@@ -142,16 +140,6 @@
 	HANDLE _mutex;
     };
 
-    class _SpinLock {
-    public:
-	_SpinLock()    { InitializeCriticalSection(&_spinlock); }
-	~_SpinLock()   { DeleteCriticalSection(&_spinlock); }
-	void lock()   { EnterCriticalSection(&_spinlock); }
-	void unlock() { LeaveCriticalSection(&_spinlock); }
-    private:
-	CRITICAL_SECTION _spinlock;
-    };
-
 #else
     // assume linux/unix/posix
 
@@ -165,39 +153,13 @@
 	pthread_mutex_t _mutex;
     };
 
-#if __APPLE__
-    class _SpinLock {
-    public:
-	_SpinLock()   { _spinlock = 0; }
-	~_SpinLock()  { }
-	void lock()   { OSSpinLockLock(&_spinlock); }
-	void unlock() { OSSpinLockUnlock(&_spinlock); }
-    private:
-	OSSpinLock _spinlock;
-    };
-#elif ANDROID
-    // we don't have access to pthread on andriod so we just make an empty
-    // class that does nothing.
-    class _SpinLock {
-    public:
-    _SpinLock()   { }
-    ~_SpinLock()  { }
-    void lock()   { }
-    void unlock() { }
-    };
-#else
-    class _SpinLock {
-    public:
-	_SpinLock()   { pthread_spin_init(&_spinlock, PTHREAD_PROCESS_PRIVATE); }
-	~_SpinLock()  { pthread_spin_destroy(&_spinlock); }
-	void lock()   { pthread_spin_lock(&_spinlock); }
-	void unlock() { pthread_spin_unlock(&_spinlock); }
-    private:
-	pthread_spinlock_t _spinlock;
-    };
-#endif // __APPLE__
 #endif // WINDOWS
 
+  namespace Platform
+  {
+    void getenv (const char* name, std::string& value);
+  }
+
 }
 OCIO_NAMESPACE_EXIT
 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/pystring/pystring.cpp opencolorio-1.1.0~dfsg0/src/core/pystring/pystring.cpp
--- opencolorio-1.0.9~dfsg0/src/core/pystring/pystring.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/pystring/pystring.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -64,18 +64,18 @@
 
 /* helper macro to fixup start/end slice values */
 #define ADJUST_INDICES(start, end, len)         \
-    if (end > len)                          \
-        end = len;                          \
-    else if (end < 0) {                     \
-        end += len;                         \
-        if (end < 0)                        \
-        end = 0;                        \
-    }                                       \
-    if (start < 0) {                        \
-        start += len;                       \
-        if (start < 0)                      \
-        start = 0;                      \
-    }
+	if (end > len)                          \
+		end = len;                          \
+	else if (end < 0) {                     \
+		end += len;                         \
+		if (end < 0)                        \
+		end = 0;                        \
+	}                                       \
+	if (start < 0) {                        \
+		start += len;                       \
+		if (start < 0)                      \
+		start = 0;                      \
+	}
 
 
 	namespace {
@@ -162,897 +162,919 @@
 	} //anonymous namespace
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void split( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
-    {
-        result.clear();
-
-        if ( maxsplit < 0 ) maxsplit = MAX_32BIT_INT;//result.max_size();
-
-
-        if ( sep.size() == 0 )
-        {
-            split_whitespace( str, result, maxsplit );
-            return;
-        }
-
-        std::string::size_type i,j, len = str.size(), n = sep.size();
-
-        i = j = 0;
-
-        while ( i+n <= len )
-        {
-            if ( str[i] == sep[0] && str.substr( i, n ) == sep )
-            {
-                if ( maxsplit-- <= 0 ) break;
-
-                result.push_back( str.substr( j, i - j ) );
-                i = j = i + n;
-            }
-            else
-            {
-                i++;
-            }
-        }
-
-        result.push_back( str.substr( j, len-j ) );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void rsplit( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
-    {
-        if ( maxsplit < 0 )
-        {
-            split( str, result, sep, 0 );
-            return;
-        }
-
-        result.clear();
-
-        if ( sep.size() == 0 )
-        {
-            rsplit_whitespace( str, result, maxsplit );
-            return;
-        }
-
-        std::string::size_type i,j, len = str.size(), n = sep.size();
-
-        i = j = len;
-
-        while ( i > n )
-        {
-            if ( str[i - 1] == sep[n - 1] && str.substr( i - n, n ) == sep )
-            {
-                if ( maxsplit-- <= 0 ) break;
-
-                result.push_back( str.substr( i, j - i ) );
-                i = j = i - n;
-            }
-            else
-            {
-                i--;
-            }
-        }
-
-        result.push_back( str.substr( 0, j ) );
-        reverse_strings( result );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    #define LEFTSTRIP 0
-    #define RIGHTSTRIP 1
-    #define BOTHSTRIP 2
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string do_strip( const std::string & str, int striptype, const std::string & chars  )
-    {
-        Py_ssize_t len = (Py_ssize_t) str.size(), i, j, charslen = (Py_ssize_t) chars.size();
-
-        if ( charslen == 0 )
-        {
-            i = 0;
-            if ( striptype != RIGHTSTRIP )
-            {
-                while ( i < len && ::isspace( str[i] ) )
-                {
-                    i++;
-                }
-            }
-
-            j = len;
-            if ( striptype != LEFTSTRIP )
-            {
-                do
-                {
-                    j--;
-                }
-                while (j >= i && ::isspace(str[j]));
-
-                j++;
-            }
-
-
-        }
-        else
-        {
-            const char * sep = chars.c_str();
-
-            i = 0;
-            if ( striptype != RIGHTSTRIP )
-            {
-                while ( i < len && memchr(sep, str[i], charslen) )
-                {
-                    i++;
-                }
-            }
-
-            j = len;
-            if (striptype != LEFTSTRIP)
-            {
-                do
-                {
-                    j--;
-                }
-                while (j >= i &&  memchr(sep, str[j], charslen)  );
-                j++;
-            }
-
-
-        }
-
-        if ( i == 0 && j == len )
-        {
-            return str;
-        }
-        else
-        {
-            return str.substr( i, j - i );
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void partition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
-    {
-        result.resize(3);
-        int index = find( str, sep );
-        if ( index < 0 )
-        {
-            result[0] = str;
-            result[1] = "";
-            result[2] = "";
-        }
-        else
-        {
-            result[0] = str.substr( 0, index );
-            result[1] = sep;
-            result[2] = str.substr( index + sep.size(), str.size() );
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void rpartition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
-    {
-        result.resize(3);
-        int index = rfind( str, sep );
-        if ( index < 0 )
-        {
-            result[0] = "";
-            result[1] = "";
-            result[2] = str;
-        }
-        else
-        {
-            result[0] = str.substr( 0, index );
-            result[1] = sep;
-            result[2] = str.substr( index + sep.size(), str.size() );
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string strip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, BOTHSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string lstrip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, LEFTSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string rstrip( const std::string & str, const std::string & chars )
-    {
-        return do_strip( str, RIGHTSTRIP, chars );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string join( const std::string & str, const std::vector< std::string > & seq )
-    {
-        std::vector< std::string >::size_type seqlen = seq.size(), i;
-
-        if ( seqlen == 0 ) return "";
-        if ( seqlen == 1 ) return seq[0];
-
-        std::string result( seq[0] );
-
-        for ( i = 1; i < seqlen; ++i )
-        {
-            result += str + seq[i];
-
-        }
-
-
-        return result;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    namespace
-    {
-        /* Matches the end (direction >= 0) or start (direction < 0) of self
-         * against substr, using the start and end arguments. Returns
-         * -1 on error, 0 if not found and 1 if found.
-         */
-        
-        int _string_tailmatch(const std::string & self, const std::string & substr,
-                              Py_ssize_t start, Py_ssize_t end,
-                              int direction)
-        {
-            Py_ssize_t len = (Py_ssize_t) self.size();
-            Py_ssize_t slen = (Py_ssize_t) substr.size();
-            
-            const char* sub = substr.c_str();
-            const char* str = self.c_str();
-            
-            ADJUST_INDICES(start, end, len);
-            
-            if (direction < 0) {
-                // startswith
-                if (start+slen > len)
-                    return 0;
-            } else {
-                // endswith
-                if (end-start < slen || start > len)
-                    return 0;
-                if (end-slen > start)
-                    start = end - slen;
-            }
-            if (end-start >= slen)
-                return (!std::memcmp(str+start, sub, slen));
-            
-            return 0;
-        }
-    }
-    
-    bool endswith( const std::string & str, const std::string & suffix, int start, int end )
-    {
-        int result = _string_tailmatch(str, suffix,
-                                       (Py_ssize_t) start, (Py_ssize_t) end, +1);
-        //if (result == -1) // TODO: Error condition
-        
-        return static_cast<bool>(result);
-    }
-    
-    
-    bool startswith( const std::string & str, const std::string & prefix, int start, int end )
-    {
-        int result = _string_tailmatch(str, prefix,
-                                       (Py_ssize_t) start, (Py_ssize_t) end, -1);
-        //if (result == -1) // TODO: Error condition
-        
-        return static_cast<bool>(result);
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    bool isalnum( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-
-
-        if( len == 1 )
-        {
-            return ::isalnum( str[0] );
-        }
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( !::isalnum( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isalpha( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isalpha( (int) str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isalpha( (int) str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isdigit( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isdigit( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( ! ::isdigit( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool islower( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::islower( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::islower( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isspace( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isspace( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isspace( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool istitle( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-
-        if ( len == 0 ) return false;
-        if ( len == 1 ) return ::isupper( str[0] );
-
-        bool cased = false, previous_is_cased = false;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::isupper( str[i] ) )
-            {
-                if ( previous_is_cased )
-                {
-                    return false;
-                }
-
-                previous_is_cased = true;
-                cased = true;
-            }
-            else if ( ::islower( str[i] ) )
-            {
-                if (!previous_is_cased)
-                {
-                    return false;
-                }
-
-                previous_is_cased = true;
-                cased = true;
-
-            }
-            else
-            {
-                previous_is_cased = false;
-            }
-        }
-
-        return cased;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    bool isupper( const std::string & str )
-    {
-        std::string::size_type len = str.size(), i;
-        if ( len == 0 ) return false;
-        if( len == 1 ) return ::isupper( str[0] );
-
-        for ( i = 0; i < len; ++i )
-        {
-           if ( !::isupper( str[i] ) ) return false;
-        }
-        return true;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string capitalize( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        if ( len > 0)
-        {
-            if (::islower(s[0])) s[0] = (char) ::toupper( s[0] );
-        }
-
-        for ( i = 1; i < len; ++i )
-        {
-            if (::isupper(s[i])) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string lower( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string upper( const std::string & str )
-    {
-        std::string s( str ) ;
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string swapcase( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
-            else if (::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string title( const std::string & str )
-    {
-        std::string s( str );
-        std::string::size_type len = s.size(), i;
-        bool previous_is_cased = false;
-
-        for ( i = 0; i < len; ++i )
-        {
-            int c = s[i];
-            if ( ::islower(c) )
-            {
-                if ( !previous_is_cased )
-                {
-                    s[i] = (char) ::toupper(c);
-                }
-                previous_is_cased = true;
-            }
-            else if ( ::isupper(c) )
-            {
-                if ( previous_is_cased )
-                {
-                    s[i] = (char) ::tolower(c);
-                }
-                previous_is_cased = true;
-            }
-            else
-            {
-                previous_is_cased = false;
-            }
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string translate( const std::string & str, const std::string & table, const std::string & deletechars )
-    {
-        std::string s;
-        std::string::size_type len = str.size(), dellen = deletechars.size();
-
-        if ( table.size() != 256 )
-        {
-            // TODO : raise exception instead
-            return str;
-        }
-
-        //if nothing is deleted, use faster code
-        if ( dellen == 0 )
-        {
-            s = str;
-            for ( std::string::size_type i = 0; i < len; ++i )
-            {
-                s[i] = table[ s[i] ];
-            }
-            return s;
-        }
-
-
-        int trans_table[256];
-        for ( int i = 0; i < 256; i++)
-        {
-            trans_table[i] = table[i];
-        }
-
-        for ( std::string::size_type i = 0; i < dellen; i++)
-        {
-            trans_table[(int) deletechars[i] ] = -1;
-        }
-
-        for ( std::string::size_type i = 0; i < len; ++i )
-        {
-            if ( trans_table[ (int) str[i] ] != -1 )
-            {
-                s += table[ str[i] ];
-            }
-        }
-
-        return s;
-
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string zfill( const std::string & str, int width )
-    {
-        int len = (int)str.size();
-
-        if ( len >= width )
-        {
-            return str;
-        }
-
-        std::string s( str );
-
-        int fill = width - len;
-
-        s = std::string( fill, '0' ) + s;
-
-
-        if ( s[fill] == '+' || s[fill] == '-' )
-        {
-            s[0] = s[fill];
-            s[fill] = '0';
-        }
-
-        return s;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string ljust( const std::string & str, int width )
-    {
-        std::string::size_type len = str.size();
-        if ( (( int ) len ) >= width ) return str;
-        return str + std::string( width - len, ' ' );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string rjust( const std::string & str, int width )
-    {
-        std::string::size_type len = str.size();
-        if ( (( int ) len ) >= width ) return str;
-        return std::string( width - len, ' ' ) + str;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string center( const std::string & str, int width )
-    {
-        int len = (int) str.size();
-        int marg, left;
-
-        if ( len >= width ) return str;
-
-        marg = width - len;
-        left = marg / 2 + (marg & width & 1);
-
-        return std::string( left, ' ' ) + str + std::string( marg - left, ' ' );
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string slice( const std::string & str, int start, int end )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        if ( start >= end ) return "";
-        return str.substr( start, end - start );
-    }
-    
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int find( const std::string & str, const std::string & sub, int start, int end  )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        
-        std::string::size_type result = str.find( sub, start );
-        
-        // If we cannot find the string, or if the end-point of our found substring is past
-        // the allowed end limit, return that it can't be found.
-        if( result == std::string::npos || 
-           (result + sub.size() > (std::string::size_type)end) )
-        {
-            return -1;
-        }
-        
-        return (int) result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int index( const std::string & str, const std::string & sub, int start, int end  )
-    {
-        return find( str, sub, start, end );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int rfind( const std::string & str, const std::string & sub, int start, int end )
-    {
-        ADJUST_INDICES(start, end, (int) str.size());
-        
-        std::string::size_type result = str.rfind( sub, end );
-        
-        if( result == std::string::npos || 
-            result < (std::string::size_type)start  || 
-           (result + sub.size() > (std::string::size_type)end))
-            return -1;
-        
-        return (int)result;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int rindex( const std::string & str, const std::string & sub, int start, int end )
-    {
-        return rfind( str, sub, start, end );
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string expandtabs( const std::string & str, int tabsize )
-    {
-        std::string s( str );
-
-        std::string::size_type len = str.size(), i = 0;
-        int offset = 0;
-
-        int j = 0;
-
-        for ( i = 0; i < len; ++i )
-        {
-            if ( str[i] == '\t' )
-            {
-
-                if ( tabsize > 0 )
-                {
-                    int fillsize = tabsize - (j % tabsize);
-                    j += fillsize;
-                    s.replace( i + offset, 1, std::string( fillsize, ' ' ));
-                    offset += fillsize - 1;
-                }
-                else
-                {
-                    s.replace( i + offset, 1, "" );
-                    offset -= 1;
-                }
-
-            }
-            else
-            {
-                j++;
-
-                if (str[i] == '\n' || str[i] == '\r')
-                {
-                    j = 0;
-                }
-            }
-        }
-
-        return s;
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    int count( const std::string & str, const std::string & substr, int start, int end )
-    {
-        int nummatches = 0;
-        int cursor = start;
-
-        while ( 1 )
-        {
-            cursor = find( str, substr, cursor, end );
-
-            if ( cursor < 0 ) break;
-
-            cursor += (int) substr.size();
-            nummatches += 1;
-        }
-
-        return nummatches;
-
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string replace( const std::string & str, const std::string & oldstr, const std::string & newstr, int count )
-    {
-        int sofar = 0;
-        int cursor = 0;
-        std::string s( str );
-
-        std::string::size_type oldlen = oldstr.size(), newlen = newstr.size();
-
-        while ( ( cursor = find( s, oldstr, cursor ) ) != -1 )
-        {
-            if ( count > -1 && sofar >= count )
-            {
-                break;
-            }
-
-            s.replace( cursor, oldlen, newstr );
-
-            cursor += (int) newlen;
-            ++sofar;
-        }
-
-        return s;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    void splitlines(  const std::string & str, std::vector< std::string > & result, bool keepends )
-    {
-        result.clear();
-        std::string::size_type len = str.size(), i, j, eol;
-
-         for (i = j = 0; i < len; )
-         {
-            while (i < len && str[i] != '\n' && str[i] != '\r') i++;
-
-            eol = i;
-            if (i < len)
-            {
-                if (str[i] == '\r' && i + 1 < len && str[i+1] == '\n')
-                {
-                    i += 2;
-                }
-                else
-                {
-                    i++;
-                }
-                if (keepends)
-                eol = i;
-
-            }
-
-            result.push_back( str.substr( j, eol - j ) );
-            j = i;
-
-        }
-
-        if (j < len)
-        {
-            result.push_back( str.substr( j, len - j ) );
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    std::string mul( const std::string & str, int n )
-    {
-        // Early exits
-        if (n <= 0) return "";
-        if (n == 1) return str;
-        
-        std::ostringstream os;
-        for(int i=0; i<n; ++i)
-        {
-            os << str;
-        }
-        return os.str();
-    }
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void split( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
+	{
+		result.clear();
+
+		if ( maxsplit < 0 ) maxsplit = MAX_32BIT_INT;//result.max_size();
+
+
+		if ( sep.size() == 0 )
+		{
+			split_whitespace( str, result, maxsplit );
+			return;
+		}
+
+		std::string::size_type i,j, len = str.size(), n = sep.size();
+
+		i = j = 0;
+
+		while ( i+n <= len )
+		{
+			if ( str[i] == sep[0] && str.substr( i, n ) == sep )
+			{
+				if ( maxsplit-- <= 0 ) break;
+
+				result.push_back( str.substr( j, i - j ) );
+				i = j = i + n;
+			}
+			else
+			{
+				i++;
+			}
+		}
+
+		result.push_back( str.substr( j, len-j ) );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void rsplit( const std::string & str, std::vector< std::string > & result, const std::string & sep, int maxsplit )
+	{
+		if ( maxsplit < 0 )
+		{
+			split( str, result, sep, 0 );
+			return;
+		}
+
+		result.clear();
+
+		if ( sep.size() == 0 )
+		{
+			rsplit_whitespace( str, result, maxsplit );
+			return;
+		}
+
+		std::string::size_type i,j, len = str.size(), n = sep.size();
+
+		i = j = len;
+
+		while ( i > n )
+		{
+			if ( str[i - 1] == sep[n - 1] && str.substr( i - n, n ) == sep )
+			{
+				if ( maxsplit-- <= 0 ) break;
+
+				result.push_back( str.substr( i, j - i ) );
+				i = j = i - n;
+			}
+			else
+			{
+				i--;
+			}
+		}
+
+		result.push_back( str.substr( 0, j ) );
+		reverse_strings( result );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	#define LEFTSTRIP 0
+	#define RIGHTSTRIP 1
+	#define BOTHSTRIP 2
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string do_strip( const std::string & str, int striptype, const std::string & chars  )
+	{
+		Py_ssize_t len = (Py_ssize_t) str.size(), i, j, charslen = (Py_ssize_t) chars.size();
+
+		if ( charslen == 0 )
+		{
+			i = 0;
+			if ( striptype != RIGHTSTRIP )
+			{
+				while ( i < len && ::isspace( str[i] ) )
+				{
+					i++;
+				}
+			}
+
+			j = len;
+			if ( striptype != LEFTSTRIP )
+			{
+				do
+				{
+					j--;
+				}
+				while (j >= i && ::isspace(str[j]));
+
+				j++;
+			}
+
+
+		}
+		else
+		{
+			const char * sep = chars.c_str();
+
+			i = 0;
+			if ( striptype != RIGHTSTRIP )
+			{
+				while ( i < len && memchr(sep, str[i], charslen) )
+				{
+					i++;
+				}
+			}
+
+			j = len;
+			if (striptype != LEFTSTRIP)
+			{
+				do
+				{
+					j--;
+				}
+				while (j >= i &&  memchr(sep, str[j], charslen)  );
+				j++;
+			}
+
+
+		}
+
+		if ( i == 0 && j == len )
+		{
+			return str;
+		}
+		else
+		{
+			return str.substr( i, j - i );
+		}
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void partition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
+	{
+		result.resize(3);
+		int index = find( str, sep );
+		if ( index < 0 )
+		{
+			result[0] = str;
+			result[1] = "";
+			result[2] = "";
+		}
+		else
+		{
+			result[0] = str.substr( 0, index );
+			result[1] = sep;
+			result[2] = str.substr( index + sep.size(), str.size() );
+		}
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void rpartition( const std::string & str, const std::string & sep, std::vector< std::string > & result )
+	{
+		result.resize(3);
+		int index = rfind( str, sep );
+		if ( index < 0 )
+		{
+			result[0] = "";
+			result[1] = "";
+			result[2] = str;
+		}
+		else
+		{
+			result[0] = str.substr( 0, index );
+			result[1] = sep;
+			result[2] = str.substr( index + sep.size(), str.size() );
+		}
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string strip( const std::string & str, const std::string & chars )
+	{
+		return do_strip( str, BOTHSTRIP, chars );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string lstrip( const std::string & str, const std::string & chars )
+	{
+		return do_strip( str, LEFTSTRIP, chars );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string rstrip( const std::string & str, const std::string & chars )
+	{
+		return do_strip( str, RIGHTSTRIP, chars );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string join( const std::string & str, const std::vector< std::string > & seq )
+	{
+		std::vector< std::string >::size_type seqlen = seq.size(), i;
+
+		if ( seqlen == 0 ) return "";
+		if ( seqlen == 1 ) return seq[0];
+
+		std::string result( seq[0] );
+
+		for ( i = 1; i < seqlen; ++i )
+		{
+			result += str + seq[i];
+
+		}
+
+
+		return result;
+	}
+
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	
+	namespace
+	{
+		/* Matches the end (direction >= 0) or start (direction < 0) of self
+		 * against substr, using the start and end arguments. Returns
+		 * -1 on error, 0 if not found and 1 if found.
+		 */
+		
+		int _string_tailmatch(const std::string & self, const std::string & substr,
+							  Py_ssize_t start, Py_ssize_t end,
+							  int direction)
+		{
+			Py_ssize_t len = (Py_ssize_t) self.size();
+			Py_ssize_t slen = (Py_ssize_t) substr.size();
+			
+			const char* sub = substr.c_str();
+			const char* str = self.c_str();
+			
+			ADJUST_INDICES(start, end, len);
+			
+			if (direction < 0) {
+				// startswith
+				if (start+slen > len)
+					return 0;
+			} else {
+				// endswith
+				if (end-start < slen || start > len)
+					return 0;
+				if (end-slen > start)
+					start = end - slen;
+			}
+			if (end-start >= slen)
+				return (!std::memcmp(str+start, sub, slen));
+			
+			return 0;
+		}
+	}
+	
+	bool endswith( const std::string & str, const std::string & suffix, int start, int end )
+	{
+		int result = _string_tailmatch(str, suffix,
+									   (Py_ssize_t) start, (Py_ssize_t) end, +1);
+		//if (result == -1) // TODO: Error condition
+		
+		return result == 1;
+	}
+	
+	
+	bool startswith( const std::string & str, const std::string & prefix, int start, int end )
+	{
+		int result = _string_tailmatch(str, prefix,
+									   (Py_ssize_t) start, (Py_ssize_t) end, -1);
+		//if (result == -1) // TODO: Error condition
+		
+		return result == 1;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	bool isalnum( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isalnum( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::isalnum( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isalpha( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isalpha( (int) str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isalpha( (int) str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isdigit( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isdigit( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isdigit( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool islower( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::islower( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::islower( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isspace( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isspace( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isspace( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool istitle( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if ( len == 1 ) 
+		{
+			return ::isupper( str[0] ) != 0;
+		}
+
+		bool cased = false, previous_is_cased = false;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::isupper( str[i] ) )
+			{
+				if ( previous_is_cased )
+				{
+					return false;
+				}
+
+				previous_is_cased = true;
+				cased = true;
+			}
+			else if ( ::islower( str[i] ) )
+			{
+				if (!previous_is_cased)
+				{
+					return false;
+				}
+
+				previous_is_cased = true;
+				cased = true;
+
+			}
+			else
+			{
+				previous_is_cased = false;
+			}
+		}
+
+		return cased;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	bool isupper( const std::string & str )
+	{
+		std::string::size_type len = str.size(), i;
+		if ( len == 0 ) return false;
+
+		if( len == 1 )
+		{
+			return ::isupper( str[0] ) != 0;
+		}
+
+		for ( i = 0; i < len; ++i )
+		{
+		   if ( ::isupper( str[i] ) == 0 ) return false;
+		}
+		return true;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string capitalize( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+
+		if ( len > 0)
+		{
+			if (::islower(s[0])) s[0] = (char) ::toupper( s[0] );
+		}
+
+		for ( i = 1; i < len; ++i )
+		{
+			if (::isupper(s[i])) s[i] = (char) ::tolower( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string lower( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string upper( const std::string & str )
+	{
+		std::string s( str ) ;
+		std::string::size_type len = s.size(), i;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string swapcase( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( ::islower( s[i] ) ) s[i] = (char) ::toupper( s[i] );
+			else if (::isupper( s[i] ) ) s[i] = (char) ::tolower( s[i] );
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string title( const std::string & str )
+	{
+		std::string s( str );
+		std::string::size_type len = s.size(), i;
+		bool previous_is_cased = false;
+
+		for ( i = 0; i < len; ++i )
+		{
+			int c = s[i];
+			if ( ::islower(c) )
+			{
+				if ( !previous_is_cased )
+				{
+					s[i] = (char) ::toupper(c);
+				}
+				previous_is_cased = true;
+			}
+			else if ( ::isupper(c) )
+			{
+				if ( previous_is_cased )
+				{
+					s[i] = (char) ::tolower(c);
+				}
+				previous_is_cased = true;
+			}
+			else
+			{
+				previous_is_cased = false;
+			}
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string translate( const std::string & str, const std::string & table, const std::string & deletechars )
+	{
+		std::string s;
+		std::string::size_type len = str.size(), dellen = deletechars.size();
+
+		if ( table.size() != 256 )
+		{
+			// TODO : raise exception instead
+			return str;
+		}
+
+		//if nothing is deleted, use faster code
+		if ( dellen == 0 )
+		{
+			s = str;
+			for ( std::string::size_type i = 0; i < len; ++i )
+			{
+				s[i] = table[ s[i] ];
+			}
+			return s;
+		}
+
+
+		int trans_table[256];
+		for ( int i = 0; i < 256; i++)
+		{
+			trans_table[i] = table[i];
+		}
+
+		for ( std::string::size_type i = 0; i < dellen; i++)
+		{
+			trans_table[(int) deletechars[i] ] = -1;
+		}
+
+		for ( std::string::size_type i = 0; i < len; ++i )
+		{
+			if ( trans_table[ (int) str[i] ] != -1 )
+			{
+				s += table[ str[i] ];
+			}
+		}
+
+		return s;
+
+	}
+
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string zfill( const std::string & str, int width )
+	{
+		int len = (int)str.size();
+
+		if ( len >= width )
+		{
+			return str;
+		}
+
+		std::string s( str );
+
+		int fill = width - len;
+
+		s = std::string( fill, '0' ) + s;
+
+
+		if ( s[fill] == '+' || s[fill] == '-' )
+		{
+			s[0] = s[fill];
+			s[fill] = '0';
+		}
+
+		return s;
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string ljust( const std::string & str, int width )
+	{
+		std::string::size_type len = str.size();
+		if ( (( int ) len ) >= width ) return str;
+		return str + std::string( width - len, ' ' );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string rjust( const std::string & str, int width )
+	{
+		std::string::size_type len = str.size();
+		if ( (( int ) len ) >= width ) return str;
+		return std::string( width - len, ' ' ) + str;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string center( const std::string & str, int width )
+	{
+		int len = (int) str.size();
+		int marg, left;
+
+		if ( len >= width ) return str;
+
+		marg = width - len;
+		left = marg / 2 + (marg & width & 1);
+
+		return std::string( left, ' ' ) + str + std::string( marg - left, ' ' );
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string slice( const std::string & str, int start, int end )
+	{
+		ADJUST_INDICES(start, end, (int) str.size());
+		if ( start >= end ) return "";
+		return str.substr( start, end - start );
+	}
+	
+	
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int find( const std::string & str, const std::string & sub, int start, int end  )
+	{
+		ADJUST_INDICES(start, end, (int) str.size());
+		
+		std::string::size_type result = str.find( sub, start );
+		
+		// If we cannot find the string, or if the end-point of our found substring is past
+		// the allowed end limit, return that it can't be found.
+		if( result == std::string::npos || 
+		   (result + sub.size() > (std::string::size_type)end) )
+		{
+			return -1;
+		}
+		
+		return (int) result;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int index( const std::string & str, const std::string & sub, int start, int end  )
+	{
+		return find( str, sub, start, end );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int rfind( const std::string & str, const std::string & sub, int start, int end )
+	{
+		ADJUST_INDICES(start, end, (int) str.size());
+		
+		std::string::size_type result = str.rfind( sub, end );
+		
+		if( result == std::string::npos || 
+			result < (std::string::size_type)start  || 
+		   (result + sub.size() > (std::string::size_type)end))
+			return -1;
+		
+		return (int)result;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int rindex( const std::string & str, const std::string & sub, int start, int end )
+	{
+		return rfind( str, sub, start, end );
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string expandtabs( const std::string & str, int tabsize )
+	{
+		std::string s( str );
+
+		std::string::size_type len = str.size(), i = 0;
+		int offset = 0;
+
+		int j = 0;
+
+		for ( i = 0; i < len; ++i )
+		{
+			if ( str[i] == '\t' )
+			{
+
+				if ( tabsize > 0 )
+				{
+					int fillsize = tabsize - (j % tabsize);
+					j += fillsize;
+					s.replace( i + offset, 1, std::string( fillsize, ' ' ));
+					offset += fillsize - 1;
+				}
+				else
+				{
+					s.replace( i + offset, 1, "" );
+					offset -= 1;
+				}
+
+			}
+			else
+			{
+				j++;
+
+				if (str[i] == '\n' || str[i] == '\r')
+				{
+					j = 0;
+				}
+			}
+		}
+
+		return s;
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	int count( const std::string & str, const std::string & substr, int start, int end )
+	{
+		int nummatches = 0;
+		int cursor = start;
+
+		while ( 1 )
+		{
+			cursor = find( str, substr, cursor, end );
+
+			if ( cursor < 0 ) break;
+
+			cursor += (int) substr.size();
+			nummatches += 1;
+		}
+
+		return nummatches;
+
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string replace( const std::string & str, const std::string & oldstr, const std::string & newstr, int count )
+	{
+		int sofar = 0;
+		int cursor = 0;
+		std::string s( str );
+
+		std::string::size_type oldlen = oldstr.size(), newlen = newstr.size();
+
+		while ( ( cursor = find( s, oldstr, cursor ) ) != -1 )
+		{
+			if ( count > -1 && sofar >= count )
+			{
+				break;
+			}
+
+			s.replace( cursor, oldlen, newstr );
+
+			cursor += (int) newlen;
+			++sofar;
+		}
+
+		return s;
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	void splitlines(  const std::string & str, std::vector< std::string > & result, bool keepends )
+	{
+		result.clear();
+		std::string::size_type len = str.size(), i, j, eol;
+
+		 for (i = j = 0; i < len; )
+		 {
+			while (i < len && str[i] != '\n' && str[i] != '\r') i++;
+
+			eol = i;
+			if (i < len)
+			{
+				if (str[i] == '\r' && i + 1 < len && str[i+1] == '\n')
+				{
+					i += 2;
+				}
+				else
+				{
+					i++;
+				}
+				if (keepends)
+				eol = i;
+
+			}
+
+			result.push_back( str.substr( j, eol - j ) );
+			j = i;
+
+		}
+
+		if (j < len)
+		{
+			result.push_back( str.substr( j, len - j ) );
+		}
+
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	std::string mul( const std::string & str, int n )
+	{
+		// Early exits
+		if (n <= 0) return "";
+		if (n == 1) return str;
+		
+		std::ostringstream os;
+		for(int i=0; i<n; ++i)
+		{
+			os << str;
+		}
+		return os.str();
+	}
 
 
 
@@ -1060,593 +1082,593 @@
 {
 namespace path
 {
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    /// These functions are C++ ports of the python2.6 versions of os.path,
-    /// and come from genericpath.py, ntpath.py, posixpath.py
-
-    /// Split a pathname into drive and path specifiers.
-    /// Returns drivespec, pathspec. Either part may be empty.
-    void splitdrive_nt(std::string & drivespec, std::string & pathspec,
-                       const std::string & p)
-    {
-        if(pystring::slice(p, 1, 2) == ":")
-        {
-            std::string path = p; // In case drivespec == p
-            drivespec = pystring::slice(path, 0, 2);
-            pathspec = pystring::slice(path, 2);
-        }
-        else
-        {
-            drivespec = "";
-            pathspec = p;
-        }
-    }
-
-    // On Posix, drive is always empty
-    void splitdrive_posix(std::string & drivespec, std::string & pathspec,
-                          const std::string & path)
-    {
-        drivespec = "";
-        pathspec = path;
-    }
-
-    void splitdrive(std::string & drivespec, std::string & pathspec,
-                    const std::string & path)
-    {
+	
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	/// These functions are C++ ports of the python2.6 versions of os.path,
+	/// and come from genericpath.py, ntpath.py, posixpath.py
+
+	/// Split a pathname into drive and path specifiers.
+	/// Returns drivespec, pathspec. Either part may be empty.
+	void splitdrive_nt(std::string & drivespec, std::string & pathspec,
+					   const std::string & p)
+	{
+		if(pystring::slice(p, 1, 2) == ":")
+		{
+			std::string path = p; // In case drivespec == p
+			drivespec = pystring::slice(path, 0, 2);
+			pathspec = pystring::slice(path, 2);
+		}
+		else
+		{
+			drivespec = "";
+			pathspec = p;
+		}
+	}
+
+	// On Posix, drive is always empty
+	void splitdrive_posix(std::string & drivespec, std::string & pathspec,
+						  const std::string & path)
+	{
+		drivespec = "";
+		pathspec = path;
+	}
+
+	void splitdrive(std::string & drivespec, std::string & pathspec,
+					const std::string & path)
+	{
 #ifdef WINDOWS
-        return splitdrive_nt(drivespec, pathspec, path);
+		return splitdrive_nt(drivespec, pathspec, path);
 #else
-        return splitdrive_posix(drivespec, pathspec, path);
+		return splitdrive_posix(drivespec, pathspec, path);
 #endif
-    }
+	}
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Test whether a path is absolute
-    // In windows, if the character to the right of the colon
-    // is a forward or backslash it's absolute.
-    bool isabs_nt(const std::string & path)
-    {
-        std::string drivespec, pathspec;
-        splitdrive_nt(drivespec, pathspec, path);
-        if(pathspec.empty()) return false;
-        return ((pathspec[0] == '/') || (pathspec[0] == '\\'));
-    }
-
-    bool isabs_posix(const std::string & s)
-    {
-        return pystring::startswith(s, "/");
-    }
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	// Test whether a path is absolute
+	// In windows, if the character to the right of the colon
+	// is a forward or backslash it's absolute.
+	bool isabs_nt(const std::string & path)
+	{
+		std::string drivespec, pathspec;
+		splitdrive_nt(drivespec, pathspec, path);
+		if(pathspec.empty()) return false;
+		return ((pathspec[0] == '/') || (pathspec[0] == '\\'));
+	}
+
+	bool isabs_posix(const std::string & s)
+	{
+		return pystring::startswith(s, "/");
+	}
 
-    bool isabs(const std::string & path)
-    {
+	bool isabs(const std::string & path)
+	{
 #ifdef WINDOWS
-        return isabs_nt(path);
+		return isabs_nt(path);
 #else
-        return isabs_posix(path);
+		return isabs_posix(path);
 #endif
-    }
+	}
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-    
-    std::string abspath_nt(const std::string & path, const std::string & cwd)
-    {
-        std::string p = path;
-        if(!isabs_nt(p)) p = join_nt(cwd, p);
-        return normpath_nt(p);
-    }
-    
-    std::string abspath_posix(const std::string & path, const std::string & cwd)
-    {
-        std::string p = path;
-        if(!isabs_posix(p)) p = join_posix(cwd, p);
-        return normpath_posix(p);
-    }
-    
-    std::string abspath(const std::string & path, const std::string & cwd)
-    {
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+	
+	std::string abspath_nt(const std::string & path, const std::string & cwd)
+	{
+		std::string p = path;
+		if(!isabs_nt(p)) p = join_nt(cwd, p);
+		return normpath_nt(p);
+	}
+	
+	std::string abspath_posix(const std::string & path, const std::string & cwd)
+	{
+		std::string p = path;
+		if(!isabs_posix(p)) p = join_posix(cwd, p);
+		return normpath_posix(p);
+	}
+	
+	std::string abspath(const std::string & path, const std::string & cwd)
+	{
 #ifdef WINDOWS
-        return abspath_nt(path, cwd);
+		return abspath_nt(path, cwd);
 #else
-        return abspath_posix(path, cwd);
+		return abspath_posix(path, cwd);
 #endif
-    }
-    
+	}
+	
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    std::string join_nt(const std::vector< std::string > & paths)
-    {
-        if(paths.empty()) return "";
-        if(paths.size() == 1) return paths[0];
-        
-        std::string path = paths[0];
-        
-        for(unsigned int i=1; i<paths.size(); ++i)
-        {
-            std::string b = paths[i];
-            
-            bool b_nts = false;
-            if(path.empty())
-            {
-                b_nts = true;
-            }
-            else if(isabs_nt(b))
-            {
-                // This probably wipes out path so far.  However, it's more
-                // complicated if path begins with a drive letter:
-                //     1. join('c:', '/a') == 'c:/a'
-                //     2. join('c:/', '/a') == 'c:/a'
-                // But
-                //     3. join('c:/a', '/b') == '/b'
-                //     4. join('c:', 'd:/') = 'd:/'
-                //     5. join('c:/', 'd:/') = 'd:/'
-                
-                if( (pystring::slice(path, 1, 2) != ":") ||
-                    (pystring::slice(b, 1, 2) == ":") )
-                {
-                    // Path doesnt start with a drive letter
-                    b_nts = true;
-                }
-                // Else path has a drive letter, and b doesn't but is absolute.
-                else if((path.size()>3) || 
-                        ((path.size()==3) && !pystring::endswith(path, "/") && !pystring::endswith(path, "\\")))
-                {
-                    b_nts = true;
-                }
-            }
-            
-            if(b_nts)
-            {
-                path = b;
-            }
-            else
-            {
-                // Join, and ensure there's a separator.
-                // assert len(path) > 0
-                if( pystring::endswith(path, "/") || pystring::endswith(path, "\\"))
-                {
-                    if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
-                    {
-                        path += pystring::slice(b, 1);
-                    }
-                    else
-                    {
-                        path += b;
-                    }
-                }
-                else if(pystring::endswith(path, ":"))
-                {
-                    path += b;
-                }
-                else if(!b.empty())
-                {
-                    if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
-                    {
-                        path += b;
-                    }
-                    else
-                    {
-                        path += "\\" + b;
-                    }
-                }
-                else
-                {
-                    // path is not empty and does not end with a backslash,
-                    // but b is empty; since, e.g., split('a/') produces
-                    // ('a', ''), it's best if join() adds a backslash in
-                    // this case.
-                    path += "\\";
-                }
-            }
-        }
-        
-        return path;
-    }
-    
-    // Join two or more pathname components, inserting "\\" as needed.
-    std::string join_nt(const std::string & a, const std::string & b)
-    {
-        std::vector< std::string > paths(2);
-        paths[0] = a;
-        paths[1] = b;
-        return join_nt(paths);
-    }
-
-    // Join pathnames.
-    // If any component is an absolute path, all previous path components
-    // will be discarded.
-    // Ignore the previous parts if a part is absolute.
-    // Insert a '/' unless the first part is empty or already ends in '/'.
-
-    std::string join_posix(const std::vector< std::string > & paths)
-    {
-        if(paths.empty()) return "";
-        if(paths.size() == 1) return paths[0];
-        
-        std::string path = paths[0];
-        
-        for(unsigned int i=1; i<paths.size(); ++i)
-        {
-            std::string b = paths[i];
-            if(pystring::startswith(b, "/"))
-            {
-                path = b;
-            }
-            else if(path.empty() || pystring::endswith(path, "/"))
-            {
-                path += b;
-            }
-            else
-            {
-                path += "/" + b;
-            }
-        }
-        
-        return path;
-    }
-
-    std::string join_posix(const std::string & a, const std::string & b)
-    {
-        std::vector< std::string > paths(2);
-        paths[0] = a;
-        paths[1] = b;
-        return join_posix(paths);
-    }
-    
-    std::string join(const std::string & path1, const std::string & path2)
-    {
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	std::string join_nt(const std::vector< std::string > & paths)
+	{
+		if(paths.empty()) return "";
+		if(paths.size() == 1) return paths[0];
+		
+		std::string path = paths[0];
+		
+		for(unsigned int i=1; i<paths.size(); ++i)
+		{
+			std::string b = paths[i];
+			
+			bool b_nts = false;
+			if(path.empty())
+			{
+				b_nts = true;
+			}
+			else if(isabs_nt(b))
+			{
+				// This probably wipes out path so far.  However, it's more
+				// complicated if path begins with a drive letter:
+				//     1. join('c:', '/a') == 'c:/a'
+				//     2. join('c:/', '/a') == 'c:/a'
+				// But
+				//     3. join('c:/a', '/b') == '/b'
+				//     4. join('c:', 'd:/') = 'd:/'
+				//     5. join('c:/', 'd:/') = 'd:/'
+				
+				if( (pystring::slice(path, 1, 2) != ":") ||
+					(pystring::slice(b, 1, 2) == ":") )
+				{
+					// Path doesnt start with a drive letter
+					b_nts = true;
+				}
+				// Else path has a drive letter, and b doesn't but is absolute.
+				else if((path.size()>3) || 
+						((path.size()==3) && !pystring::endswith(path, "/") && !pystring::endswith(path, "\\")))
+				{
+					b_nts = true;
+				}
+			}
+			
+			if(b_nts)
+			{
+				path = b;
+			}
+			else
+			{
+				// Join, and ensure there's a separator.
+				// assert len(path) > 0
+				if( pystring::endswith(path, "/") || pystring::endswith(path, "\\"))
+				{
+					if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
+					{
+						path += pystring::slice(b, 1);
+					}
+					else
+					{
+						path += b;
+					}
+				}
+				else if(pystring::endswith(path, ":"))
+				{
+					path += b;
+				}
+				else if(!b.empty())
+				{
+					if(pystring::startswith(b,"/") || pystring::startswith(b,"\\"))
+					{
+						path += b;
+					}
+					else
+					{
+						path += "\\" + b;
+					}
+				}
+				else
+				{
+					// path is not empty and does not end with a backslash,
+					// but b is empty; since, e.g., split('a/') produces
+					// ('a', ''), it's best if join() adds a backslash in
+					// this case.
+					path += "\\";
+				}
+			}
+		}
+		
+		return path;
+	}
+	
+	// Join two or more pathname components, inserting "\\" as needed.
+	std::string join_nt(const std::string & a, const std::string & b)
+	{
+		std::vector< std::string > paths(2);
+		paths[0] = a;
+		paths[1] = b;
+		return join_nt(paths);
+	}
+
+	// Join pathnames.
+	// If any component is an absolute path, all previous path components
+	// will be discarded.
+	// Ignore the previous parts if a part is absolute.
+	// Insert a '/' unless the first part is empty or already ends in '/'.
+
+	std::string join_posix(const std::vector< std::string > & paths)
+	{
+		if(paths.empty()) return "";
+		if(paths.size() == 1) return paths[0];
+		
+		std::string path = paths[0];
+		
+		for(unsigned int i=1; i<paths.size(); ++i)
+		{
+			std::string b = paths[i];
+			if(pystring::startswith(b, "/"))
+			{
+				path = b;
+			}
+			else if(path.empty() || pystring::endswith(path, "/"))
+			{
+				path += b;
+			}
+			else
+			{
+				path += "/" + b;
+			}
+		}
+		
+		return path;
+	}
+
+	std::string join_posix(const std::string & a, const std::string & b)
+	{
+		std::vector< std::string > paths(2);
+		paths[0] = a;
+		paths[1] = b;
+		return join_posix(paths);
+	}
+	
+	std::string join(const std::string & path1, const std::string & path2)
+	{
 #ifdef WINDOWS
-        return join_nt(path1, path2);
+		return join_nt(path1, path2);
 #else
-        return join_posix(path1, path2);
+		return join_posix(path1, path2);
 #endif
-    }
+	}
 
 
-    std::string join(const std::vector< std::string > & paths)
-    {
+	std::string join(const std::vector< std::string > & paths)
+	{
 #ifdef WINDOWS
-        return join_nt(paths);
+		return join_nt(paths);
 #else
-        return join_posix(paths);
+		return join_posix(paths);
 #endif
-    }
-    
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-        
-    // Split a pathname.
-    // Return (head, tail) where tail is everything after the final slash.
-    // Either part may be empty
-
-    void split_nt(std::string & head, std::string & tail, const std::string & path)
-    {
-        std::string d, p;
-        splitdrive_nt(d, p, path);
-        
-        // set i to index beyond p's last slash
-        int i = (int)p.size();
-        
-        while(i>0 && (p[i-1] != '\\') && (p[i-1] != '/'))
-        {
-            i = i - 1;
-        }
-
-        head = pystring::slice(p,0,i);
-        tail = pystring::slice(p,i); // now tail has no slashes
-        
-        // remove trailing slashes from head, unless it's all slashes
-        std::string head2 = head;
-        while(!head2.empty() && ((pystring::slice(head2,-1) == "/") ||
-                                 (pystring::slice(head2,-1) == "\\")))
-        {
-            head2 = pystring::slice(head,0,-1);
-        }
-        
-        if(!head2.empty()) head = head2;
-        head = d + head;
-    }
-
-
-    // Split a path in head (everything up to the last '/') and tail (the
-    // rest).  If the path ends in '/', tail will be empty.  If there is no
-    // '/' in the path, head  will be empty.
-    // Trailing '/'es are stripped from head unless it is the root.
-
-    void split_posix(std::string & head, std::string & tail, const std::string & p)
-    {
-        int i = pystring::rfind(p, "/") + 1;
-        
-        head = pystring::slice(p,0,i);
-        tail = pystring::slice(p,i);
-        
-        if(!head.empty() && (head != pystring::mul("/", (int) head.size())))
-        {
-            head = pystring::rstrip(head, "/");
-        }
-    }
+	}
+	
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+		
+	// Split a pathname.
+	// Return (head, tail) where tail is everything after the final slash.
+	// Either part may be empty
+
+	void split_nt(std::string & head, std::string & tail, const std::string & path)
+	{
+		std::string d, p;
+		splitdrive_nt(d, p, path);
+		
+		// set i to index beyond p's last slash
+		int i = (int)p.size();
+		
+		while(i>0 && (p[i-1] != '\\') && (p[i-1] != '/'))
+		{
+			i = i - 1;
+		}
 
-    void split(std::string & head, std::string & tail, const std::string & path)
-    {
+		head = pystring::slice(p,0,i);
+		tail = pystring::slice(p,i); // now tail has no slashes
+		
+		// remove trailing slashes from head, unless it's all slashes
+		std::string head2 = head;
+		while(!head2.empty() && ((pystring::slice(head2,-1) == "/") ||
+								 (pystring::slice(head2,-1) == "\\")))
+		{
+			head2 = pystring::slice(head,0,-1);
+		}
+		
+		if(!head2.empty()) head = head2;
+		head = d + head;
+	}
+
+
+	// Split a path in head (everything up to the last '/') and tail (the
+	// rest).  If the path ends in '/', tail will be empty.  If there is no
+	// '/' in the path, head  will be empty.
+	// Trailing '/'es are stripped from head unless it is the root.
+
+	void split_posix(std::string & head, std::string & tail, const std::string & p)
+	{
+		int i = pystring::rfind(p, "/") + 1;
+		
+		head = pystring::slice(p,0,i);
+		tail = pystring::slice(p,i);
+		
+		if(!head.empty() && (head != pystring::mul("/", (int) head.size())))
+		{
+			head = pystring::rstrip(head, "/");
+		}
+	}
+
+	void split(std::string & head, std::string & tail, const std::string & path)
+	{
 #ifdef WINDOWS
-        return split_nt(head, tail, path);
+		return split_nt(head, tail, path);
 #else
-        return split_posix(head, tail, path);
+		return split_posix(head, tail, path);
 #endif
-    }
+	}
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    std::string basename_nt(const std::string & path)
-    {
-        std::string head, tail;
-        split_nt(head, tail, path);
-        return tail;
-    }
-
-    std::string basename_posix(const std::string & path)
-    {
-        std::string head, tail;
-        split_posix(head, tail, path);
-        return tail;
-    }
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	std::string basename_nt(const std::string & path)
+	{
+		std::string head, tail;
+		split_nt(head, tail, path);
+		return tail;
+	}
+
+	std::string basename_posix(const std::string & path)
+	{
+		std::string head, tail;
+		split_posix(head, tail, path);
+		return tail;
+	}
 
-    std::string basename(const std::string & path)
-    {
+	std::string basename(const std::string & path)
+	{
 #ifdef WINDOWS
-        return basename_nt(path);
+		return basename_nt(path);
 #else
-        return basename_posix(path);
+		return basename_posix(path);
 #endif
-    }
+	}
 
-    std::string dirname_nt(const std::string & path)
-    {
-        std::string head, tail;
-        split_nt(head, tail, path);
-        return head;
-    }
-    
-    std::string dirname_posix(const std::string & path)
-    {
-        std::string head, tail;
-        split_posix(head, tail, path);
-        return head;
-    }
-    
-    std::string dirname(const std::string & path)
-    {
+	std::string dirname_nt(const std::string & path)
+	{
+		std::string head, tail;
+		split_nt(head, tail, path);
+		return head;
+	}
+	
+	std::string dirname_posix(const std::string & path)
+	{
+		std::string head, tail;
+		split_posix(head, tail, path);
+		return head;
+	}
+	
+	std::string dirname(const std::string & path)
+	{
 #ifdef WINDOWS
-        return dirname_nt(path);
+		return dirname_nt(path);
 #else
-        return dirname_posix(path);
+		return dirname_posix(path);
 #endif
-    }
+	}
 
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A\B.
-    std::string normpath_nt(const std::string & p)
-    {
-        std::string path = p;
-        path = pystring::replace(path, "/","\\");
-        
-        std::string prefix;
-        splitdrive_nt(prefix, path, path);
-        
-        // We need to be careful here. If the prefix is empty, and the path starts
-        // with a backslash, it could either be an absolute path on the current
-        // drive (\dir1\dir2\file) or a UNC filename (\\server\mount\dir1\file). It
-        // is therefore imperative NOT to collapse multiple backslashes blindly in
-        // that case.
-        // The code below preserves multiple backslashes when there is no drive
-        // letter. This means that the invalid filename \\\a\b is preserved
-        // unchanged, where a\\\b is normalised to a\b. It's not clear that there
-        // is any better behaviour for such edge cases.
-        
-        if(prefix.empty())
-        {
-            // No drive letter - preserve initial backslashes
-            while(pystring::slice(path,0,1) == "\\")
-            {
-                prefix = prefix + "\\";
-                path = pystring::slice(path,1);
-            }
-        }
-        else
-        {
-            // We have a drive letter - collapse initial backslashes
-            if(pystring::startswith(path, "\\"))
-            {
-                prefix = prefix + "\\";
-                path = pystring::lstrip(path, "\\");
-            }
-        }
-        
-        std::vector<std::string> comps;
-        pystring::split(path, comps, "\\");
-        
-        int i = 0;
-        
-        while(i<(int)comps.size())
-        {
-            if(comps[i].empty() || comps[i] == ".")
-            {
-                comps.erase(comps.begin()+i);
-            }
-            else if(comps[i] == "..")
-            {
-                if(i>0 && comps[i-1] != "..")
-                {
-                    comps.erase(comps.begin()+i-1, comps.begin()+i+1);
-                    i -= 1;
-                }
-                else if(i == 0 && pystring::endswith(prefix, "\\"))
-                {
-                    comps.erase(comps.begin()+i);
-                }
-                else
-                {
-                    i += 1;
-                }
-            }
-            else
-            {
-                i += 1;
-            }
-        }
-        
-        // If the path is now empty, substitute '.'
-        if(prefix.empty() && comps.empty())
-        {
-            comps.push_back(".");
-        }
-        
-        return prefix + pystring::join("\\", comps);
-    }
-
-    // Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
-    // It should be understood that this may change the meaning of the path
-    // if it contains symbolic links!
-    // Normalize path, eliminating double slashes, etc.
-
-    std::string normpath_posix(const std::string & p)
-    {
-        if(p.empty()) return ".";
-        
-        std::string path = p;
-        
-        int initial_slashes = pystring::startswith(path,"/") ? 1 : 0;
-        
-        // POSIX allows one or two initial slashes, but treats three or more
-        // as single slash.
-        
-        if (initial_slashes && pystring::startswith(path,"//")
-            && !pystring::startswith(path,"///"))
-            initial_slashes = 2;
-        
-        std::vector<std::string> comps, new_comps;
-        pystring::split(path, comps, "/");
-        
-        for(unsigned int i=0; i<comps.size(); ++i)
-        {
-            std::string comp = comps[i];
-            if(comp.empty() || comp == ".")
-                continue;
-            
-            if( (comp != "..") || ((initial_slashes == 0) && new_comps.empty()) ||
-                (!new_comps.empty() && new_comps[new_comps.size()-1] == ".."))
-            {
-                new_comps.push_back(comp);
-            }
-            else if (!new_comps.empty())
-            {
-                new_comps.pop_back();
-            }
-        }
-        
-        path = pystring::join("/", new_comps);
-        
-        if (initial_slashes > 0)
-            path = pystring::mul("/",initial_slashes) + path;
-        
-        if(path.empty()) return ".";
-        return path;
-    }
-    
-    std::string normpath(const std::string & path)
-    {
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	// Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A\B.
+	std::string normpath_nt(const std::string & p)
+	{
+		std::string path = p;
+		path = pystring::replace(path, "/","\\");
+		
+		std::string prefix;
+		splitdrive_nt(prefix, path, path);
+		
+		// We need to be careful here. If the prefix is empty, and the path starts
+		// with a backslash, it could either be an absolute path on the current
+		// drive (\dir1\dir2\file) or a UNC filename (\\server\mount\dir1\file). It
+		// is therefore imperative NOT to collapse multiple backslashes blindly in
+		// that case.
+		// The code below preserves multiple backslashes when there is no drive
+		// letter. This means that the invalid filename \\\a\b is preserved
+		// unchanged, where a\\\b is normalised to a\b. It's not clear that there
+		// is any better behaviour for such edge cases.
+		
+		if(prefix.empty())
+		{
+			// No drive letter - preserve initial backslashes
+			while(pystring::slice(path,0,1) == "\\")
+			{
+				prefix = prefix + "\\";
+				path = pystring::slice(path,1);
+			}
+		}
+		else
+		{
+			// We have a drive letter - collapse initial backslashes
+			if(pystring::startswith(path, "\\"))
+			{
+				prefix = prefix + "\\";
+				path = pystring::lstrip(path, "\\");
+			}
+		}
+		
+		std::vector<std::string> comps;
+		pystring::split(path, comps, "\\");
+		
+		int i = 0;
+		
+		while(i<(int)comps.size())
+		{
+			if(comps[i].empty() || comps[i] == ".")
+			{
+				comps.erase(comps.begin()+i);
+			}
+			else if(comps[i] == "..")
+			{
+				if(i>0 && comps[i-1] != "..")
+				{
+					comps.erase(comps.begin()+i-1, comps.begin()+i+1);
+					i -= 1;
+				}
+				else if(i == 0 && pystring::endswith(prefix, "\\"))
+				{
+					comps.erase(comps.begin()+i);
+				}
+				else
+				{
+					i += 1;
+				}
+			}
+			else
+			{
+				i += 1;
+			}
+		}
+		
+		// If the path is now empty, substitute '.'
+		if(prefix.empty() && comps.empty())
+		{
+			comps.push_back(".");
+		}
+		
+		return prefix + pystring::join("\\", comps);
+	}
+
+	// Normalize a path, e.g. A//B, A/./B and A/foo/../B all become A/B.
+	// It should be understood that this may change the meaning of the path
+	// if it contains symbolic links!
+	// Normalize path, eliminating double slashes, etc.
+
+	std::string normpath_posix(const std::string & p)
+	{
+		if(p.empty()) return ".";
+		
+		std::string path = p;
+		
+		int initial_slashes = pystring::startswith(path,"/") ? 1 : 0;
+		
+		// POSIX allows one or two initial slashes, but treats three or more
+		// as single slash.
+		
+		if (initial_slashes && pystring::startswith(path,"//")
+			&& !pystring::startswith(path,"///"))
+			initial_slashes = 2;
+		
+		std::vector<std::string> comps, new_comps;
+		pystring::split(path, comps, "/");
+		
+		for(unsigned int i=0; i<comps.size(); ++i)
+		{
+			std::string comp = comps[i];
+			if(comp.empty() || comp == ".")
+				continue;
+			
+			if( (comp != "..") || ((initial_slashes == 0) && new_comps.empty()) ||
+				(!new_comps.empty() && new_comps[new_comps.size()-1] == ".."))
+			{
+				new_comps.push_back(comp);
+			}
+			else if (!new_comps.empty())
+			{
+				new_comps.pop_back();
+			}
+		}
+		
+		path = pystring::join("/", new_comps);
+		
+		if (initial_slashes > 0)
+			path = pystring::mul("/",initial_slashes) + path;
+		
+		if(path.empty()) return ".";
+		return path;
+	}
+	
+	std::string normpath(const std::string & path)
+	{
 #ifdef WINDOWS
-        return normpath_nt(path);
+		return normpath_nt(path);
 #else
-        return normpath_posix(path);
+		return normpath_posix(path);
 #endif
-    }
+	}
+
+	//////////////////////////////////////////////////////////////////////////////////////////////
+	///
+	///
+
+	// Split the extension from a pathname.
+	// Extension is everything from the last dot to the end, ignoring
+	// leading dots.  Returns "(root, ext)"; ext may be empty.
+	// It is always true that root + ext == p
+
+	void splitext_generic(std::string & root, std::string & ext,
+						  const std::string & p,
+						  const std::string & sep,
+						  const std::string & altsep,
+						  const std::string & extsep)
+	{
+		int sepIndex = pystring::rfind(p, sep);
+		if(!altsep.empty())
+		{
+			int altsepIndex = pystring::rfind(p, altsep);
+			sepIndex = std::max(sepIndex, altsepIndex);
+		}
+
+		int dotIndex = pystring::rfind(p, extsep);
+		if(dotIndex > sepIndex)
+		{
+			// Skip all leading dots
+			int filenameIndex = sepIndex + 1;
+
+			while(filenameIndex < dotIndex)
+			{
+				if(pystring::slice(p,filenameIndex) != extsep)
+				{
+					root = pystring::slice(p, 0, dotIndex);
+					ext = pystring::slice(p, dotIndex);
+					return;
+				}
+
+				filenameIndex += 1;
+			}
+		}
 
-    //////////////////////////////////////////////////////////////////////////////////////////////
-    ///
-    ///
-
-    // Split the extension from a pathname.
-    // Extension is everything from the last dot to the end, ignoring
-    // leading dots.  Returns "(root, ext)"; ext may be empty.
-    // It is always true that root + ext == p
-
-    void splitext_generic(std::string & root, std::string & ext,
-                          const std::string & p,
-                          const std::string & sep,
-                          const std::string & altsep,
-                          const std::string & extsep)
-    {
-        int sepIndex = pystring::rfind(p, sep);
-        if(!altsep.empty())
-        {
-            int altsepIndex = pystring::rfind(p, altsep);
-            sepIndex = std::max(sepIndex, altsepIndex);
-        }
-
-        int dotIndex = pystring::rfind(p, extsep);
-        if(dotIndex > sepIndex)
-        {
-            // Skip all leading dots
-            int filenameIndex = sepIndex + 1;
-
-            while(filenameIndex < dotIndex)
-            {
-                if(pystring::slice(p,filenameIndex) != extsep)
-                {
-                    root = pystring::slice(p, 0, dotIndex);
-                    ext = pystring::slice(p, dotIndex);
-                    return;
-                }
-
-                filenameIndex += 1;
-            }
-        }
-
-        root = p;
-        ext = "";
-    }
-
-    void splitext_nt(std::string & root, std::string & ext, const std::string & path)
-    {
-        return splitext_generic(root, ext, path,
-                                "\\", "/", ".");
-    }
-
-    void splitext_posix(std::string & root, std::string & ext, const std::string & path)
-    {
-        return splitext_generic(root, ext, path,
-                                "/", "", ".");
-    }
+		root = p;
+		ext = "";
+	}
+
+	void splitext_nt(std::string & root, std::string & ext, const std::string & path)
+	{
+		return splitext_generic(root, ext, path,
+								"\\", "/", ".");
+	}
+
+	void splitext_posix(std::string & root, std::string & ext, const std::string & path)
+	{
+		return splitext_generic(root, ext, path,
+								"/", "", ".");
+	}
 
-    void splitext(std::string & root, std::string & ext, const std::string & path)
-    {
+	void splitext(std::string & root, std::string & ext, const std::string & path)
+	{
 #ifdef WINDOWS
-        return splitext_nt(root, ext, path);
+		return splitext_nt(root, ext, path);
 #else
-        return splitext_posix(root, ext, path);
+		return splitext_posix(root, ext, path);
 #endif
-    }
+	}
 
 } // namespace path
 } // namespace os
diff -Nru opencolorio-1.0.9~dfsg0/src/core/Transform.cpp opencolorio-1.1.0~dfsg0/src/core/Transform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/Transform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/Transform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -152,6 +152,16 @@
         {
             os << *groupTransform;
         }
+        else if(const LogTransform * logTransform = \
+            dynamic_cast<const LogTransform*>(t))
+        {
+            os << *logTransform;
+        }
+        else if(const LookTransform * lookTransform = \
+            dynamic_cast<const LookTransform*>(t))
+        {
+            os << *lookTransform;
+        }
         else if(const MatrixTransform * matrixTransform = \
             dynamic_cast<const MatrixTransform*>(t))
         {
diff -Nru opencolorio-1.0.9~dfsg0/src/core/TruelightTransform.cpp opencolorio-1.1.0~dfsg0/src/core/TruelightTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/core/TruelightTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/TruelightTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -235,7 +235,17 @@
     {
         os << "<TruelightTransform ";
         os << "direction=" << TransformDirectionToString(t.getDirection()) << ", ";
-        os << ">\n";
+        os << "configroot=" << t.getConfigRoot() << ", ";
+        os << "profile=" << t.getProfile() << ", ";
+        os << "camera=" << t.getCamera() << ", ";
+        os << "inputdisplay=" << t.getInputDisplay() << ", ";
+        os << "recorder=" << t.getRecorder() << ", ";
+        os << "print=" << t.getPrint() << ", ";
+        os << "lamp=" << t.getLamp() << ", ";
+        os << "outputcamera=" << t.getOutputCamera() << ", ";
+        os << "display=" << t.getDisplay() << ", ";
+        os << "cubeinput=" << t.getCubeInput();
+        os << ">";
         return os;
     }
     
@@ -291,25 +301,25 @@
     OCIO::ConstProcessorRcPtr tolog;
     
 #ifdef OCIO_TRUELIGHT_SUPPORT
-    OIIO_CHECK_NO_THOW(tosrgb = config->getProcessor("log", "sRGB"));
-    OIIO_CHECK_NO_THOW(tolog = config->getProcessor("sRGB", "log"));
+    OIIO_CHECK_NO_THROW(tosrgb = config->getProcessor("log", "sRGB"));
+    OIIO_CHECK_NO_THROW(tolog = config->getProcessor("sRGB", "log"));
 #else
-    OIIO_CHECK_THOW(tosrgb = config->getProcessor("log", "sRGB"), OCIO::Exception);
-    OIIO_CHECK_THOW(tolog = config->getProcessor("sRGB", "log"), OCIO::Exception);
+    OIIO_CHECK_THROW(tosrgb = config->getProcessor("log", "sRGB"), OCIO::Exception);
+    OIIO_CHECK_THROW(tolog = config->getProcessor("sRGB", "log"), OCIO::Exception);
 #endif
     
 #ifdef OCIO_TRUELIGHT_SUPPORT
     float input[3] = {0.5f, 0.5f, 0.5f};
     float output[3] = {0.500098f, 0.500317f, 0.501134f};
-    OIIO_CHECK_NO_THOW(tosrgb->applyRGB(input));
-    OIIO_CHECK_NO_THOW(tolog->applyRGB(input));
+    OIIO_CHECK_NO_THROW(tosrgb->applyRGB(input));
+    OIIO_CHECK_NO_THROW(tolog->applyRGB(input));
     OIIO_CHECK_CLOSE(input[0], output[0], 1e-4);
     OIIO_CHECK_CLOSE(input[1], output[1], 1e-4);
     OIIO_CHECK_CLOSE(input[2], output[2], 1e-4);
 #endif
     
     std::ostringstream os;
-    OIIO_CHECK_NO_THOW(config->serialize(os));
+    OIIO_CHECK_NO_THROW(config->serialize(os));
     
     std::string referenceconfig =
     "ocio_profile_version: 1\n"
@@ -358,7 +368,7 @@
     std::istringstream is;
     is.str(referenceconfig);
     OCIO::ConstConfigRcPtr rtconfig;
-    OIIO_CHECK_NO_THOW(rtconfig = OCIO::Config::CreateFromStream(is));
+    OIIO_CHECK_NO_THROW(rtconfig = OCIO::Config::CreateFromStream(is));
     
 }
 
diff -Nru opencolorio-1.0.9~dfsg0/src/core/UnitTest.cpp opencolorio-1.1.0~dfsg0/src/core/UnitTest.cpp
--- opencolorio-1.0.9~dfsg0/src/core/UnitTest.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/UnitTest.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -30,10 +30,18 @@
 #define INCLUDED_OCIO_UNITTEST_H
 
 #ifdef OCIO_UNIT_TEST
+
+#ifndef WIN32
 #pragma GCC visibility push(default)
+#endif
+
 #include <unittest.h> // OIIO unit tests header
 OIIO_TEST_APP(OpenColorIO_Core_Unit_Tests)
+
+#ifndef WIN32
 #pragma GCC visibility pop
+#endif
+
 #endif // OCIO_UNIT_TEST
 
 #endif // INCLUDED_OCIO_UNITTEST_H
diff -Nru opencolorio-1.0.9~dfsg0/src/core/UnitTest.h opencolorio-1.1.0~dfsg0/src/core/UnitTest.h
--- opencolorio-1.0.9~dfsg0/src/core/UnitTest.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core/UnitTest.h	2018-01-05 01:38:27.000000000 +0000
@@ -30,9 +30,17 @@
 #define INCLUDED_OCIO_UNITTEST_H
 
 #ifdef OCIO_UNIT_TEST
+
+#ifndef WIN32
 #pragma GCC visibility push(default)
+#endif
+
 #include <unittest.h> // OIIO unit tests header
+
+#ifndef WIN32
 #pragma GCC visibility pop
+#endif
+
 #endif // OCIO_UNIT_TEST
 
 #endif // INCLUDED_OCIO_UNITTEST_H
diff -Nru opencolorio-1.0.9~dfsg0/src/core_tests/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/core_tests/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/core_tests/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core_tests/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -7,50 +7,82 @@
 include_directories(
     ${CMAKE_SOURCE_DIR}/export/
     ${CMAKE_BINARY_DIR}/export/
-    ${EXTERNAL_INCLUDE_DIRS}
     ${CMAKE_SOURCE_DIR}/ext/oiio/src/include
+    ${EXTERNAL_INCLUDE_DIRS}
     )
 
+if(WIN32)
+    # Hack to get around the "Debug" and "Release" sub directories 
+    #  cmake tries to add with Windows VC+++ IDE
+
+    # Set output path
+    set( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
+    set( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
+    set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
+    # For multi-config builds (e.g. msvc)
+    foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
+        string( TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG )
+        set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_CURRENT_BINARY_DIR} )
+        set( CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_CURRENT_BINARY_DIR} )
+        set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${CMAKE_CURRENT_BINARY_DIR} )
+    endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
+endif()
+
+
+## do not link with OpenColorIO since we reuse the sources files to build this app (avoid double link definition)
 file( GLOB_RECURSE core_test_src_files "${CMAKE_SOURCE_DIR}/src/core/*.cpp" )
+add_executable(ocio_core_tests ${EXTERNAL_OBJECTS} ${core_test_src_files})
 
-add_executable(ocio_core_tests ${core_test_src_files})
+set_target_properties(ocio_core_tests PROPERTIES COMPILE_FLAGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
 
 if(USE_EXTERNAL_TINYXML)
     target_link_libraries(ocio_core_tests ${TINYXML_LIBRARIES})
 else(USE_EXTERNAL_TINYXML)
-    add_dependencies(ocio_core_tests tinyxml)
+    add_dependencies(ocio_core_tests TINYXML_LIB)
 endif(USE_EXTERNAL_TINYXML)
 
 if(USE_EXTERNAL_YAML)
     target_link_libraries(ocio_core_tests ${YAML_CPP_LIBRARIES})
 else(USE_EXTERNAL_YAML)
-    add_dependencies(ocio_core_tests  YAML_CPP_LOCAL)
+    add_dependencies(ocio_core_tests YAML_CPP_LIB)
 endif(USE_EXTERNAL_YAML)
 
-set_target_properties(ocio_core_tests PROPERTIES
-    COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS}"
-    LINK_FLAGS "${EXTERNAL_LINK_FLAGS}")
-if(WIN32)
-    target_link_libraries(ocio_core_tests
-            debug ${EXTERNAL_DEBUG_LIBRARIES}
-            optimized ${EXTERNAL_OPTIMIZED_LIBRARIES}
-            general ${EXTERNAL_GENERAL_LIBRARIES})
-else()
-    target_link_libraries(ocio_core_tests ${EXTERNAL_GENERAL_LIBRARIES})
+if(EXTERNAL_LIBRARIES)
+    target_link_libraries(ocio_core_tests ${EXTERNAL_LIBRARIES})
 endif()
 
+set_target_properties(ocio_core_tests PROPERTIES
+    COMPILE_FLAGS       "${EXTERNAL_COMPILE_FLAGS}"
+    LINK_FLAGS          "${EXTERNAL_LINK_FLAGS}"
+    ## to avoid import/export link dll incoherences (since we build an app with OpenColorIO sources)
+    COMPILE_DEFINITIONS OpenColorIO_STATIC
+)
+
 ###############################################################################
 ### CTEST ###
 
 set(OCIO_TEST_AREA ${CMAKE_CURRENT_BINARY_DIR})
 
-message(STATUS "Create ocio_core_tests.sh.in from ocio_core_tests.sh")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ocio_core_tests.sh.in
-    ${CMAKE_CURRENT_BINARY_DIR}/ocio_core_tests.sh @ONLY)
-
-add_custom_target(MainTests
-                  COMMAND /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/ocio_core_tests.sh
-                  DEPENDS ocio_core_tests
-                  COMMENT "Setting Up and Running OCIO UNIT tests")
+if(UNIX)
+    message(STATUS "Create ocio_core_tests.sh.in from ocio_core_tests.sh")
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ocio_core_tests.sh.in
+        ${CMAKE_CURRENT_BINARY_DIR}/ocio_core_tests.sh @ONLY)
+
+    add_custom_target(MainTests
+                      COMMAND /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/ocio_core_tests.sh
+                      DEPENDS ocio_core_tests
+                      COMMENT "Setting Up and Running OCIO UNIT tests")
+else()
+    message(STATUS "Create ocio_core_tests.bat.in from ocio_core_tests.bat")
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ocio_core_tests.bat.in
+        ${CMAKE_CURRENT_BINARY_DIR}/ocio_core_tests.bat @ONLY)
+
+    add_custom_target(MainTests
+                      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/ocio_core_tests.bat
+                      DEPENDS ocio_core_tests
+                      COMMENT "Setting Up and Running OCIO UNIT tests")
+endif()
 
 add_test(ocio_core_tests "${CMAKE_COMMAND}" --build ${CMAKE_BINARY_DIR} --target MainTests)
diff -Nru opencolorio-1.0.9~dfsg0/src/core_tests/ocio_core_tests.bat.in opencolorio-1.1.0~dfsg0/src/core_tests/ocio_core_tests.bat.in
--- opencolorio-1.0.9~dfsg0/src/core_tests/ocio_core_tests.bat.in	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/core_tests/ocio_core_tests.bat.in	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,10 @@
+@echo off
+
+set OCIO_TEST_AREA=@OCIO_TEST_AREA@
+set OCIO_DATA_ROOT=@OCIO_TEST_AREA@/test_search
+set OCIO_TEST1=foobar
+set OCIO_JOB=meatballs
+set OCIO_SEQ=cheesecake
+set OCIO_SHOT=mb-cc-001
+
+@CMAKE_CURRENT_BINARY_DIR@/ocio_core_tests.exe --log_level=test_suite
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/src/jniglue/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/jniglue/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/jniglue/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/jniglue/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -1,9 +1,9 @@
 
 include_directories(
-  ${JNI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_SOURCE_DIR}/export/
   ${CMAKE_BINARY_DIR}/export/
+  ${JNI_INCLUDE_DIRS}
 )
 
 set(JNIOCIO_CLASSES
@@ -89,5 +89,5 @@
 
 add_subdirectory(tests)
 
-install(TARGETS OpenColorIO-JNI DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX})
+install(TARGETS OpenColorIO-JNI EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib${LIB_SUFFIX})
 install(FILES ${JNIOCIO_JAR} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ocio/)
diff -Nru opencolorio-1.0.9~dfsg0/src/jniglue/JNILook.cpp opencolorio-1.1.0~dfsg0/src/jniglue/JNILook.cpp
--- opencolorio-1.0.9~dfsg0/src/jniglue/JNILook.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/jniglue/JNILook.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -88,6 +88,24 @@
     OCIO_JNITRY_EXIT()
 }
 
+JNIEXPORT jstring JNICALL
+Java_org_OpenColorIO_Look_getDescription(JNIEnv * env, jobject self)
+{
+    OCIO_JNITRY_ENTER()
+    ConstLookRcPtr lok = GetConstJOCIO<ConstLookRcPtr, LookJNI>(env, self);
+    return env->NewStringUTF(lok->getDescription());
+    OCIO_JNITRY_EXIT(NULL)
+}
+
+JNIEXPORT void JNICALL
+Java_org_OpenColorIO_Look_setDescription(JNIEnv * env, jobject self, jstring processSpace)
+{
+    OCIO_JNITRY_ENTER()
+    LookRcPtr lok = GetEditableJOCIO<LookRcPtr, LookJNI>(env, self);
+    lok->setDescription(GetJStringValue(env, processSpace)());
+    OCIO_JNITRY_EXIT()
+}
+
 JNIEXPORT jobject JNICALL
 Java_org_OpenColorIO_Look_getTransform(JNIEnv * env, jobject self)
 {
diff -Nru opencolorio-1.0.9~dfsg0/src/jniglue/org/OpenColorIO/Look.java opencolorio-1.1.0~dfsg0/src/jniglue/org/OpenColorIO/Look.java
--- opencolorio-1.0.9~dfsg0/src/jniglue/org/OpenColorIO/Look.java	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/jniglue/org/OpenColorIO/Look.java	2018-01-05 01:38:27.000000000 +0000
@@ -40,6 +40,8 @@
     public native void setName(String name);
     public native String getProcessSpace();
     public native void setProcessSpace(String processSpace);
+    public native String getDescription();
+    public native void setDescription(String description);
     public native Transform getTransform();
     public native void setTransform(Transform transform);
     public native Transform getInverseTransform();
diff -Nru opencolorio-1.0.9~dfsg0/src/jniglue/tests/org/OpenColorIO/LookTest.java opencolorio-1.1.0~dfsg0/src/jniglue/tests/org/OpenColorIO/LookTest.java
--- opencolorio-1.0.9~dfsg0/src/jniglue/tests/org/OpenColorIO/LookTest.java	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/jniglue/tests/org/OpenColorIO/LookTest.java	2018-01-05 01:38:27.000000000 +0000
@@ -16,6 +16,8 @@
         assertEquals("coollook", lk.getName());
         lk.setProcessSpace("somespace");
         assertEquals("somespace", lk.getProcessSpace());
+        lk.setDescription("this is a test");
+        assertEquals("this is a test", lk.getDescription());
         ExponentTransform et = new ExponentTransform().Create();
         et.setValue(new float[]{0.1f, 0.2f, 0.3f, 0.4f});
         lk.setTransform(et);
diff -Nru opencolorio-1.0.9~dfsg0/src/nuke/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/nuke/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/nuke/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/nuke/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -14,9 +14,7 @@
 add_library(NukeOCIOColorSpace MODULE
     OCIOColorSpace/OCIOColorSpace.cpp
 )
-target_link_libraries(NukeOCIOColorSpace
-    OpenColorIO
-    #${Nuke_LIBRARIES}
+target_link_OCIO(NukeOCIOColorSpace #${Nuke_LIBRARIES}
 )
 set_target_properties(NukeOCIOColorSpace
     PROPERTIES
@@ -30,9 +28,7 @@
 add_library(NukeOCIODisplay MODULE
     OCIODisplay/OCIODisplay.cpp
 )
-target_link_libraries(NukeOCIODisplay
-    OpenColorIO
-    #${Nuke_LIBRARIES}
+target_link_OCIO(NukeOCIODisplay #${Nuke_LIBRARIES}
 )
 set_target_properties(NukeOCIODisplay
     PROPERTIES
@@ -46,9 +42,7 @@
 add_library(NukeOCIOFileTransform MODULE
     OCIOFileTransform/OCIOFileTransform.cpp
 )
-target_link_libraries(NukeOCIOFileTransform
-    OpenColorIO
-    #${Nuke_LIBRARIES}
+target_link_OCIO(NukeOCIOFileTransform #${Nuke_LIBRARIES}
 )
 set_target_properties(NukeOCIOFileTransform
     PROPERTIES
@@ -62,9 +56,7 @@
 add_library(NukeOCIOLogConvert MODULE
     OCIOLogConvert/OCIOLogConvert.cpp
 )
-target_link_libraries(NukeOCIOLogConvert
-    OpenColorIO
-    #${Nuke_LIBRARIES}
+target_link_OCIO(NukeOCIOLogConvert #${Nuke_LIBRARIES}
 )
 set_target_properties(NukeOCIOLogConvert
     PROPERTIES
@@ -78,9 +70,7 @@
 add_library(NukeOCIOLookTransform MODULE
     OCIOLookTransform/OCIOLookTransform.cpp
 )
-target_link_libraries(NukeOCIOLookTransform
-    OpenColorIO
-    #${Nuke_LIBRARIES}
+target_link_OCIO(NukeOCIOLookTransform #${Nuke_LIBRARIES}
 )
 set_target_properties(NukeOCIOLookTransform
     PROPERTIES
@@ -94,9 +84,7 @@
 add_library(NukeOCIOCDLTransform MODULE
     OCIOCDLTransform/OCIOCDLTransform.cpp
 )
-target_link_libraries(NukeOCIOCDLTransform
-    OpenColorIO
-    #${Nuke_LIBRARIES}
+target_link_OCIO(NukeOCIOCDLTransform #${Nuke_LIBRARIES}
 )
 set_target_properties(NukeOCIOCDLTransform
     PROPERTIES
@@ -115,22 +103,22 @@
     DEPENDS NukeOCIOCDLTransform
 )
 
-install(TARGETS NukeOCIOColorSpace
+install(TARGETS NukeOCIOColorSpace EXPORT OpenColorIO 
         DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/nuke${Nuke_API_VERSION})
 
-install(TARGETS NukeOCIODisplay
+install(TARGETS NukeOCIODisplay EXPORT OpenColorIO 
         DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/nuke${Nuke_API_VERSION})
 
-install(TARGETS NukeOCIOLogConvert
+install(TARGETS NukeOCIOLogConvert EXPORT OpenColorIO 
         DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/nuke${Nuke_API_VERSION})
 
-install(TARGETS NukeOCIOFileTransform
+install(TARGETS NukeOCIOFileTransform EXPORT OpenColorIO 
         DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/nuke${Nuke_API_VERSION})
 
-install(TARGETS NukeOCIOLookTransform
+install(TARGETS NukeOCIOLookTransform EXPORT OpenColorIO 
         DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/nuke${Nuke_API_VERSION})
 
-install(TARGETS NukeOCIOCDLTransform
+install(TARGETS NukeOCIOCDLTransform EXPORT OpenColorIO 
         DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/lib/nuke${Nuke_API_VERSION})
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/nuke
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Cocoa.mm opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Cocoa.mm
--- opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Cocoa.mm	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Cocoa.mm	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,173 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+
+#include "OpenColorIO_PS_Dialog.h"
+
+#import "OpenColorIO_PS_Dialog_Controller.h"
+
+#include <OpenColorIO/OpenColorIO.h>
+namespace OCIO = OCIO_NAMESPACE;
+
+#include "OpenColorIO_PS_Version.h"
+
+// ==========
+// Only building this on 64-bit (Cocoa) architectures
+// ==========
+#if __LP64__ || defined(COCOA_ON_32BIT)
+
+DialogResult OpenColorIO_PS_Dialog(DialogParams &params, const void *plugHndl, const void *mwnd)
+{
+    DialogResult result = RESULT_OK;
+    
+    NSApplicationLoad();
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    
+    
+    NSString *bundle_id = [NSString stringWithUTF8String:(const char *)plugHndl];
+
+    Class ui_controller_class = [[NSBundle bundleWithIdentifier:bundle_id]
+                                    classNamed:@"OpenColorIO_PS_Dialog_Controller"];
+
+    if(ui_controller_class)
+    {
+        ControllerSource source = (params.source == SOURCE_ENVIRONMENT ? CSOURCE_ENVIRONMENT :
+                                     params.source == SOURCE_CUSTOM ? CSOURCE_CUSTOM:
+                                     CSOURCE_STANDARD);
+                                     
+        ControllerAction action = (params.action == ACTION_LUT ? CACTION_LUT :
+                                    params.action == ACTION_DISPLAY ? CACTION_DISPLAY :
+                                    CACTION_CONVERT);
+                                        
+        ControllerInterp interpolation = (params.interpolation == INTERPO_NEAREST ? CINTERP_NEAREST :
+                                            params.interpolation == INTERPO_LINEAR ? CINTERP_LINEAR :
+                                            params.interpolation == INTERPO_TETRAHEDRAL ? CINTERP_TETRAHEDRAL :
+                                            CINTERP_BEST);
+                                                
+        NSString *configuration = (params.config.empty() ? nil : [NSString stringWithUTF8String:params.config.c_str()]);
+        const BOOL invert = params.invert;
+        NSString *inputSpace = (params.inputSpace.empty() ? nil : [NSString stringWithUTF8String:params.inputSpace.c_str()]);
+        NSString *outputSpace = (params.outputSpace.empty() ? nil : [NSString stringWithUTF8String:params.outputSpace.c_str()]);
+        NSString *transform = (params.transform.empty() ? nil : [NSString stringWithUTF8String:params.transform.c_str()]);
+        NSString *device = (params.device.empty() ? nil : [NSString stringWithUTF8String:params.device.c_str()]);
+        
+        
+        OpenColorIO_PS_Dialog_Controller *controller = [[ui_controller_class alloc] initWithSource:source
+                                                                                    configuration:configuration
+                                                                                    action:action
+                                                                                    invert:invert
+                                                                                    interpolation:interpolation
+                                                                                    inputSpace:inputSpace
+                                                                                    outputSpace:outputSpace
+                                                                                    device:device
+                                                                                    transform:transform];
+        if(controller)
+        {
+            NSWindow *window = [controller window];
+        
+            const NSUInteger modalResult = [NSApp runModalForWindow:window];
+            
+            if(modalResult == NSRunStoppedResponse)
+            {
+                source = [controller source];
+                action = [controller action];
+                interpolation = [controller interpolation];
+                
+                params.source = (source == CSOURCE_ENVIRONMENT ? SOURCE_ENVIRONMENT :
+                                    source == CSOURCE_CUSTOM ? SOURCE_CUSTOM :
+                                    SOURCE_STANDARD);
+                
+                params.action = (action == CACTION_LUT ? ACTION_LUT :
+                                    action == CACTION_DISPLAY ? ACTION_DISPLAY :
+                                    ACTION_CONVERT);
+                                    
+                params.interpolation = (interpolation == CINTERP_NEAREST ? INTERPO_NEAREST :
+                                        interpolation == CINTERP_LINEAR ? INTERPO_LINEAR :
+                                        interpolation == CINTERP_TETRAHEDRAL ? INTERPO_TETRAHEDRAL :
+                                        INTERPO_BEST);
+                
+                if([controller configuration] != nil)
+                    params.config = [[controller configuration] UTF8String];
+                
+                params.invert = [controller invert];
+                
+                if([controller inputSpace] != nil)
+                    params.inputSpace = [[controller inputSpace] UTF8String];
+                    
+                if([controller outputSpace] != nil)
+                    params.outputSpace = [[controller outputSpace] UTF8String];
+                    
+                if([controller transform] != nil)
+                    params.transform = [[controller transform] UTF8String];
+                    
+                if([controller device] != nil)
+                    params.device = [[controller device] UTF8String];
+            
+                result = RESULT_OK;
+            }
+            else
+                result = RESULT_CANCEL;
+            
+            [window close];
+            
+            [controller release];
+        }
+    }
+    
+    
+    [pool release];
+    
+    return  result;
+}
+
+
+void OpenColorIO_PS_About(const void *plugHndl, const void *mwnd)
+{
+    NSApplicationLoad();
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+    const std::string endl = "\n";
+
+    std::string text = std::string("OpenColorIO PS") + endl +
+                        OpenColorIO_PS_Beta_String + endl +
+                        __DATE__ + endl +
+                        endl +
+                        "OCIO version " + OCIO::GetVersion();
+                        
+    NSString *informativeText = [NSString stringWithUTF8String:text.c_str()];
+                        
+    NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", informativeText];
+    
+    [alert setAlertStyle:NSInformationalAlertStyle];
+    
+    [alert runModal];
+    
+    [pool release];
+}
+
+#endif // __LP64__
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.h opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,123 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#import <Cocoa/Cocoa.h>
+
+typedef enum ControllerSource
+{
+    CSOURCE_ENVIRONMENT,
+    CSOURCE_STANDARD,
+    CSOURCE_CUSTOM
+};
+
+typedef enum ControllerAction
+{
+    CACTION_LUT,
+    CACTION_CONVERT,
+    CACTION_DISPLAY
+};
+
+typedef enum ControllerInterp
+{
+    CINTERP_NEAREST,
+    CINTERP_LINEAR,
+    CINTERP_TETRAHEDRAL,
+    CINTERP_BEST
+};
+ 
+
+@class OpenColorIO_AE_MonitorProfileChooser_Controller;
+
+@interface OpenColorIO_PS_Dialog_Controller : NSObject
+{
+    IBOutlet NSPopUpButton *configurationMenu;
+    IBOutlet NSMatrix *actionRadios;
+    IBOutlet NSTextField *label1;
+    IBOutlet NSTextField *label2;
+    IBOutlet NSTextField *label3;
+    IBOutlet NSPopUpButton *menu1;
+    IBOutlet NSPopUpButton *menu2;
+    IBOutlet NSPopUpButton *menu3;
+    IBOutlet NSButton *invertCheck;
+    IBOutlet NSButton *inputSpaceButton;
+    IBOutlet NSButton *outputSpaceButton;
+    
+    IBOutlet NSWindow *window;
+    
+    void *contextPtr;
+    
+    ControllerSource source;
+    NSString *configuration;
+    NSString *customPath;
+    ControllerAction action;
+    NSString *inputSpace;
+    NSString *outputSpace;
+    NSString *device;
+    NSString *transform;
+    
+    ControllerInterp interpolation;
+    BOOL invert;
+}
+
+- (id)initWithSource:(ControllerSource)source
+        configuration:(NSString *)configuration
+        action:(ControllerAction)action
+        invert:(BOOL)invert
+        interpolation:(ControllerInterp)interpolation
+        inputSpace:(NSString *)inputSpace
+        outputSpace:(NSString *)outputSpace
+        device:(NSString *)device
+        transform:(NSString *)transform;
+        
+- (IBAction)clickedOK:(id)sender;
+- (IBAction)clickedCancel:(id)sender;
+- (IBAction)clickedExport:(id)sender;
+
+- (IBAction)trackConfigMenu:(id)sender;
+- (IBAction)trackActionRadios:(id)sender;
+- (IBAction)trackMenu1:(id)sender;
+- (IBAction)trackMenu2:(id)sender;
+- (IBAction)trackMenu3:(id)sender;
+- (IBAction)trackInvert:(id)sender;
+
+- (IBAction)popInputSpaceMenu:(id)sender;
+- (IBAction)popOutputSpaceMenu:(id)sender;
+
+- (NSWindow *)window;
+
+- (ControllerSource)source;
+- (NSString *)configuration;
+- (ControllerAction)action;
+- (BOOL)invert;
+- (ControllerInterp)interpolation;
+- (NSString *)inputSpace;
+- (NSString *)outputSpace;
+- (NSString *)device;
+- (NSString *)transform;
+
+@end
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.mm opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.mm
--- opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.mm	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog_Controller.mm	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,1124 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#import "OpenColorIO_PS_Dialog_Controller.h"
+
+#import "OpenColorIO_AE_MonitorProfileChooser_Controller.h"
+
+#include <fstream>
+#include <map>
+#include <cstdlib>
+
+#include "OpenColorIO_PS_Context.h"
+
+#include "OpenColorIO_AE_Dialogs.h"
+
+#include "ocioicc.h"
+
+
+
+static NSString *standardPath = @"/Library/Application Support/OpenColorIO";
+
+
+@implementation OpenColorIO_PS_Dialog_Controller
+
+- (NSString *)pathForStandardConfig:(NSString *)config
+{
+    return [[standardPath stringByAppendingPathComponent:config] stringByAppendingPathComponent:@"config.ocio"];
+}
+
+- (id)initWithSource:(ControllerSource)initSource
+        configuration:(NSString *)initConfiguration
+        action:(ControllerAction)initAction
+        invert:(BOOL)initInvert
+        interpolation:(ControllerInterp)initInterpolation
+        inputSpace:(NSString *)initInputSpace
+        outputSpace:(NSString *)initOutputSpace
+        device:(NSString *)initDevice
+        transform:(NSString *)initTransform
+{
+    self = [super init];
+    
+    if(self)
+    {
+        if(!([NSBundle loadNibNamed:@"OpenColorIO_PS_Dialog" owner:self]))
+            return nil;
+        
+        source = initSource;
+        
+        if(source == CSOURCE_CUSTOM)
+        {
+            customPath = [initConfiguration retain];
+        }
+        else if(source == CSOURCE_STANDARD)
+        {
+            configuration = [initConfiguration retain];
+        }
+        
+        action = initAction;
+        inputSpace = [initInputSpace retain];
+        outputSpace = [initOutputSpace retain];
+        device = [initDevice retain];
+        transform = [initTransform retain];
+        interpolation = initInterpolation;
+        invert = initInvert;
+        
+        
+        // configuration menu
+        [configurationMenu removeAllItems];
+        
+        [configurationMenu setAutoenablesItems:NO];
+        
+        [configurationMenu addItemWithTitle:@"$OCIO"];
+        
+        [[configurationMenu lastItem] setTag:CSOURCE_ENVIRONMENT];
+        
+        char *envFile = std::getenv("OCIO");
+        
+        if(envFile == NULL || strlen(envFile) == 0)
+            [[configurationMenu lastItem] setEnabled:FALSE];
+        
+        
+        [[configurationMenu menu] addItem:[NSMenuItem separatorItem]];
+        
+        
+        NSArray *standardConfigs = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:standardPath error:NULL];
+        
+        if([standardConfigs count] > 0)
+        {
+            for(NSString *configName in standardConfigs)
+            {
+                NSAssert([configName isKindOfClass:[NSString class]], @"expected NSString");
+                
+                NSString *configFilePath = [self pathForStandardConfig:configName];
+                
+                if([[NSFileManager defaultManager] isReadableFileAtPath:configFilePath])
+                {
+                    [configurationMenu addItemWithTitle:configName];
+                    
+                    [[configurationMenu lastItem] setTag:CSOURCE_STANDARD];
+                }
+            }
+        }
+        else
+        {
+            NSString *noConfigsMessage = [NSString stringWithFormat:@"No configs in %@", standardPath];
+            
+            [configurationMenu addItemWithTitle:noConfigsMessage];
+            
+            [[configurationMenu lastItem] setTag:CSOURCE_STANDARD];
+            [[configurationMenu lastItem] setEnabled:FALSE];
+        }
+
+        
+        [[configurationMenu menu] addItem:[NSMenuItem separatorItem]];
+        
+        
+        [configurationMenu addItemWithTitle:@"Custom…"];
+        
+        [[configurationMenu lastItem] setTag:CSOURCE_CUSTOM];
+        
+        
+        [invertCheck setHidden:YES];
+        
+        [menu1 removeAllItems];
+        [menu2 removeAllItems];
+        [menu3 removeAllItems];
+        
+        [label3 setHidden:YES];
+        [menu3 setHidden:YES];
+        
+        
+        [self trackConfigMenu:nil];
+    }
+    
+    return self;
+}
+
+- (void)dealloc
+{
+    OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+    
+    delete context;
+    
+    [configuration release];
+    [customPath release];
+    [inputSpace release];
+    [outputSpace release];
+    [device release];
+    [transform release];
+    
+    [super dealloc];
+}
+        
+- (IBAction)clickedOK:(id)sender
+{
+    [NSApp stopModal];
+}
+
+- (IBAction)clickedCancel:(id)sender
+{
+    [NSApp abortModal];
+}
+
+/*
+- (void)profileChooserDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    NSAssert(profileController != nil, @"profileController is nil");
+    
+    
+    [sheet orderOut:self];
+    
+
+    if(returnCode == NSRunStoppedResponse)
+    {
+        NSString *path = (NSString *)contextInfo;
+        
+        NSAssert([path isKindOfClass:[NSString class]], @"expected NSString");
+
+        try
+        {
+            OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+        
+            NSAssert(context != NULL, @"context was NULL");
+            
+            
+            char display_icc_path[256];
+        
+            const BOOL gotICC = [profileController getMonitorProfile:display_icc_path bufferSize:255];
+            
+            if(!gotICC)
+                throw OCIO::Exception("Failed to get ICC profile");
+
+            
+            OCIO::ConstProcessorRcPtr processor;
+            
+            if(action == CACTION_CONVERT)
+            {
+                processor = context->getConvertProcessor([inputSpace UTF8String], [outputSpace UTF8String]);
+            }
+            else if(action == CACTION_DISPLAY)
+            {
+                processor = context->getDisplayProcessor([inputSpace UTF8String], [device UTF8String], [transform UTF8String]);
+            }
+            else
+            {
+                NSAssert(action == CACTION_LUT, @"expected CACTION_LUT");
+                
+                const OCIO::Interpolation interp = (interpolation == CINTERP_NEAREST ? OCIO::INTERP_NEAREST :
+                                                    interpolation == CINTERP_LINEAR ? OCIO::INTERP_LINEAR :
+                                                    interpolation == CINTERP_TETRAHEDRAL ? OCIO::INTERP_TETRAHEDRAL :
+                                                    OCIO::INTERP_BEST);
+                
+                const OCIO::TransformDirection direction = (invert ? OCIO::TRANSFORM_DIR_INVERSE : OCIO::TRANSFORM_DIR_FORWARD);
+                
+                processor = context->getLUTProcessor(interp, direction);
+            }
+            
+            
+            int cubesize = 32;
+            int whitepointtemp = 6505;
+            std::string copyright = "OpenColorIO, Sony Imageworks";
+            
+            // create a description tag from the filename
+            std::string description = [[[path lastPathComponent] stringByDeletingPathExtension] UTF8String];
+            
+            SaveICCProfileToFile([path UTF8String], processor, cubesize, whitepointtemp,
+                                    display_icc_path, description, copyright, false);
+        }
+        catch(const std::exception &e)
+        {
+            NSBeep();
+        
+            NSString *ocioString = [NSString stringWithUTF8String:e.what()];
+        
+            NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+            [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+        }
+        catch(...)
+        {
+            NSBeep();
+            
+            NSString *ocioString = @"Some unknown error";
+            
+            NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+            [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+        }
+        
+        [path release];
+    }
+    
+    
+    [profileController release];
+    
+    profileController = nil;
+}
+*/
+- (void)exportPanelDidEnd:(NSSavePanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    if(returnCode == NSOKButton)
+    {
+        OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+    
+        NSAssert(context != NULL, @"context was NULL");
+
+    
+        NSString *path = [[panel URL] path];
+        
+        NSString *extension = [path pathExtension];
+        
+        if([extension isEqualToString:@"icc"])
+        {
+            OpenColorIO_AE_MonitorProfileChooser_Controller *profileController = [[OpenColorIO_AE_MonitorProfileChooser_Controller alloc] init];
+            
+            // the sheet is still active, so can't run another one...will settle for modal
+            const NSInteger modal_result = [NSApp runModalForWindow:[profileController getWindow]];
+            
+                                    
+            if(modal_result == NSRunStoppedResponse)
+            {
+                try
+                {
+                    char display_icc_path[256];
+                
+                    const BOOL gotICC = [profileController getMonitorProfile:display_icc_path bufferSize:255];
+                    
+                    if(!gotICC)
+                        throw OCIO::Exception("Failed to get ICC profile");
+
+                    
+                    OCIO::ConstProcessorRcPtr processor;
+                    
+                    if(action == CACTION_CONVERT)
+                    {
+                        processor = context->getConvertProcessor([inputSpace UTF8String], [outputSpace UTF8String]);
+                    }
+                    else if(action == CACTION_DISPLAY)
+                    {
+                        processor = context->getDisplayProcessor([inputSpace UTF8String], [device UTF8String], [transform UTF8String]);
+                    }
+                    else
+                    {
+                        NSAssert(action == CACTION_LUT, @"expected CACTION_LUT");
+                        
+                        const OCIO::Interpolation interp = (interpolation == CINTERP_NEAREST ? OCIO::INTERP_NEAREST :
+                                                            interpolation == CINTERP_LINEAR ? OCIO::INTERP_LINEAR :
+                                                            interpolation == CINTERP_TETRAHEDRAL ? OCIO::INTERP_TETRAHEDRAL :
+                                                            OCIO::INTERP_BEST);
+                        
+                        const OCIO::TransformDirection direction = (invert ? OCIO::TRANSFORM_DIR_INVERSE : OCIO::TRANSFORM_DIR_FORWARD);
+                        
+                        processor = context->getLUTProcessor(interp, direction);
+                    }
+                    
+                    
+                    int cubesize = 32;
+                    int whitepointtemp = 6505;
+                    std::string copyright = "OpenColorIO, Sony Imageworks";
+                    
+                    // create a description tag from the filename
+                    std::string description = [[[path lastPathComponent] stringByDeletingPathExtension] UTF8String];
+                    
+                    SaveICCProfileToFile([path UTF8String], processor, cubesize, whitepointtemp,
+                                            display_icc_path, description, copyright, false);
+                }
+                catch(const std::exception &e)
+                {
+                    NSBeep();
+                
+                    NSString *ocioString = [NSString stringWithUTF8String:e.what()];
+                
+                    NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+                    [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+                }
+                catch(...)
+                {
+                    NSBeep();
+                    
+                    NSString *ocioString = @"Some unknown error";
+                    
+                    NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+                    [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+                }
+            }
+            
+            [[profileController getWindow] close];
+            
+            [profileController release];
+        }
+        else
+        {
+            try
+            {
+                // need an extension->format map
+                std::map<std::string, std::string> extensions;
+                
+                for(int i=0; i < OCIO::Baker::getNumFormats(); ++i)
+                {
+                    const char *extension = OCIO::Baker::getFormatExtensionByIndex(i);
+                    const char *format = OCIO::Baker::getFormatNameByIndex(i);
+                    
+                    extensions[ extension ] = format;
+                }
+                
+                const std::string the_extension = [extension UTF8String];
+                
+                std::string format = extensions[ the_extension ];
+                
+                
+                OCIO::BakerRcPtr baker;
+                
+                if(action == CACTION_CONVERT)
+                {
+                    baker = context->getConvertBaker([inputSpace UTF8String], [outputSpace UTF8String]);
+                }
+                else if(action == CACTION_DISPLAY)
+                {
+                    baker = context->getDisplayBaker([inputSpace UTF8String], [device UTF8String], [transform UTF8String]);
+                }
+                else
+                {
+                    NSAssert(action == CACTION_LUT, @"expected CACTION_LUT");
+                    
+                    const OCIO::Interpolation interp = (interpolation == CINTERP_NEAREST ? OCIO::INTERP_NEAREST :
+                                                        interpolation == CINTERP_LINEAR ? OCIO::INTERP_LINEAR :
+                                                        interpolation == CINTERP_TETRAHEDRAL ? OCIO::INTERP_TETRAHEDRAL :
+                                                        OCIO::INTERP_BEST);
+                    
+                    const OCIO::TransformDirection direction = (invert ? OCIO::TRANSFORM_DIR_INVERSE : OCIO::TRANSFORM_DIR_FORWARD);
+                    
+                    baker = context->getLUTBaker(interp, direction);
+                }
+                
+                baker->setFormat( format.c_str() );
+                
+                std::ofstream f([path UTF8String]);
+                baker->bake(f);
+            }
+            catch(const std::exception &e)
+            {
+                NSBeep();
+            
+                NSString *ocioString = [NSString stringWithUTF8String:e.what()];
+            
+                NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+                [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+            }
+            catch(...)
+            {
+                NSBeep();
+                
+                NSString *ocioString = @"Some unknown error";
+                
+                NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+                [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+            }
+        }
+    }
+}
+
+- (IBAction)clickedExport:(id)sender
+{
+    NSSavePanel *panel = [NSSavePanel savePanel];
+    
+    NSMutableString *message = [NSMutableString stringWithString:@"Formats: ICC Profile (.icc)"];
+    
+    NSMutableArray *extensionArray = [NSMutableArray arrayWithObject:@"icc"];
+    
+    for(int i=0; i < OCIO::Baker::getNumFormats(); ++i)
+    {
+        const char *extension = OCIO::Baker::getFormatExtensionByIndex(i);
+        const char *format = OCIO::Baker::getFormatNameByIndex(i);
+        
+        [extensionArray addObject:[NSString stringWithUTF8String:extension]];
+        
+        [message appendFormat:@", %s (.%s)", format, extension];
+    }
+    
+    [panel setAllowedFileTypes:extensionArray];
+    [panel setMessage:message];
+    
+    [panel beginSheetForDirectory:nil
+        file:nil
+        modalForWindow:window
+        modalDelegate:self
+        didEndSelector:@selector(exportPanelDidEnd:returnCode:contextInfo:)
+        contextInfo:NULL];
+}
+
+- (void)openPanelDidEnd:(NSOpenPanel *)panel returnCode:(int)returnCode contextInfo:(void *)contextInfo
+{
+    if(returnCode == NSOKButton)
+    {
+        source = CSOURCE_CUSTOM;
+    
+        NSURL *url = [panel URL];
+        
+        [customPath release];
+        
+        customPath = [[url path] retain];
+    }
+        
+    [self trackConfigMenu:nil];
+}
+
+- (IBAction)trackConfigMenu:(id)sender
+{
+    const ControllerSource previousSource = source;
+
+    if(sender == nil)
+    {
+        // set menu from values
+        if(source == CSOURCE_STANDARD)
+        {
+            [configurationMenu selectItemWithTitle:configuration];
+        }
+        else
+        {
+            [configurationMenu selectItemWithTag:source];
+        }
+    }
+    else
+    {
+        // set value from menu
+        source = (ControllerSource)[[configurationMenu selectedItem] tag];
+    }
+
+
+    NSString *configPath = nil;
+    
+    if(source == CSOURCE_ENVIRONMENT)
+    {
+        char *envFile = std::getenv("OCIO");
+        
+        if(envFile != NULL && strlen(envFile) > 0)
+        {
+            configPath = [NSString stringWithUTF8String:envFile];
+        }
+    }
+    else if(source == CSOURCE_CUSTOM)
+    {
+        if(sender != nil)
+        {
+            source = previousSource; // we'll re-set to the previous source in case dialog is canceled
+        
+            // do file open dialog
+            NSOpenPanel *panel = [NSOpenPanel openPanel];
+            
+            [panel setCanChooseDirectories:NO];
+            [panel setAllowsMultipleSelection:NO];
+            
+            NSMutableArray *extensions = [NSMutableArray arrayWithObject:@"ocio"];
+            
+            for(int i=0; i < OCIO::FileTransform::getNumFormats(); ++i)
+            {
+                const char *extension = OCIO::FileTransform::getFormatExtensionByIndex(i);
+                //const char *format = OCIO::FileTransform::getFormatNameByIndex(i);
+                
+                NSString *extensionString = [NSString stringWithUTF8String:extension];
+                
+                if(![extensionString isEqualToString:@"ccc"]) // .ccc files require an ID parameter
+                    [extensions addObject:[NSString stringWithUTF8String:extension]];
+            }
+            
+            
+            NSMutableString *message = [NSMutableString stringWithString:@"Formats: "];
+            
+            for(int i=0; i < [extensions count]; i++)
+            {
+                NSString *extension = [extensions objectAtIndex:i];
+                
+                if(i != 0)
+                    [message appendString:@", "];
+                
+                [message appendString:@"."];
+                [message appendString:extension];
+            }
+            
+            [panel setMessage:message];
+            [panel setAllowedFileTypes:extensions];
+            
+            [panel beginSheetForDirectory:nil
+                    file:nil
+                    modalForWindow:window
+                    modalDelegate:self
+                    didEndSelector:@selector(openPanelDidEnd:returnCode:contextInfo:)
+                    contextInfo:NULL];
+            
+            return;
+        }
+        else
+        {
+            configPath = customPath;
+        }
+    }
+    else
+    {
+        NSAssert(source == CSOURCE_STANDARD, @"expected TAG_STANDARD");
+        
+        [configuration release];
+        
+        configuration = [[configurationMenu titleOfSelectedItem] retain];
+        
+        configPath = [self pathForStandardConfig:configuration];
+    }
+    
+    
+    if(configPath != nil && [[NSFileManager defaultManager] isReadableFileAtPath:configPath])
+    {
+        try
+        {
+            OpenColorIO_PS_Context *oldContext = (OpenColorIO_PS_Context *)contextPtr;
+            
+            delete oldContext;
+            
+        
+            OpenColorIO_PS_Context *context = new OpenColorIO_PS_Context([configPath UTF8String]);
+            
+            contextPtr = context;
+            
+            
+            if( context->isLUT() )
+            {
+                action = CACTION_LUT;
+                
+                [invertCheck setHidden:NO];
+                
+                if( context->canInvertLUT() )
+                {
+                    [invertCheck setEnabled:YES];
+                }
+                else
+                {
+                    [invertCheck setEnabled:NO];
+                
+                    invert = NO;
+                }
+                
+                [invertCheck setState:(invert ? NSOnState : NSOffState)];
+                
+                [actionRadios setHidden:YES];
+                
+                
+                NSTextField *interpolationLabel = label1;
+                NSPopUpButton *interpolationMenu = menu1;
+                
+                [interpolationLabel setStringValue:@"Interpolation"];
+                
+                // interpolation menu
+                [interpolationMenu removeAllItems];
+                
+                [interpolationMenu addItemWithTitle:@"Nearest Neighbor"];
+                [[interpolationMenu lastItem] setTag:CINTERP_NEAREST];
+                
+                [interpolationMenu addItemWithTitle:@"Linear"];
+                [[interpolationMenu lastItem] setTag:CINTERP_LINEAR];
+                
+                [interpolationMenu addItemWithTitle:@"Tetrahedral"];
+                [[interpolationMenu lastItem] setTag:CINTERP_TETRAHEDRAL];
+                
+                const bool canTetrahedral = !context->canInvertLUT();
+                
+                if(!canTetrahedral)
+                {
+                    [interpolationMenu setAutoenablesItems:NO];
+                
+                    [[interpolationMenu lastItem] setEnabled:NO];
+                    
+                    if(interpolation == CINTERP_TETRAHEDRAL)
+                        interpolation = CINTERP_LINEAR;
+                }
+                
+                [[interpolationMenu menu] addItem:[NSMenuItem separatorItem]];
+                
+                [interpolationMenu addItemWithTitle:@"Best"];
+                [[interpolationMenu lastItem] setTag:CINTERP_BEST];
+                
+                [interpolationMenu selectItemWithTag:interpolation];
+                
+                [inputSpaceButton setHidden:YES];
+                
+                [label2 setHidden:YES];
+                [menu2 setHidden:YES];
+                [outputSpaceButton setHidden:YES];
+                
+                [label3 setHidden:YES];
+                [menu3 setHidden:YES];
+            }
+            else
+            {
+                [invertCheck setHidden:YES];
+            
+                if(action == CACTION_LUT)
+                {
+                    action = CACTION_CONVERT;
+                }
+                
+                [actionRadios setHidden:NO];
+                                
+                
+                const SpaceVec &colorSpaces = context->getColorSpaces();
+                
+                if(inputSpace == nil || -1 == FindSpace(colorSpaces, [inputSpace UTF8String]))
+                {
+                    [inputSpace release];
+                    
+                    inputSpace = [[NSString alloc] initWithUTF8String:context->getDefaultColorSpace().c_str()];
+                }
+                
+                if(outputSpace == nil || -1 == FindSpace(colorSpaces, [outputSpace UTF8String]))
+                {
+                    [outputSpace release];
+                    
+                    outputSpace = [[NSString alloc] initWithUTF8String:context->getDefaultColorSpace().c_str()];
+                }
+                
+                
+                const SpaceVec &devices = context->getDevices();
+                
+                if(device == nil || -1 == FindSpace(devices, [device UTF8String]))
+                {
+                    [device release];
+                    
+                    device = [[NSString alloc] initWithUTF8String:context->getDefaultDevice().c_str()];
+                }
+                
+                
+                const SpaceVec transforms = context->getTransforms([device UTF8String]);
+                
+                if(transform == nil || -1 == FindSpace(transforms, [transform UTF8String]))
+                {
+                    [transform release];
+                    
+                    transform = [[NSString alloc] initWithUTF8String:context->getDefaultTransform([device UTF8String]).c_str()];
+                }
+                
+                
+                [self trackActionRadios:nil];
+            }
+        }
+        catch(const std::exception &e)
+        {
+            NSBeep();
+        
+            NSString *ocioString = [NSString stringWithUTF8String:e.what()];
+        
+            NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+            [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+
+            if(source != CSOURCE_ENVIRONMENT)
+            {
+                source = CSOURCE_ENVIRONMENT;
+                
+                [self trackConfigMenu:nil];
+            }
+        }
+        catch(...)
+        {
+            NSBeep();
+            
+            NSString *ocioString = @"Some unknown error";
+        
+            NSAlert *alert = [NSAlert alertWithMessageText:@"OpenColorIO error" defaultButton:nil alternateButton:nil otherButton:nil informativeTextWithFormat:@"%@", ocioString];
+
+            [alert beginSheetModalForWindow:window modalDelegate:nil didEndSelector:NULL contextInfo:NULL];
+
+            if(source != CSOURCE_ENVIRONMENT)
+            {
+                source = CSOURCE_ENVIRONMENT;
+                
+                [self trackConfigMenu:nil];
+            }
+        }
+    }
+            
+    [configurationMenu setToolTip:configPath];
+}
+
+- (IBAction)trackActionRadios:(id)sender;
+{
+    if(sender == nil)
+    {
+        // set radios from values
+        NSAssert(action != CACTION_LUT, @"should not be a LUT");
+        
+        const NSUInteger selectedColumn = (action == CACTION_DISPLAY ? 1 : 0);
+        
+        [actionRadios selectCellAtRow:0 column:selectedColumn];
+    }
+    else
+    {
+        // set values from radios
+        action = ([actionRadios selectedColumn] == 1 ? CACTION_DISPLAY : CACTION_CONVERT);
+    }
+    
+    
+    OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+    
+    NSAssert(context != NULL, @"context was NULL");
+    
+    
+    NSTextField *inputLabel = label1;
+    NSPopUpButton *inputMenu = menu1;
+    
+    [inputLabel setStringValue:@"Input Space:"];
+    
+    [inputMenu removeAllItems];
+    
+    const SpaceVec &colorSpaces = context->getColorSpaces();
+    
+    for(SpaceVec::const_iterator i = colorSpaces.begin(); i != colorSpaces.end(); ++i)
+    {
+        NSString *colorSpace = [NSString stringWithUTF8String:i->c_str()];
+        
+        [inputMenu addItemWithTitle:colorSpace];
+    }
+    
+    NSAssert([inputMenu itemWithTitle:inputSpace] != nil, @"don't have the input space");
+    
+    [inputMenu selectItemWithTitle:inputSpace];
+    
+    [inputSpaceButton setHidden:NO];
+    
+    
+    if(action == CACTION_DISPLAY)
+    {
+        NSTextField *deviceLabel = label2;
+        NSPopUpButton *deviceMenu = menu2;
+        
+        NSTextField *transformLabel = label3;
+        NSPopUpButton *transformMenu = menu3;
+        
+    
+        [deviceLabel setStringValue:@"Device:"];
+        [deviceLabel setHidden:NO];
+        
+        [deviceMenu setHidden:NO];
+        
+        [deviceMenu removeAllItems];
+        
+        const SpaceVec &devices = context->getDevices();
+        
+        for(SpaceVec::const_iterator i = devices.begin(); i != devices.end(); ++i)
+        {
+            NSString *deviceName = [NSString stringWithUTF8String:i->c_str()];
+            
+            [deviceMenu addItemWithTitle:deviceName];
+        }
+        
+        [outputSpaceButton setHidden:YES];
+                
+        
+        [transformLabel setStringValue:@"Transform:"];
+        [transformLabel setHidden:NO];
+        
+        [transformMenu setHidden:NO];
+        
+        
+        [self trackMenu2:nil];
+    }
+    else
+    {
+        NSAssert(action == CACTION_CONVERT, @"expected Convert");
+        
+        NSTextField *outputLabel = label2;
+        NSPopUpButton *outputMenu = menu2;
+        
+        [outputLabel setHidden:NO];
+        [outputLabel setStringValue:@"Output Space:"];
+        
+        [outputMenu setHidden:NO];
+        
+        [outputMenu removeAllItems];
+        
+        for(SpaceVec::const_iterator i = colorSpaces.begin(); i != colorSpaces.end(); ++i)
+        {
+            NSString *colorSpace = [NSString stringWithUTF8String:i->c_str()];
+            
+            [outputMenu addItemWithTitle:colorSpace];
+        }
+        
+        NSAssert([outputMenu itemWithTitle:outputSpace] != nil, @"don't have the input space");
+        
+        [outputMenu selectItemWithTitle:outputSpace];
+        
+        [outputSpaceButton setHidden:NO];
+        
+        
+        NSTextField *transformLabel = label3;
+        NSPopUpButton *transformMenu = menu3;
+        
+        [transformLabel setHidden:YES];
+        [transformMenu setHidden:YES];
+        
+        NSAssert([[transformLabel stringValue] isEqualToString:@"Transform:"], @"expected Transform:");
+    }
+}
+
+- (IBAction)trackMenu1:(id)sender
+{
+    NSAssert(sender == menu1, @"always from the UI");
+    
+    if(action == CACTION_LUT)
+    {
+        interpolation = (ControllerInterp)[[menu1 selectedItem] tag];
+    }
+    else
+    {
+        [inputSpace release];
+        
+        inputSpace = [[menu1 titleOfSelectedItem] retain];
+    }
+}
+
+- (IBAction)trackMenu2:(id)sender
+{
+    if(action == CACTION_DISPLAY)
+    {
+        NSPopUpButton *deviceMenu = menu2;
+        
+        if(sender == nil)
+        {
+            // set menu from values
+            NSAssert([deviceMenu itemWithTitle:device] != nil, @"don't have the device");
+            
+            [deviceMenu selectItemWithTitle:device];
+        }
+        else
+        {
+            // set values from menu
+            [device release];
+            
+            device = [[deviceMenu titleOfSelectedItem] retain];
+        }
+    }
+    else
+    {
+        NSAssert(action == CACTION_CONVERT, @"expected Convert");
+        
+        NSPopUpButton *outputMenu = menu2;
+        
+        if(sender == nil)
+        {
+            // set menu from values
+            NSAssert([outputMenu itemWithTitle:outputSpace] != nil, @"don't have the device");
+            
+            [outputMenu selectItemWithTitle:outputSpace];
+        }
+        else
+        {
+            // set values from menu
+            [outputSpace release];
+            
+            outputSpace = [[outputMenu titleOfSelectedItem] retain];
+        }
+    }
+    
+    
+    if(action == CACTION_DISPLAY)
+    {
+        OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+        
+        NSAssert(context != NULL, @"context was NULL");
+        
+        const SpaceVec transforms = context->getTransforms([device UTF8String]);
+        
+        NSPopUpButton *transformMenu = menu3;
+        
+        [transformMenu removeAllItems];
+        
+        for(SpaceVec::const_iterator i = transforms.begin(); i != transforms.end(); ++i)
+        {
+            NSString *transformName = [NSString stringWithUTF8String:i->c_str()];
+            
+            [transformMenu addItemWithTitle:transformName];
+        }
+        
+        [self trackMenu3:nil];
+    }
+}
+
+- (IBAction)trackMenu3:(id)sender
+{
+    NSAssert(action == CACTION_DISPLAY, @"expected Display");
+    NSAssert([[label3 stringValue] isEqualToString:@"Transform:"], @"expected Transform:");
+    
+    NSPopUpButton *transformMenu = menu3;
+
+    if(sender == nil)
+    {
+        // set menu from value
+        NSMenuItem *valueItem = [transformMenu itemWithTitle:transform];
+        
+        if(valueItem != nil)
+        {
+            [transformMenu selectItem:valueItem];
+        }
+        else
+        {
+            OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+            
+            NSAssert(context != NULL, @"context was NULL");
+            
+            const std::string defaultTransform = context->getDefaultTransform([device UTF8String]);
+            
+            NSMenuItem *defaultItem = [transformMenu itemWithTitle:[NSString stringWithUTF8String:defaultTransform.c_str()]];
+            
+            NSAssert(defaultItem != nil, @"where's that default item?");
+            
+            [transformMenu selectItem:defaultItem];
+            
+            
+            [transform release];
+            
+            transform = [[transformMenu titleOfSelectedItem] retain];
+        }
+    }
+    else
+    {
+        // set value from menu
+        [transform release];
+        
+        transform = [[transformMenu titleOfSelectedItem] retain];
+    }
+}
+
+- (IBAction)trackInvert:(id)sender
+{
+    NSAssert(sender == invertCheck, @"expected invertCheck");
+    
+    invert = ([invertCheck state] == NSOnState);
+}
+
+- (IBAction)popInputSpaceMenu:(id)sender
+{
+    OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+    
+    if(context != NULL)
+    {
+        std::string colorSpace = [inputSpace UTF8String];
+    
+        const bool chosen = ColorSpacePopUpMenu(context->getConfig(), colorSpace, false, NULL);
+        
+        if(chosen)
+        {
+            [inputSpace release];
+        
+            inputSpace = [[NSString alloc] initWithUTF8String:colorSpace.c_str()];
+            
+            [menu1 selectItemWithTitle:inputSpace];
+        }
+    }
+}
+
+- (IBAction)popOutputSpaceMenu:(id)sender
+{
+    OpenColorIO_PS_Context *context = (OpenColorIO_PS_Context *)contextPtr;
+    
+    if(context != NULL)
+    {
+        std::string colorSpace = [outputSpace UTF8String];
+    
+        const bool chosen = ColorSpacePopUpMenu(context->getConfig(), colorSpace, false, NULL);
+        
+        if(chosen)
+        {
+            [outputSpace release];
+        
+            outputSpace = [[NSString alloc] initWithUTF8String:colorSpace.c_str()];
+            
+            [menu2 selectItemWithTitle:outputSpace];
+        }
+    }
+}
+
+- (NSWindow *)window
+{
+    return window;
+}
+
+- (ControllerSource)source
+{
+    return source;
+}
+
+- (NSString *)configuration
+{
+    if(source == CSOURCE_CUSTOM)
+    {
+        return customPath;
+    }
+    else
+    {
+        return configuration;
+    }
+}
+
+- (ControllerAction)action
+{
+    return action;
+}
+
+- (BOOL)invert
+{
+    return invert;
+}
+
+- (ControllerInterp)interpolation
+{
+    return interpolation;
+}
+
+- (NSString *)inputSpace
+{
+    return inputSpace;
+}
+
+- (NSString *)outputSpace
+{
+    return outputSpace;
+}
+
+- (NSString *)device
+{
+    return device;
+}
+
+- (NSString *)transform
+{
+    return transform;
+}
+
+@end
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog.xib opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog.xib
--- opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog.xib	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Dialog.xib	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,2005 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">10K549</string>
+		<string key="IBDocument.InterfaceBuilderVersion">851</string>
+		<string key="IBDocument.AppKitVersion">1038.36</string>
+		<string key="IBDocument.HIToolboxVersion">461.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">851</string>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="2"/>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys" id="0">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">OpenColorIO_PS_Dialog_Controller</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">1</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {500, 270}}</string>
+				<int key="NSWTFlags">544735232</int>
+				<string key="NSWindowTitle">OpenColorIO</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSPopUpButton" id="435395518">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{206, 226}, {171, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="208613219">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<object class="NSFont" key="NSSupport" id="726329126">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="435395518"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="843754245">
+									<reference key="NSMenu" ref="72498755"/>
+									<string key="NSTitle">Item 1</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<object class="NSCustomResource" key="NSOnImage" id="685563779">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuCheckmark</string>
+									</object>
+									<object class="NSCustomResource" key="NSMixedImage" id="459059485">
+										<string key="NSClassName">NSImage</string>
+										<string key="NSResourceName">NSMenuMixedState</string>
+									</object>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="208613219"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="72498755">
+									<string key="NSTitle">OtherViews</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="843754245"/>
+										<object class="NSMenuItem" id="884510374">
+											<reference key="NSMenu" ref="72498755"/>
+											<string key="NSTitle">Item 2</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="208613219"/>
+										</object>
+										<object class="NSMenuItem" id="545806459">
+											<reference key="NSMenu" ref="72498755"/>
+											<string key="NSTitle">Item 3</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="208613219"/>
+										</object>
+									</object>
+									<reference key="NSMenuFont" ref="726329126"/>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="898404895">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{109, 232}, {95, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="447253083">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">71304192</int>
+								<string key="NSContents">Configuration:</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="898404895"/>
+								<object class="NSColor" key="NSBackgroundColor" id="1048089651">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="862547301">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSMatrix" id="883400788">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{134, 192}, {216, 18}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<int key="NSNumRows">1</int>
+							<int key="NSNumCols">2</int>
+							<object class="NSMutableArray" key="NSCells">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSButtonCell" id="709071323">
+									<int key="NSCellFlags">-2080244224</int>
+									<int key="NSCellFlags2">0</int>
+									<string key="NSContents">Convert</string>
+									<reference key="NSSupport" ref="726329126"/>
+									<reference key="NSControlView" ref="883400788"/>
+									<int key="NSTag">1</int>
+									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags2">0</int>
+									<object class="NSButtonImageSource" key="NSAlternateImage" id="835495372">
+										<string key="NSImageName">NSRadioButton</string>
+									</object>
+									<string key="NSAlternateContents"/>
+									<string key="NSKeyEquivalent"/>
+									<int key="NSPeriodicDelay">200</int>
+									<int key="NSPeriodicInterval">25</int>
+								</object>
+								<object class="NSButtonCell" id="329142917">
+									<int key="NSCellFlags">67239424</int>
+									<int key="NSCellFlags2">0</int>
+									<string key="NSContents">Display</string>
+									<reference key="NSSupport" ref="726329126"/>
+									<reference key="NSControlView" ref="883400788"/>
+									<int key="NSButtonFlags">1211912703</int>
+									<int key="NSButtonFlags2">0</int>
+									<reference key="NSAlternateImage" ref="835495372"/>
+									<int key="NSPeriodicDelay">400</int>
+									<int key="NSPeriodicInterval">75</int>
+								</object>
+							</object>
+							<string key="NSCellSize">{106, 18}</string>
+							<string key="NSIntercellSpacing">{4, 2}</string>
+							<int key="NSMatrixFlags">1151868928</int>
+							<string key="NSCellClass">NSActionCell</string>
+							<object class="NSButtonCell" key="NSProtoCell" id="1062336480">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Radio</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">0</int>
+								<object class="NSImage" key="NSNormalImage">
+									<int key="NSImageFlags">549453824</int>
+									<string key="NSSize">{18, 18}</string>
+									<object class="NSMutableArray" key="NSReps">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSArray">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<integer value="0"/>
+											<object class="NSBitmapImageRep">
+												<object class="NSData" key="NSTIFFRepresentation">
+													<bytes key="NS.bytes">TU0AKgAABRgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAMAAAADAAAAAwAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAADwRERGLJycnySsrK/A1NTXw
+IyMjyRwcHIsJCQk8AAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFFRUVdVBQUOCoqKj/
+29vb//n5+f/6+vr/2tra/6qqqv9UVFTgHx8fdQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUZGRl5
+dXV198PDw//8/Pz////////////////////////////U1NT/fHx89yUlJXkAAAAFAAAAAAAAAAAAAAAA
+AAAAAxEREUZqamrmtbW1/+3t7f/+/v7//v7+//7+/v/9/f3//f39//39/f/39/f/xMTE/3d3d+YZGRlG
+AAAAAwAAAAAAAAAAAAAACkJCQqGtra3/xsbG/+vr6//y8vL/9fX1//X19f/z8/P/9fX1//Ly8v/u7u7/
+0tLS/6+vr/9KSkqhAAAACgAAAAAAAAAAAAAAF3h4eN2/v7//z8/P/93d3f/q6ur/7+/v/+/v7//w8PD/
+7e3t/+3t7f/i4uL/zs7O/8XFxf98fHzdAAAAFwAAAAAAAAADAAAAJKSkpPjOzs7/2dnZ/+Dg4P/i4uL/
+5eXl/+bm5v/n5+f/5eXl/+Li4v/e3t7/2tra/9DQ0P+srKz4AAAAJAAAAAMAAAADAAAALrCwsPrW1tb/
+3t7e/+Tk5P/p6en/6+vr/+zs7P/p6en/6+vr/+fn5//k5OT/4ODg/9nZ2f+zs7P6AAAALgAAAAMAAAAD
+AAAALp2dnezg4OD/5eXl/+rq6v/u7u7/8PDw//Dw8P/x8fH/8PDw/+7u7v/q6ur/5ubm/+Hh4f+ZmZns
+AAAALgAAAAMAAAADAAAAJG5ubs/l5eX/6enp/+/v7//y8vL/9vb2//r6+v/5+fn/9/f3//b29v/x8fH/
+6+vr/+Tk5P9ra2vPAAAAJAAAAAMAAAAAAAAAFy4uLpPCwsL67Ozs//Pz8//5+fn//v7+//7+/v/+/v7/
+/v7+//v7+//19fX/8PDw/8LCwvosLCyTAAAAFwAAAAAAAAAAAAAACgAAAENfX1/S5OTk/vn5+f/+/v7/
+///////////////////////////8/Pz/5ubm/l9fX9IAAABDAAAACgAAAAAAAAAAAAAAAwAAABcAAABl
+YmJi3NLS0v3////////////////////////////////V1dX9ZGRk3AAAAGUAAAAXAAAAAwAAAAAAAAAA
+AAAAAAAAAAUAAAAfAAAAZTMzM8KAgIDwv7+//O3t7f/t7e3/v7+//ICAgPAzMzPCAAAAZQAAAB8AAAAF
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFAAAAFwAAAEMAAAB3AAAAnwAAALMAAACzAAAAnwAAAHcAAABD
+AAAAFwAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAoAAAAXAAAAJAAAAC4AAAAu
+AAAAJAAAABcAAAAKAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAwAAAAMAAAADAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQEAAAMAAAABABIAAAEB
+AAMAAAABABIAAAECAAMAAAAEAAAFugEDAAMAAAABAAEAAAEGAAMAAAABAAIAAAERAAQAAAABAAAACAES
+AAMAAAABAAEAAAEVAAMAAAABAAQAAAEWAAMAAAABABIAAAEXAAQAAAABAAAFEAEcAAMAAAABAAEAAAFS
+AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
+												</object>
+											</object>
+										</object>
+									</object>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MCAwAA</bytes>
+									</object>
+								</object>
+								<reference key="NSAlternateImage" ref="835495372"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
+							<reference key="NSSelectedCell" ref="709071323"/>
+							<reference key="NSBackgroundColor" ref="1048089651"/>
+							<object class="NSColor" key="NSCellBackgroundColor">
+								<int key="NSColorSpace">3</int>
+								<bytes key="NSWhite">MQA</bytes>
+							</object>
+							<reference key="NSFont" ref="726329126"/>
+						</object>
+						<object class="NSPopUpButton" id="693681809">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{206, 146}, {171, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="177827106">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="693681809"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="857078283">
+									<reference key="NSMenu" ref="672106160"/>
+									<string key="NSTitle">Item 1</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<reference key="NSOnImage" ref="685563779"/>
+									<reference key="NSMixedImage" ref="459059485"/>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="177827106"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="672106160">
+									<string key="NSTitle">OtherViews</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="857078283"/>
+										<object class="NSMenuItem" id="201552110">
+											<reference key="NSMenu" ref="672106160"/>
+											<string key="NSTitle">Item 2</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="177827106"/>
+										</object>
+										<object class="NSMenuItem" id="88039586">
+											<reference key="NSMenu" ref="672106160"/>
+											<string key="NSTitle">Item 3</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="177827106"/>
+										</object>
+									</object>
+									<reference key="NSMenuFont" ref="726329126"/>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="576480890">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{109, 152}, {95, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="1023732974">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">71304192</int>
+								<string key="NSContents">Input Space:</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="576480890"/>
+								<reference key="NSBackgroundColor" ref="1048089651"/>
+								<reference key="NSTextColor" ref="862547301"/>
+							</object>
+						</object>
+						<object class="NSButton" id="46121423">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{383, 12}, {103, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="547623783">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">OK</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="46121423"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="977011690">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{280, 12}, {103, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="1025093094">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="977011690"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="925868472">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{14, 12}, {111, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="331137941">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Export…</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="925868472"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSPopUpButton" id="504354212">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{205, 106}, {171, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="364373949">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="504354212"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="583382585">
+									<reference key="NSMenu" ref="1024359610"/>
+									<string key="NSTitle">Item 1</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<reference key="NSOnImage" ref="685563779"/>
+									<reference key="NSMixedImage" ref="459059485"/>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="364373949"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="1024359610">
+									<string key="NSTitle">OtherViews</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="583382585"/>
+										<object class="NSMenuItem" id="513652248">
+											<reference key="NSMenu" ref="1024359610"/>
+											<string key="NSTitle">Item 2</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="364373949"/>
+										</object>
+										<object class="NSMenuItem" id="1068501601">
+											<reference key="NSMenu" ref="1024359610"/>
+											<string key="NSTitle">Item 3</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="364373949"/>
+										</object>
+									</object>
+									<reference key="NSMenuFont" ref="726329126"/>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="725014287">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{108, 112}, {95, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="419720446">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">71304192</int>
+								<string key="NSContents">Output Space:</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="725014287"/>
+								<reference key="NSBackgroundColor" ref="1048089651"/>
+								<reference key="NSTextColor" ref="862547301"/>
+							</object>
+						</object>
+						<object class="NSPopUpButton" id="544513738">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{205, 66}, {171, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="835379078">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="544513738"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<object class="NSMenuItem" key="NSMenuItem" id="1039674421">
+									<reference key="NSMenu" ref="826566671"/>
+									<string key="NSTitle">Item 1</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<int key="NSState">1</int>
+									<reference key="NSOnImage" ref="685563779"/>
+									<reference key="NSMixedImage" ref="459059485"/>
+									<string key="NSAction">_popUpItemAction:</string>
+									<reference key="NSTarget" ref="835379078"/>
+								</object>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="826566671">
+									<string key="NSTitle">OtherViews</string>
+									<object class="NSMutableArray" key="NSMenuItems">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<reference ref="1039674421"/>
+										<object class="NSMenuItem" id="759230752">
+											<reference key="NSMenu" ref="826566671"/>
+											<string key="NSTitle">Item 2</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="835379078"/>
+										</object>
+										<object class="NSMenuItem" id="92608158">
+											<reference key="NSMenu" ref="826566671"/>
+											<string key="NSTitle">Item 3</string>
+											<string key="NSKeyEquiv"/>
+											<int key="NSKeyEquivModMask">1048576</int>
+											<int key="NSMnemonicLoc">2147483647</int>
+											<reference key="NSOnImage" ref="685563779"/>
+											<reference key="NSMixedImage" ref="459059485"/>
+											<string key="NSAction">_popUpItemAction:</string>
+											<reference key="NSTarget" ref="835379078"/>
+										</object>
+									</object>
+									<reference key="NSMenuFont" ref="726329126"/>
+								</object>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="480474153">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{108, 72}, {95, 17}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="439576659">
+								<int key="NSCellFlags">68288064</int>
+								<int key="NSCellFlags2">71304192</int>
+								<string key="NSContents">Transform:</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="480474153"/>
+								<reference key="NSBackgroundColor" ref="1048089651"/>
+								<reference key="NSTextColor" ref="862547301"/>
+							</object>
+						</object>
+						<object class="NSButton" id="99446929">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{408, 151}, {74, 18}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="376368781">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Invert</string>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="99446929"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
+								</object>
+								<object class="NSButtonImageSource" key="NSAlternateImage">
+									<string key="NSImageName">NSSwitch</string>
+								</object>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="698618176">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{377, 146}, {29, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="708983673">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="698618176"/>
+								<int key="NSButtonFlags">-2032910081</int>
+								<int key="NSButtonFlags2">166</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
+						</object>
+						<object class="NSButton" id="811102431">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{377, 106}, {29, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="753050854">
+								<int key="NSCellFlags">-2080244224</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="726329126"/>
+								<reference key="NSControlView" ref="811102431"/>
+								<int key="NSButtonFlags">-2032910081</int>
+								<int key="NSButtonFlags2">166</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{500, 270}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">actionRadios</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="883400788"/>
+					</object>
+					<int key="connectionID">99</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">configurationMenu</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="435395518"/>
+					</object>
+					<int key="connectionID">100</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">invertCheck</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="99446929"/>
+					</object>
+					<int key="connectionID">104</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">108</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clickedOK:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="46121423"/>
+					</object>
+					<int key="connectionID">109</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clickedExport:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="925868472"/>
+					</object>
+					<int key="connectionID">110</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clickedCancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="977011690"/>
+					</object>
+					<int key="connectionID">111</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trackConfigMenu:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="435395518"/>
+					</object>
+					<int key="connectionID">112</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu1</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="693681809"/>
+					</object>
+					<int key="connectionID">150</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu2</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="504354212"/>
+					</object>
+					<int key="connectionID">151</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">menu3</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="544513738"/>
+					</object>
+					<int key="connectionID">152</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">label1</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="576480890"/>
+					</object>
+					<int key="connectionID">153</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">label2</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="725014287"/>
+					</object>
+					<int key="connectionID">154</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">label3</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="480474153"/>
+					</object>
+					<int key="connectionID">155</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trackActionRadios:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="883400788"/>
+					</object>
+					<int key="connectionID">156</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trackMenu1:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="693681809"/>
+					</object>
+					<int key="connectionID">157</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trackMenu2:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="504354212"/>
+					</object>
+					<int key="connectionID">158</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trackMenu3:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="544513738"/>
+					</object>
+					<int key="connectionID">159</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">inputSpaceButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="698618176"/>
+					</object>
+					<int key="connectionID">166</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">outputSpaceButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="811102431"/>
+					</object>
+					<int key="connectionID">167</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">popInputSpaceMenu:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="698618176"/>
+					</object>
+					<int key="connectionID">168</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">popOutputSpaceMenu:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="811102431"/>
+					</object>
+					<int key="connectionID">169</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">trackInvert:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="99446929"/>
+					</object>
+					<int key="connectionID">170</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<reference key="object" ref="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1006"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="435395518"/>
+							<reference ref="898404895"/>
+							<reference ref="883400788"/>
+							<reference ref="693681809"/>
+							<reference ref="576480890"/>
+							<reference ref="504354212"/>
+							<reference ref="725014287"/>
+							<reference ref="544513738"/>
+							<reference ref="480474153"/>
+							<reference ref="46121423"/>
+							<reference ref="977011690"/>
+							<reference ref="925868472"/>
+							<reference ref="811102431"/>
+							<reference ref="99446929"/>
+							<reference ref="698618176"/>
+						</object>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="435395518"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="208613219"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="208613219"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="72498755"/>
+						</object>
+						<reference key="parent" ref="435395518"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="72498755"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="843754245"/>
+							<reference ref="884510374"/>
+							<reference ref="545806459"/>
+						</object>
+						<reference key="parent" ref="208613219"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="843754245"/>
+						<reference key="parent" ref="72498755"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="884510374"/>
+						<reference key="parent" ref="72498755"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="545806459"/>
+						<reference key="parent" ref="72498755"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="898404895"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="447253083"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="447253083"/>
+						<reference key="parent" ref="898404895"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="883400788"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="709071323"/>
+							<reference ref="1062336480"/>
+							<reference ref="329142917"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="709071323"/>
+						<reference key="parent" ref="883400788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="1062336480"/>
+						<reference key="parent" ref="883400788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="329142917"/>
+						<reference key="parent" ref="883400788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="693681809"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="177827106"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="576480890"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1023732974"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="1023732974"/>
+						<reference key="parent" ref="576480890"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="177827106"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="672106160"/>
+						</object>
+						<reference key="parent" ref="693681809"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="672106160"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="88039586"/>
+							<reference ref="201552110"/>
+							<reference ref="857078283"/>
+						</object>
+						<reference key="parent" ref="177827106"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">30</int>
+						<reference key="object" ref="88039586"/>
+						<reference key="parent" ref="672106160"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">31</int>
+						<reference key="object" ref="201552110"/>
+						<reference key="parent" ref="672106160"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">32</int>
+						<reference key="object" ref="857078283"/>
+						<reference key="parent" ref="672106160"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">76</int>
+						<reference key="object" ref="46121423"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="547623783"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">77</int>
+						<reference key="object" ref="547623783"/>
+						<reference key="parent" ref="46121423"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">95</int>
+						<reference key="object" ref="977011690"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1025093094"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">96</int>
+						<reference key="object" ref="1025093094"/>
+						<reference key="parent" ref="977011690"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">97</int>
+						<reference key="object" ref="925868472"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="331137941"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">98</int>
+						<reference key="object" ref="331137941"/>
+						<reference key="parent" ref="925868472"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="504354212"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="364373949"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">135</int>
+						<reference key="object" ref="725014287"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="419720446"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="419720446"/>
+						<reference key="parent" ref="725014287"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">137</int>
+						<reference key="object" ref="364373949"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1024359610"/>
+						</object>
+						<reference key="parent" ref="504354212"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">138</int>
+						<reference key="object" ref="1024359610"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="583382585"/>
+							<reference ref="513652248"/>
+							<reference ref="1068501601"/>
+						</object>
+						<reference key="parent" ref="364373949"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">139</int>
+						<reference key="object" ref="583382585"/>
+						<reference key="parent" ref="1024359610"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">140</int>
+						<reference key="object" ref="513652248"/>
+						<reference key="parent" ref="1024359610"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">141</int>
+						<reference key="object" ref="1068501601"/>
+						<reference key="parent" ref="1024359610"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">142</int>
+						<reference key="object" ref="544513738"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="835379078"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="480474153"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="439576659"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="439576659"/>
+						<reference key="parent" ref="480474153"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="835379078"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="826566671"/>
+						</object>
+						<reference key="parent" ref="544513738"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">146</int>
+						<reference key="object" ref="826566671"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="92608158"/>
+							<reference ref="759230752"/>
+							<reference ref="1039674421"/>
+						</object>
+						<reference key="parent" ref="835379078"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">147</int>
+						<reference key="object" ref="92608158"/>
+						<reference key="parent" ref="826566671"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">148</int>
+						<reference key="object" ref="759230752"/>
+						<reference key="parent" ref="826566671"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1039674421"/>
+						<reference key="parent" ref="826566671"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">41</int>
+						<reference key="object" ref="99446929"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="376368781"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">42</int>
+						<reference key="object" ref="376368781"/>
+						<reference key="parent" ref="99446929"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">160</int>
+						<reference key="object" ref="698618176"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="708983673"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">161</int>
+						<reference key="object" ref="708983673"/>
+						<reference key="parent" ref="698618176"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">164</int>
+						<reference key="object" ref="811102431"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="753050854"/>
+						</object>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">165</int>
+						<reference key="object" ref="753050854"/>
+						<reference key="parent" ref="811102431"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>1.IBEditorWindowLastContentRect</string>
+					<string>1.IBPluginDependency</string>
+					<string>1.IBWindowTemplateEditedContentRect</string>
+					<string>1.NSWindowTemplate.visibleAtLaunch</string>
+					<string>1.WindowOrigin</string>
+					<string>1.editorWindowContentRectSynchronizationRect</string>
+					<string>10.IBPluginDependency</string>
+					<string>11.IBPluginDependency</string>
+					<string>11.IBViewBoundsToFrameTransform</string>
+					<string>12.IBPluginDependency</string>
+					<string>134.IBPluginDependency</string>
+					<string>134.IBViewBoundsToFrameTransform</string>
+					<string>135.IBPluginDependency</string>
+					<string>135.IBViewBoundsToFrameTransform</string>
+					<string>136.IBPluginDependency</string>
+					<string>137.IBPluginDependency</string>
+					<string>138.IBEditorWindowLastContentRect</string>
+					<string>138.IBPluginDependency</string>
+					<string>139.IBPluginDependency</string>
+					<string>14.IBPluginDependency</string>
+					<string>140.IBPluginDependency</string>
+					<string>141.IBPluginDependency</string>
+					<string>142.IBPluginDependency</string>
+					<string>142.IBViewBoundsToFrameTransform</string>
+					<string>143.IBPluginDependency</string>
+					<string>143.IBViewBoundsToFrameTransform</string>
+					<string>144.IBPluginDependency</string>
+					<string>145.IBPluginDependency</string>
+					<string>146.IBEditorWindowLastContentRect</string>
+					<string>146.IBPluginDependency</string>
+					<string>147.IBPluginDependency</string>
+					<string>148.IBPluginDependency</string>
+					<string>149.IBPluginDependency</string>
+					<string>160.IBPluginDependency</string>
+					<string>160.IBViewBoundsToFrameTransform</string>
+					<string>161.IBPluginDependency</string>
+					<string>164.IBPluginDependency</string>
+					<string>164.IBViewBoundsToFrameTransform</string>
+					<string>165.IBPluginDependency</string>
+					<string>2.IBPluginDependency</string>
+					<string>25.IBPluginDependency</string>
+					<string>25.IBViewBoundsToFrameTransform</string>
+					<string>26.IBPluginDependency</string>
+					<string>26.IBViewBoundsToFrameTransform</string>
+					<string>27.IBPluginDependency</string>
+					<string>28.IBPluginDependency</string>
+					<string>29.IBEditorWindowLastContentRect</string>
+					<string>29.IBPluginDependency</string>
+					<string>3.IBPluginDependency</string>
+					<string>3.IBViewBoundsToFrameTransform</string>
+					<string>30.IBPluginDependency</string>
+					<string>31.IBPluginDependency</string>
+					<string>32.IBPluginDependency</string>
+					<string>4.IBPluginDependency</string>
+					<string>41.IBPluginDependency</string>
+					<string>41.IBViewBoundsToFrameTransform</string>
+					<string>42.IBPluginDependency</string>
+					<string>5.IBEditorWindowLastContentRect</string>
+					<string>5.IBPluginDependency</string>
+					<string>6.IBPluginDependency</string>
+					<string>7.IBPluginDependency</string>
+					<string>76.IBPluginDependency</string>
+					<string>76.IBViewBoundsToFrameTransform</string>
+					<string>77.IBPluginDependency</string>
+					<string>8.IBPluginDependency</string>
+					<string>9.IBPluginDependency</string>
+					<string>9.IBViewBoundsToFrameTransform</string>
+					<string>95.IBPluginDependency</string>
+					<string>95.IBViewBoundsToFrameTransform</string>
+					<string>96.IBPluginDependency</string>
+					<string>97.IBPluginDependency</string>
+					<string>97.IBViewBoundsToFrameTransform</string>
+					<string>98.IBPluginDependency</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>{{463, 726}, {500, 270}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{463, 726}, {500, 270}}</string>
+					<boolean value="NO"/>
+					<string>{196, 240}</string>
+					<string>{{202, 428}, {480, 270}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDBgAAw0IAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDTQAAw8EAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAw7+AAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{804, 573}, {110, 63}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDTQAAw7QAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAw7KAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{804, 573}, {110, 63}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDvIAAwyoAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDvQAAwwIAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDTgAAw9UAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABC2gAAw9OAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{804, 573}, {110, 63}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDTgAAw3oAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDzIAAwycAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{658, 915}, {171, 63}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDv4AAwigAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABC2gAAw3cAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABDjAAAwigAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<object class="NSAffineTransform">
+						<bytes key="NSTransformStruct">P4AAAL+AAABBYAAAwigAAA</bytes>
+					</object>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">183</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">OpenColorIO_PS_Dialog_Controller</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>clickedCancel:</string>
+							<string>clickedExport:</string>
+							<string>clickedOK:</string>
+							<string>popInputSpaceMenu:</string>
+							<string>popOutputSpaceMenu:</string>
+							<string>trackActionRadios:</string>
+							<string>trackConfigMenu:</string>
+							<string>trackInvert:</string>
+							<string>trackMenu1:</string>
+							<string>trackMenu2:</string>
+							<string>trackMenu3:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>clickedCancel:</string>
+							<string>clickedExport:</string>
+							<string>clickedOK:</string>
+							<string>popInputSpaceMenu:</string>
+							<string>popOutputSpaceMenu:</string>
+							<string>trackActionRadios:</string>
+							<string>trackConfigMenu:</string>
+							<string>trackInvert:</string>
+							<string>trackMenu1:</string>
+							<string>trackMenu2:</string>
+							<string>trackMenu3:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">clickedCancel:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">clickedExport:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">clickedOK:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">popInputSpaceMenu:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">popOutputSpaceMenu:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">trackActionRadios:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">trackConfigMenu:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">trackInvert:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">trackMenu1:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">trackMenu2:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">trackMenu3:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionRadios</string>
+							<string>configurationMenu</string>
+							<string>inputSpaceButton</string>
+							<string>invertCheck</string>
+							<string>label1</string>
+							<string>label2</string>
+							<string>label3</string>
+							<string>menu1</string>
+							<string>menu2</string>
+							<string>menu3</string>
+							<string>outputSpaceButton</string>
+							<string>window</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSMatrix</string>
+							<string>NSPopUpButton</string>
+							<string>NSButton</string>
+							<string>NSButton</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>NSTextField</string>
+							<string>NSPopUpButton</string>
+							<string>NSPopUpButton</string>
+							<string>NSPopUpButton</string>
+							<string>NSButton</string>
+							<string>NSWindow</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>actionRadios</string>
+							<string>configurationMenu</string>
+							<string>inputSpaceButton</string>
+							<string>invertCheck</string>
+							<string>label1</string>
+							<string>label2</string>
+							<string>label3</string>
+							<string>menu1</string>
+							<string>menu2</string>
+							<string>menu3</string>
+							<string>outputSpaceButton</string>
+							<string>window</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">actionRadios</string>
+								<string key="candidateClassName">NSMatrix</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">configurationMenu</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">inputSpaceButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">invertCheck</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">label1</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">label2</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">label3</string>
+								<string key="candidateClassName">NSTextField</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">menu1</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">menu2</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">menu3</string>
+								<string key="candidateClassName">NSPopUpButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">outputSpaceButton</string>
+								<string key="candidateClassName">NSButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">window</string>
+								<string key="candidateClassName">NSWindow</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">../mac/OpenColorIO_PS_Dialog_Controller.h</string>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSActionCell</string>
+					<string key="superclassName">NSCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSActionCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="941442438">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplication.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="249315622">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSApplicationScripting.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="940389886">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSColorPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSHelpManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPageLayout.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSApplication</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSUserInterfaceItemSearching.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSButton</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSButtonCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSCell</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSControl</string>
+					<string key="superclassName">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="927785883">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSControl.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMatrix</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMatrix.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenu</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="152583489">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenu.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItem</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="792514535">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSMenuItemCell</string>
+					<string key="superclassName">NSButtonCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSMenuItemCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSAccessibility.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="941442438"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="249315622"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="940389886"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="927785883"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDictionaryController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDragging.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontManager.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSFontPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSKeyValueBinding.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<reference key="sourceIdentifier" ref="152583489"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSNibLoading.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPasteboard.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSSavePanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSToolbarItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="702932807">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopUpButton</string>
+					<string key="superclassName">NSButton</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopUpButton.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSPopUpButtonCell</string>
+					<string key="superclassName">NSMenuItemCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSPopUpButtonCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSInterfaceStyle.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSResponder</string>
+					<string key="superclassName">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextField</string>
+					<string key="superclassName">NSControl</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextField.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSTextFieldCell</string>
+					<string key="superclassName">NSActionCell</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSTextFieldCell.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSClipView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<reference key="sourceIdentifier" ref="792514535"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSRulerView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSView</string>
+					<string key="superclassName">NSResponder</string>
+					<reference key="sourceIdentifier" ref="702932807"/>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSDrawer.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindow.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSWindow</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindowScripting.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../xcode/OpenColorIO_PS.xcodeproj</string>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSMenuCheckmark</string>
+				<string>NSMenuMixedState</string>
+				<string>NSSwitch</string>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{9, 8}</string>
+				<string>{7, 2}</string>
+				<string>{15, 15}</string>
+			</object>
+		</object>
+	</data>
+</archive>
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Info.plist opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Info.plist
--- opencolorio-1.0.9~dfsg0/src/photoshop/mac/OpenColorIO_PS_Info.plist	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/mac/OpenColorIO_PS_Info.plist	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleExecutable</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.OpenColorIO.Photoshop</string>
+	<key>CFBundleSignature</key>
+	<string>8BIM</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PLUGIN_TYPE)</string>
+	<key>CFBundleGetInfoString</key>
+	<string>©2017 OpenColorIO</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+</dict>
+</plist>
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Context.cpp opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Context.cpp
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Context.cpp	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Context.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,285 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+#include "OpenColorIO_PS_Context.h"
+
+int
+FindSpace(const SpaceVec &spaceVec, const std::string &space)
+{
+    for(int i=0; i < spaceVec.size(); i++)
+    {
+        const std::string &s = spaceVec[i];
+        
+        if(s == space)
+            return i;
+    }
+    
+    return -1;
+}
+
+OpenColorIO_PS_Context::OpenColorIO_PS_Context(const std::string &path) :
+    _path(path)
+{
+    const std::string extension = _path.substr( path.find_last_of('.') + 1 );
+    
+    if(extension == "ocio")
+    {
+        _config = OCIO::Config::CreateFromFile( _path.c_str() );
+        
+        _config->sanityCheck();
+        
+        _isLUT = false;
+        
+        for(int i=0; i < _config->getNumColorSpaces(); ++i)
+        {
+            const std::string colorSpaceName = _config->getColorSpaceNameByIndex(i);
+            
+            OCIO::ConstColorSpaceRcPtr colorSpace = _config->getColorSpace( colorSpaceName.c_str() );
+            
+            const std::string colorSpaceFamily = colorSpace->getFamily();
+            
+            const std::string colorSpacePath = (colorSpaceFamily.empty() ? colorSpaceName :
+                                                (colorSpaceFamily + "/" + colorSpaceName));
+                                                
+            _colorSpaces.push_back(colorSpaceName);
+            
+            _colorSpacesFullPaths.push_back(colorSpacePath);
+        }
+        
+        OCIO::ConstColorSpaceRcPtr defaultInput = _config->getColorSpace(OCIO::ROLE_SCENE_LINEAR);
+        
+        _defaultColorSpace = (defaultInput ? defaultInput->getName() : OCIO::ROLE_SCENE_LINEAR);
+        
+        
+        for(int i=0; i < _config->getNumDisplays(); ++i)
+        {
+            const std::string deviceName = _config->getDisplay(i);
+            
+            _devices.push_back(deviceName);
+        }
+        
+        _defaultDevice = _config->getDefaultDisplay();
+    }
+    else
+    {
+        _config = OCIO::Config::Create();
+        
+        
+        OCIO::FileTransformRcPtr forwardTransform = OCIO::FileTransform::Create();
+        
+        forwardTransform->setSrc( _path.c_str() );
+        forwardTransform->setInterpolation(OCIO::INTERP_LINEAR);
+        forwardTransform->setDirection(OCIO::TRANSFORM_DIR_FORWARD);
+        
+        OCIO::ConstProcessorRcPtr forwardProcessor = _config->getProcessor(forwardTransform);
+        
+        _isLUT = true;
+        
+        _canInvertLUT = true;
+        
+        try
+        {
+            OCIO::FileTransformRcPtr inverseTransform = OCIO::FileTransform::Create();
+            
+            inverseTransform->setSrc( _path.c_str() );
+            inverseTransform->setInterpolation(OCIO::INTERP_LINEAR);
+            inverseTransform->setDirection(OCIO::TRANSFORM_DIR_INVERSE);
+            
+            OCIO::ConstProcessorRcPtr inverseProcessor = _config->getProcessor(inverseTransform);
+        }
+        catch(...)
+        {
+            _canInvertLUT = false;
+        }
+    }
+}
+
+OCIO::ConstProcessorRcPtr
+OpenColorIO_PS_Context::getConvertProcessor(const std::string &inputSpace, const std::string &outputSpace) const
+{
+    assert( !isLUT() );
+
+    OCIO::ColorSpaceTransformRcPtr transform = OCIO::ColorSpaceTransform::Create();
+    
+    transform->setSrc( inputSpace.c_str() );
+    transform->setDst( outputSpace.c_str() );
+    transform->setDirection(OCIO::TRANSFORM_DIR_FORWARD);
+    
+    OCIO::ConstProcessorRcPtr processor = _config->getProcessor(transform);
+    
+    return processor;
+}
+
+
+OCIO::ConstProcessorRcPtr
+OpenColorIO_PS_Context::getDisplayProcessor(const std::string &inputSpace, const std::string &device, const std::string &transform) const
+{
+    assert( !isLUT() );
+
+    OCIO::DisplayTransformRcPtr ocio_transform = OCIO::DisplayTransform::Create();
+
+    ocio_transform->setInputColorSpaceName( inputSpace.c_str() );
+    ocio_transform->setDisplay( device.c_str() );
+    ocio_transform->setView( transform.c_str() );
+
+    OCIO::ConstProcessorRcPtr processor = _config->getProcessor(ocio_transform);
+    
+    return processor;
+}
+
+
+OCIO::ConstProcessorRcPtr
+OpenColorIO_PS_Context::getLUTProcessor(OCIO::Interpolation interpolation, OCIO::TransformDirection direction) const
+{
+    assert( isLUT() );
+
+    OCIO::FileTransformRcPtr transform = OCIO::FileTransform::Create();
+    
+    transform->setSrc( _path.c_str() );
+    transform->setInterpolation(interpolation);
+    transform->setDirection(direction);
+    
+    OCIO::ConstProcessorRcPtr processor = _config->getProcessor(transform);
+    
+    return processor;
+}
+
+
+OCIO::BakerRcPtr
+OpenColorIO_PS_Context::getConvertBaker(const std::string &inputSpace, const std::string &outputSpace) const
+{
+    assert( !isLUT() );
+
+    OCIO::BakerRcPtr baker = OCIO::Baker::Create();
+    
+    baker->setConfig(_config);
+    baker->setInputSpace( inputSpace.c_str() );
+    baker->setTargetSpace( outputSpace.c_str() );
+    
+    return baker;
+}
+
+
+OCIO::BakerRcPtr
+OpenColorIO_PS_Context::getDisplayBaker(const std::string &inputSpace, const std::string &device, const std::string &transform) const
+{
+    assert( !isLUT() );
+
+    OCIO::ConfigRcPtr editableConfig = _config->createEditableCopy();
+    
+    OCIO::ColorSpaceRcPtr inputColorSpace = OCIO::ColorSpace::Create();
+    const std::string input_space = "RawInput";
+    inputColorSpace->setName( input_space.c_str() );
+    editableConfig->addColorSpace(inputColorSpace);
+    
+    
+    OCIO::ColorSpaceRcPtr outputColorSpace = OCIO::ColorSpace::Create();
+    const std::string output_space = "ProcessedOutput";
+    outputColorSpace->setName( output_space.c_str() );
+    
+    OCIO::DisplayTransformRcPtr transformPtr = OCIO::DisplayTransform::Create();
+    
+    transformPtr->setInputColorSpaceName( inputSpace.c_str() );
+    transformPtr->setDisplay( device.c_str() );
+    transformPtr->setView( transform.c_str() );
+    
+    outputColorSpace->setTransform(transformPtr, OCIO::COLORSPACE_DIR_FROM_REFERENCE);
+    
+    editableConfig->addColorSpace(outputColorSpace);
+    
+    
+    OCIO::BakerRcPtr baker = OCIO::Baker::Create();
+    
+    baker->setConfig(editableConfig);
+    baker->setInputSpace( input_space.c_str() );
+    baker->setTargetSpace( output_space.c_str() );
+    
+    return baker;
+}
+
+
+OCIO::BakerRcPtr
+OpenColorIO_PS_Context::getLUTBaker(OCIO::Interpolation interpolation, OCIO::TransformDirection direction) const
+{
+    assert( isLUT() );
+
+    OCIO::ConfigRcPtr editableConfig = OCIO::Config::Create();
+
+    OCIO::ColorSpaceRcPtr inputColorSpace = OCIO::ColorSpace::Create();
+    std::string inputspace = "RawInput";
+    inputColorSpace->setName(inputspace.c_str());
+    editableConfig->addColorSpace(inputColorSpace);
+    
+    
+    OCIO::ColorSpaceRcPtr outputColorSpace = OCIO::ColorSpace::Create();
+    std::string outputspace = "ProcessedOutput";
+    outputColorSpace->setName(outputspace.c_str());
+    
+    OCIO::FileTransformRcPtr transform = OCIO::FileTransform::Create();
+    
+    transform = OCIO::FileTransform::Create();
+    transform->setSrc(_path.c_str());
+    transform->setInterpolation(interpolation);
+    transform->setDirection(direction);
+    
+    outputColorSpace->setTransform(transform, OCIO::COLORSPACE_DIR_FROM_REFERENCE);
+    
+    editableConfig->addColorSpace(outputColorSpace);
+    
+    
+    OCIO::BakerRcPtr baker = OCIO::Baker::Create();
+    
+    baker->setConfig(editableConfig);
+    baker->setInputSpace(inputspace.c_str());
+    baker->setTargetSpace(outputspace.c_str());
+    
+    return baker;
+}
+
+
+SpaceVec
+OpenColorIO_PS_Context::getTransforms(const std::string &device) const
+{
+    SpaceVec transforms;
+    
+    for(int i=0; i < _config->getNumViews( device.c_str() ); ++i)
+    {
+        const std::string transformName = _config->getView(device.c_str(), i);
+        
+        transforms.push_back(transformName);
+    }
+    
+    return transforms;
+}
+
+
+std::string
+OpenColorIO_PS_Context::getDefaultTransform(const std::string &device) const
+{
+    return _config->getDefaultView( device.c_str() );
+}
+
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Context.h opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Context.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Context.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Context.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef _OPENCOLORIO_PS_CONTEXT_H_
+#define _OPENCOLORIO_PS_CONTEXT_H_
+
+#include <string>
+#include <vector>
+
+#include <OpenColorIO/OpenColorIO.h>
+namespace OCIO = OCIO_NAMESPACE;
+
+
+typedef std::vector<std::string> SpaceVec;
+
+int FindSpace(const SpaceVec &spaceVec, const std::string &space); // returns -1 if not found
+
+
+class OpenColorIO_PS_Context
+{
+  public:
+    OpenColorIO_PS_Context(const std::string &path);
+    ~OpenColorIO_PS_Context() {}
+    
+    //const std::string getPath() const { return _path; }
+    
+    bool isLUT() const { return _isLUT; }
+    bool canInvertLUT() const { return (isLUT() && _canInvertLUT); }
+    
+    OCIO::ConstConfigRcPtr getConfig() const { return _config; }
+    
+    OCIO::ConstProcessorRcPtr getConvertProcessor(const std::string &inputSpace, const std::string &outputSpace) const;
+    OCIO::ConstProcessorRcPtr getDisplayProcessor(const std::string &inputSpace, const std::string &device, const std::string &transform) const;
+    OCIO::ConstProcessorRcPtr getLUTProcessor(OCIO::Interpolation interpolation, OCIO::TransformDirection direction) const;
+    
+    OCIO::BakerRcPtr getConvertBaker(const std::string &inputSpace, const std::string &outputSpace) const;
+    OCIO::BakerRcPtr getDisplayBaker(const std::string &inputSpace, const std::string &device, const std::string &transform) const;
+    OCIO::BakerRcPtr getLUTBaker(OCIO::Interpolation interpolation, OCIO::TransformDirection direction) const;
+
+    const SpaceVec & getColorSpaces(bool fullPath=false) const { return (fullPath ? _colorSpacesFullPaths : _colorSpaces); }
+    const std::string & getDefaultColorSpace() const { return _defaultColorSpace; }
+    
+    const SpaceVec & getDevices() const { return _devices; };
+    const std::string & getDefaultDevice() const { return _defaultDevice; }
+    
+    SpaceVec getTransforms(const std::string &device) const;
+    std::string getDefaultTransform(const std::string &device) const;
+
+  private:
+    std::string _path;
+    
+    OCIO::ConstConfigRcPtr _config;
+    
+    SpaceVec _colorSpaces;
+    SpaceVec _colorSpacesFullPaths;
+    std::string _defaultColorSpace;
+    SpaceVec _devices;
+    std::string _defaultDevice;
+    
+    bool _isLUT;
+    bool _canInvertLUT;
+};
+
+#endif // _OPENCOLORIO_PS_CONTEXT_H_
\ No newline at end of file
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS.cpp opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS.cpp
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS.cpp	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,899 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "OpenColorIO_PS.h"
+
+#include "OpenColorIO_PS_Dialog.h"
+#include "OpenColorIO_PS_Terminology.h"
+
+#include "OpenColorIO_PS_Context.h"
+
+#ifdef __PIWin__
+//#include <Windows.h>
+#include <Shlobj.h>
+
+// DLLInstance for Windows
+HINSTANCE hDllInstance = NULL;
+#endif
+
+
+// some of the lame-ass supporting code needs this
+SPBasicSuite * sSPBasic = NULL;
+FilterRecord * gFilterRecord = NULL;
+
+
+typedef struct {
+    long        sig;
+    
+    OCIO_Source source;
+    Str255      configName;
+    Str255      configPath;
+    OCIO_Action action;
+    Boolean     invert;
+    OCIO_Interp interpolation;
+    Str255      inputSpace;
+    Str255      outputSpace;
+    Str255      transform;
+    Str255      device;
+} Param;
+
+
+#ifndef MIN
+#define MIN(a,b) (((a)<(b))?(a):(b))
+#endif /* MIN */
+#ifndef MAX
+#define MAX(a,b) (((a)>(b))?(a):(b))
+#endif  /* MAX */
+
+static void myC2PString(Str255 &pstr, const char *cstr)
+{
+    const size_t len = MIN(strlen(cstr), 254);
+    
+    strncpy((char *)&pstr[1], cstr, len);
+    
+    pstr[0] = len;
+    pstr[len + 1] = '\0';
+}
+
+static const char * myP2CString(Str255 &pstr)
+{
+    size_t len = pstr[0];
+    
+    pstr[len + 1] = '\0';
+    
+    return (const char *)&pstr[1];
+}
+
+static void myP2PString(Str255 &dest, const Str255 &src)
+{
+    memcpy(&dest[0], &src[0], 256);
+}
+
+
+static void ReportException(GPtr globals, const std::exception &e)
+{
+    Str255 p_str;
+    
+    myC2PString(p_str, e.what());
+    
+    PIReportError(p_str);
+    
+    gResult = errReportString;
+}
+
+
+static Boolean ReadScriptParams(GPtr globals)
+{
+    PIReadDescriptor            token = NULL;
+    DescriptorKeyID             key = 0;
+    DescriptorTypeID            type = 0;
+    DescriptorKeyIDArray        array = { NULLID };
+    int32                       flags = 0;
+    OSErr                       stickyError = noErr;
+    Boolean                     returnValue = true;
+    
+    if(DescriptorAvailable(NULL))
+    {
+        token = OpenReader(array);
+        
+        if(token)
+        {
+            while(PIGetKey(token, &key, &type, &flags))
+            {
+                if(key == ocioKeySource)
+                {
+                    DescriptorEnumID ostypeStoreValue;
+                    PIGetEnum(token, &ostypeStoreValue);
+                    globals->source = (ostypeStoreValue == sourceEnvironment ? OCIO_SOURCE_ENVIRONMENT :
+                                        ostypeStoreValue == sourceCustom ? OCIO_SOURCE_CUSTOM :
+                                        OCIO_SOURCE_STANDARD);
+                }
+                else if(key == ocioKeyConfigName)
+                {
+                    PIGetStr(token, &globals->configName);
+                }
+                else if(key == ocioKeyConfigFileHandle)
+                {
+                    PIGetAlias(token, (Handle *)&globals->configFileHandle);
+                }
+                else if(key == ocioKeyAction)
+                {
+                    DescriptorEnumID ostypeStoreValue;
+                    PIGetEnum(token, &ostypeStoreValue);
+                    globals->action = (ostypeStoreValue == actionLUT ? OCIO_ACTION_LUT :
+                                        ostypeStoreValue == actionDisplay ? OCIO_ACTION_DISPLAY :
+                                        OCIO_ACTION_CONVERT);
+                }
+                else if(key == ocioKeyInvert)
+                {
+                    PIGetBool(token, &globals->invert);
+                }
+                else if(key == ocioKeyInterpolation)
+                {
+                    DescriptorEnumID ostypeStoreValue;
+                    PIGetEnum(token, &ostypeStoreValue);
+                    globals->action = (ostypeStoreValue == interpNearest ? OCIO_INTERP_NEAREST :
+                                        ostypeStoreValue == interpLinear ? OCIO_INTERP_LINEAR :
+                                        ostypeStoreValue == interpTetrahedral ? OCIO_INTERP_TETRAHEDRAL :
+                                        OCIO_INTERP_BEST);
+                }
+                else if(key == ocioKeyInputSpace)
+                {
+                    PIGetStr(token, &globals->inputSpace);
+                }
+                else if(key == ocioKeyOutputSpace)
+                {
+                    PIGetStr(token, &globals->outputSpace);
+                }
+                else if(key == ocioKeyDevice)
+                {
+                    PIGetStr(token, &globals->device);
+                }
+                else if(key == ocioKeyTransform)
+                {
+                    PIGetStr(token, &globals->transform);
+                }
+            }
+
+            stickyError = CloseReader(&token); // closes & disposes.
+        }
+        
+        returnValue = PlayDialog();
+    }
+    
+    return returnValue;
+}
+
+static OSErr WriteScriptParams(GPtr globals)
+{
+    PIWriteDescriptor           token = nil;
+    OSErr                       gotErr = noErr;
+            
+    if(DescriptorAvailable(NULL))
+    {
+        token = OpenWriter();
+        
+        if(token)
+        {
+            PIPutEnum(token, ocioKeySource, typeSource, (globals->source == OCIO_SOURCE_ENVIRONMENT ? sourceEnvironment :
+                                                        globals->source == OCIO_SOURCE_CUSTOM ? sourceCustom :
+                                                        sourceStandard));
+        
+            if(globals->source == OCIO_SOURCE_STANDARD)
+            {
+                PIPutStr(token, ocioKeyConfigName, globals->configName);
+            }
+            else if(globals->source == OCIO_SOURCE_CUSTOM)
+            {
+                PIPutAlias(token, ocioKeyConfigFileHandle, (Handle)globals->configFileHandle);
+            }
+            
+            
+            PIPutEnum(token, ocioKeyAction, typeAction, (globals->action == OCIO_ACTION_LUT ? actionLUT :
+                                                        globals->action == OCIO_ACTION_DISPLAY ? actionDisplay :
+                                                        actionConvert));
+            
+            if(globals->action == OCIO_ACTION_LUT)
+            {
+                PIPutBool(token, ocioKeyInvert, globals->invert);
+                PIPutEnum(token, ocioKeyInterpolation, typeInterpolation, (globals->interpolation == OCIO_INTERP_NEAREST ? interpNearest :
+                                                                        globals->interpolation == OCIO_INTERP_LINEAR ? interpLinear :
+                                                                        globals->interpolation == OCIO_INTERP_TETRAHEDRAL ? interpTetrahedral :
+                                                                        interpBest));
+                                                                        
+            }
+            else if(globals->action == OCIO_ACTION_DISPLAY)
+            {
+                PIPutStr(token, ocioKeyInputSpace, globals->inputSpace);
+                PIPutStr(token, ocioKeyDevice, globals->device);
+                PIPutStr(token, ocioKeyTransform, globals->transform);
+            }
+            else
+            {
+                assert(globals->action == OCIO_ACTION_CONVERT);
+                
+                PIPutStr(token, ocioKeyInputSpace, globals->inputSpace);
+                PIPutStr(token, ocioKeyOutputSpace, globals->outputSpace);
+            }
+            
+            
+            gotErr = CloseWriter(&token); // closes and sets dialog optional
+        }
+    }
+    
+    return gotErr;
+}
+
+#pragma mark-
+
+static void DoAbout(AboutRecordPtr aboutRecord)
+{
+#ifdef __PIMac__
+    const char *plugHndl = "org.OpenColorIO.Photoshop";
+    const void *hwnd = NULL;
+#else
+    // get platform handles
+    const void *plugHndl = hDllInstance;
+    HWND hwnd = (HWND)HostGetPlatformWindowPtr(aboutRecord);
+#endif
+
+    OpenColorIO_PS_About(plugHndl, hwnd);
+}
+
+
+void ValidateParameters(GPtr globals)
+{
+    if(gStuff->parameters == NULL)
+    {
+        gStuff->parameters = PINewHandle(sizeof(Param));
+
+        if(gStuff->parameters != NULL)
+        {
+            Param *param = (Param *)PILockHandle(gStuff->parameters, FALSE);
+
+            if(param)
+            {
+                param->sig = OpenColorIOSignature;
+                
+                param->source           = globals->source;
+                myP2PString(param->configName, globals->configName);
+                myC2PString(param->configPath, "dummyPath");
+                param->action           = globals->action;
+                param->invert           = globals->invert;
+                param->interpolation    = globals->interpolation;
+                myP2PString(param->inputSpace, globals->inputSpace);
+                myP2PString(param->outputSpace, globals->outputSpace);
+                myP2PString(param->device, globals->device);
+                myP2PString(param->transform, globals->transform);
+
+                PIUnlockHandle(gStuff->parameters);
+            }
+        }
+        else
+        {
+            gResult = memFullErr;
+            return;
+        }
+    }   
+}
+
+
+static void InitGlobals(Ptr globalPtr)
+{   
+    GPtr globals = (GPtr)globalPtr;
+
+    globals->do_dialog  = FALSE;
+    
+    globals->source             = OCIO_SOURCE_ENVIRONMENT;
+    myC2PString(globals->configName, "");
+    globals->configFileHandle   = NULL;
+    globals->action             = OCIO_ACTION_NONE;
+    globals->invert             = FALSE;
+    globals->interpolation      = OCIO_INTERP_LINEAR;
+    myC2PString(globals->inputSpace, "");
+    myC2PString(globals->outputSpace, "");
+    myC2PString(globals->transform, "");
+    myC2PString(globals->device, "");
+    
+    
+    // set default with environment variable if it's set
+    char *file = std::getenv("OCIO");
+    
+    if(file)
+    {
+        std::string path = file;
+        
+        if( !path.empty() )
+        {
+            try
+            {
+                OpenColorIO_PS_Context context(path);
+                
+                if( context.isLUT() )
+                {
+                    globals->source = OCIO_SOURCE_ENVIRONMENT;
+                    globals->action = OCIO_ACTION_LUT;
+                }
+                else
+                {
+                    const std::string &defaultInputName = context.getDefaultColorSpace();
+                    const std::string &defaultOutputName = defaultInputName;
+                    
+                    const std::string &defaultDevice = context.getDefaultDevice();
+                    const std::string defaultTransform = context.getDefaultTransform(defaultDevice);
+                    
+                    
+                    globals->source = OCIO_SOURCE_ENVIRONMENT;
+                    globals->action = OCIO_ACTION_CONVERT;
+                    myC2PString(globals->inputSpace, defaultInputName.c_str());
+                    myC2PString(globals->outputSpace, defaultOutputName.c_str());
+                    myC2PString(globals->device, defaultDevice.c_str());
+                    myC2PString(globals->transform, defaultTransform.c_str());
+                }
+            }
+            catch(const std::exception &e)
+            {
+                ReportException(globals, e);
+            }
+            catch(...)
+            {
+                gResult = formatCannotRead;
+            }
+        }
+    }
+    
+    
+    ValidateParameters(globals);
+}
+
+
+static void DoParameters(GPtr globals)
+{
+    Boolean do_dialog = ReadScriptParams(globals);
+    
+    if(do_dialog)
+    {
+        // in the modern era, we always do dialogs in the render function
+        globals->do_dialog = TRUE;
+    }
+}
+
+static void DoPrepare(GPtr globals)
+{
+    gStuff->bufferSpace = 0;
+    gStuff->maxSpace = 0;
+}
+
+
+static inline float Clamp(const float &f)
+{
+    return (f < 0.f ? 0.f : f > 1.f ? 1.f : f);
+}
+
+template <typename T, int max, bool round, bool clamp>
+static void ConvertRow(T *row, int len, OCIO::ConstProcessorRcPtr processor)
+{
+    float *floatRow = NULL;
+    
+    if(max == 1)
+    {
+        floatRow = (float *)row;
+    }
+    else
+    {
+        floatRow = (float *)malloc(sizeof(float) * len * 3);
+        
+        if(floatRow == NULL)
+            return;
+        
+        const T *in = row;
+        float *out = floatRow;
+        
+        for(int x=0; x < len; x++)
+        {
+            *out++ = ((float)*in++ / (float)max);
+            *out++ = ((float)*in++ / (float)max);
+            *out++ = ((float)*in++ / (float)max);
+        }
+    }
+    
+    
+    OCIO::PackedImageDesc img(floatRow, len, 1, 3);
+    
+    processor->apply(img);
+    
+    
+    if(max != 1)
+    {
+        const float *in = floatRow;
+        T *out = row;
+        
+        assert(round && clamp);
+        
+        for(int x=0; x < len; x++)
+        {
+            *out++ = (Clamp(*in++) * (float)max) + 0.5f;
+            *out++ = (Clamp(*in++) * (float)max) + 0.5f;
+            *out++ = (Clamp(*in++) * (float)max) + 0.5f;
+        }
+        
+        free(floatRow);
+    }
+}
+
+
+static void ProcessTile(GPtr globals, void *tileData, VRect &tileRect, int32 rowBytes, OCIO::ConstProcessorRcPtr processor)
+{
+
+    const uint32 rectHeight = tileRect.bottom - tileRect.top;
+    const uint32 rectWidth = tileRect.right - tileRect.left;
+    
+    unsigned char *row = (unsigned char *)tileData;
+
+    for(uint32 pixelY = 0; pixelY < rectHeight; pixelY++)
+    {
+        if(gStuff->depth == 32)
+            ConvertRow<float, 1, false, false>((float *)row, rectWidth, processor);
+        else if(gStuff->depth == 16)
+            ConvertRow<uint16, 0x8000, true, true>((uint16 *)row, rectWidth, processor);
+        else if(gStuff->depth == 8)
+            ConvertRow<uint8, 255, true, true>((uint8 *)row, rectWidth, processor);
+
+        row += rowBytes;
+    }
+}
+
+
+static void DoStart(GPtr globals)
+{
+    // legacy paramaters part
+    if(gStuff->parameters)
+    {
+        Param *param = (Param *)PILockHandle(gStuff->parameters, FALSE);
+
+        if(param && param->sig == OpenColorIOSignature)
+        {
+            // copy params (or not - seems to monkey with my dialog when I edit an action)
+
+            PIUnlockHandle(gStuff->parameters);
+        }
+    }
+    
+    // modern scripting part
+    Boolean do_dialog = ReadScriptParams(globals);
+    
+    if(do_dialog || globals->do_dialog)
+    {
+        DialogParams dialogParams;
+        
+        dialogParams.source = (globals->source == OCIO_SOURCE_ENVIRONMENT ? SOURCE_ENVIRONMENT :
+                                globals->source == OCIO_SOURCE_CUSTOM ? SOURCE_CUSTOM :
+                                SOURCE_STANDARD);
+        
+        if(globals->source == OCIO_SOURCE_CUSTOM)
+        {
+        #ifdef __PIMac__
+            assert(globals->configFileHandle != NULL);
+        
+            FSRef fsref;
+            Boolean wasChanged;
+        
+            if(noErr == FSResolveAlias(NULL, globals->configFileHandle, &fsref, &wasChanged))
+            {
+                char file_path[256];
+                file_path[0] = '\0';
+
+                FSRefMakePath(&fsref, (UInt8 *)file_path, 255);
+                
+                dialogParams.config = file_path;
+            }
+            else
+            {
+                dialogParams.source = SOURCE_ENVIRONMENT;
+            }
+        #else
+            assert(globals->configFileHandle != NULL);
+
+            dialogParams.config = PILockHandle(globals->configFileHandle, true);
+
+            PIUnlockHandle(globals->configFileHandle);
+        #endif
+        }
+        else if(globals->source == OCIO_SOURCE_STANDARD)
+        {
+            dialogParams.config = myP2CString(globals->configName);
+        }
+        
+        dialogParams.action = (globals->action == OCIO_ACTION_LUT ? ACTION_LUT :
+                                globals->action == OCIO_ACTION_DISPLAY ? ACTION_DISPLAY :
+                                ACTION_CONVERT);
+                                
+        dialogParams.invert = globals->invert;
+        
+        dialogParams.interpolation = (globals->interpolation == OCIO_INTERP_NEAREST ? INTERPO_NEAREST :
+                                        globals->interpolation == OCIO_INTERP_LINEAR ? INTERPO_LINEAR :
+                                        globals->interpolation == OCIO_INTERP_TETRAHEDRAL ? INTERPO_TETRAHEDRAL :
+                                        INTERPO_BEST);
+                                        
+        dialogParams.inputSpace = myP2CString(globals->inputSpace);
+        dialogParams.outputSpace = myP2CString(globals->outputSpace);
+        dialogParams.device = myP2CString(globals->device);
+        dialogParams.transform = myP2CString(globals->transform);
+        
+    
+    #ifdef __PIMac__
+        const char *plugHndl = "org.OpenColorIO.Photoshop";
+        const void *hwnd = NULL;
+    #else
+        // get platform handles
+        const void *plugHndl = hDllInstance;
+        HWND hwnd = (HWND)((PlatformData *)gStuff->platformData)->hwnd;
+    #endif
+        
+        const DialogResult dialogResult = OpenColorIO_PS_Dialog(dialogParams, plugHndl, hwnd);
+        
+        
+        if(dialogResult == RESULT_OK || dialogResult == RESULT_EXPORT)
+        {
+            globals->source = (dialogParams.source == SOURCE_ENVIRONMENT ? OCIO_SOURCE_ENVIRONMENT :
+                                dialogParams.source == SOURCE_CUSTOM ? OCIO_SOURCE_CUSTOM :
+                                OCIO_SOURCE_STANDARD);
+            
+            if(dialogParams.source == SOURCE_CUSTOM)
+            {
+            #ifdef __PIMac__
+                FSRef temp_fsref;
+                
+                if(noErr == FSPathMakeRef((UInt8 *)dialogParams.config.c_str(), &temp_fsref, NULL) )
+                {
+                    FSNewAlias(NULL, &temp_fsref, &globals->configFileHandle);
+                }
+                else
+                {
+                    globals->source = OCIO_SOURCE_NONE;
+                }
+            #else
+                if(globals->configFileHandle)
+                    PISetHandleSize(globals->configFileHandle, (dialogParams.config.length() + 1) * sizeof(char));
+                else    
+                    globals->configFileHandle = PINewHandle((dialogParams.config.length() + 1) * sizeof(char));
+                    
+                char *path_buf = PILockHandle(globals->configFileHandle, true);
+
+                strcpy(path_buf, dialogParams.config.c_str());
+
+                PIUnlockHandle(globals->configFileHandle);
+            #endif
+            }
+            else if(dialogParams.source == SOURCE_STANDARD)
+            {
+                myC2PString(globals->configName, dialogParams.config.c_str());
+            }
+            
+            globals->action = (dialogParams.action == ACTION_LUT ? OCIO_ACTION_LUT :
+                                dialogParams.action == ACTION_DISPLAY ? OCIO_ACTION_DISPLAY :
+                                OCIO_ACTION_CONVERT);
+            
+            globals->invert = dialogParams.invert;
+            
+            globals->interpolation = (dialogParams.interpolation == INTERPO_NEAREST ? OCIO_INTERP_NEAREST :
+                                        dialogParams.interpolation == INTERPO_LINEAR ? OCIO_INTERP_LINEAR :
+                                        dialogParams.interpolation == INTERPO_TETRAHEDRAL ? OCIO_INTERP_TETRAHEDRAL :
+                                        OCIO_INTERP_BEST);
+                                        
+            myC2PString(globals->inputSpace, dialogParams.inputSpace.c_str());
+            myC2PString(globals->outputSpace, dialogParams.outputSpace.c_str());
+            myC2PString(globals->device, dialogParams.device.c_str());
+            myC2PString(globals->transform, dialogParams.transform.c_str());
+        }
+        else
+            gResult = userCanceledErr;
+        
+
+        globals->do_dialog = FALSE;
+
+        if(gResult == noErr)
+        {
+            // this will copy values to parameters
+            ValidateParameters(globals);
+        }
+    }
+
+    
+    std::string path;
+    
+    if(gResult == noErr)
+    {
+        if(globals->source == OCIO_SOURCE_ENVIRONMENT)
+        {
+            char *envFile = std::getenv("OCIO");
+            
+            if(envFile != NULL && strlen(envFile) > 0)
+            {
+                path = envFile;
+            }
+        }
+        else if(globals->source == OCIO_SOURCE_CUSTOM)
+        {
+        #ifdef __PIMac__
+            assert(globals->configFileHandle != NULL);
+        
+            FSRef fsref;
+            Boolean wasChanged;
+        
+            if(noErr == FSResolveAlias(NULL, globals->configFileHandle, &fsref, &wasChanged))
+            {
+                char file_path[256];
+                file_path[0] = '\0';
+
+                FSRefMakePath(&fsref, (UInt8 *)file_path, 255);
+                
+                path = file_path;
+            }
+        #else
+            assert(globals->configFileHandle != NULL);
+
+            path = PILockHandle(globals->configFileHandle, true);
+
+            PIUnlockHandle(globals->configFileHandle);
+        #endif
+        }
+        else
+        {
+            assert(globals->source == OCIO_SOURCE_STANDARD);
+            
+        #ifdef __PIMac__
+            const char *standardDirectory = "/Library/Application Support/OpenColorIO";
+            const std::string pathSeperator = "/";
+        #else
+            const std::string pathSeperator = "\\";
+
+            char appdata_path[MAX_PATH];
+            HRESULT result = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL,
+                                                SHGFP_TYPE_CURRENT, appdata_path);
+
+            const std::string standardDirectory = std::string(appdata_path) + pathSeperator + "OpenColorIO";
+        #endif
+        
+            path = standardDirectory;
+            
+            path += pathSeperator;
+            
+            path += myP2CString(globals->configName);
+            
+            path += pathSeperator + "config.ocio";
+        }
+        
+        if( path.empty() )
+            gResult = filterBadParameters;
+    }
+    
+    if(gResult == noErr)
+    {
+        try
+        {
+            OpenColorIO_PS_Context context(path);
+            
+            OCIO::ConstProcessorRcPtr processor;
+            
+            if( context.isLUT() )
+            {
+                assert(globals->action == OCIO_ACTION_LUT);
+                
+                const OCIO::Interpolation interpolation = (globals->interpolation == OCIO_INTERP_NEAREST ? OCIO::INTERP_NEAREST :
+                                                            globals->interpolation == OCIO_INTERP_LINEAR ? OCIO::INTERP_LINEAR :
+                                                            globals->interpolation == OCIO_INTERP_TETRAHEDRAL ? OCIO::INTERP_TETRAHEDRAL :
+                                                            OCIO::INTERP_BEST);
+                                                            
+                const OCIO::TransformDirection direction = (globals->invert ? OCIO::TRANSFORM_DIR_INVERSE : OCIO::TRANSFORM_DIR_FORWARD);
+                
+                 processor = context.getLUTProcessor(interpolation, direction);
+            }
+            else
+            {
+                if(globals->action == OCIO_ACTION_DISPLAY)
+                {
+                    processor = context.getDisplayProcessor(myP2CString(globals->inputSpace), myP2CString(globals->device), myP2CString(globals->transform));
+                }
+                else
+                {
+                    assert(globals->action == OCIO_ACTION_CONVERT);
+                    
+                    processor = context.getConvertProcessor(myP2CString(globals->inputSpace), myP2CString(globals->outputSpace));
+                }
+            }
+            
+            
+            
+            // now the Photoshop part
+            int16 tileHeight = gStuff->outTileHeight;
+            int16 tileWidth = gStuff->outTileWidth;
+
+            if(tileWidth == 0 || tileHeight == 0 || gStuff->advanceState == NULL)
+            {
+                gResult = filterBadParameters;
+            }
+            
+            VRect outRect = GetOutRect();
+            VRect filterRect = GetFilterRect();
+
+            int32 imageVert = filterRect.bottom - filterRect.top;
+            int32 imageHor = filterRect.right - filterRect.left;
+
+            uint32 tilesVert = (tileHeight - 1 + imageVert) / tileHeight;
+            uint32 tilesHoriz = (tileWidth - 1 + imageHor) / tileWidth;
+
+            int32 progress_total = tilesVert;
+            int32 progress_complete = 0;
+
+            gStuff->outLoPlane = 0;
+            gStuff->outHiPlane = 2;
+
+            for(uint16 vertTile = 0; vertTile < tilesVert && gResult == noErr; vertTile++)
+            {
+                for(uint16 horizTile = 0; horizTile < tilesHoriz && gResult == noErr; horizTile++)
+                {
+                    outRect.top = filterRect.top + ( vertTile * tileHeight );
+                    outRect.left = filterRect.left + ( horizTile * tileWidth );
+                    outRect.bottom = outRect.top + tileHeight;
+                    outRect.right = outRect.left + tileWidth;
+
+                    if (outRect.bottom > filterRect.bottom)
+                        outRect.bottom = filterRect.bottom;
+                    if (outRect.right > filterRect.right)
+                        outRect.right = filterRect.right;
+
+                    SetOutRect(outRect);
+
+                    gResult = AdvanceState();
+                    
+                    if(gResult == kNoErr)
+                    {
+                        outRect = GetOutRect();
+                        
+                        ProcessTile(globals,
+                                    gStuff->outData, 
+                                    outRect, 
+                                    gStuff->outRowBytes,
+                                    processor);
+                    }
+                }
+
+                PIUpdateProgress(++progress_complete, progress_total);
+
+                if( TestAbort() ) 
+                {
+                    gResult = userCanceledErr;
+                }
+            }
+        }
+        catch(const std::exception &e)
+        {
+            ReportException(globals, e);
+        }
+        catch(...)
+        {
+            gResult = filterBadParameters;
+        }
+    }
+
+    VRect nullRect = {0,0,0,0};
+    SetOutRect(nullRect);
+    
+    if(gResult == noErr)
+        WriteScriptParams(globals);
+}
+
+static void DoContinue(GPtr globals)
+{
+    VRect outRect = { 0, 0, 0, 0};
+    SetOutRect(outRect);
+}
+
+static void DoFinish(GPtr globals)
+{
+}
+
+
+DLLExport SPAPI void PluginMain(const int16 selector,
+                                FilterRecord * filterRecord,
+                                entryData * data,
+                                int16 * result)
+{
+    if (selector == filterSelectorAbout)
+    {
+        sSPBasic = ((AboutRecordPtr)filterRecord)->sSPBasic;
+
+    #ifdef __PIWin__
+        if(hDllInstance == NULL)
+            hDllInstance = GetDLLInstance((SPPluginRef)((AboutRecordPtr)filterRecord)->plugInRef);
+    #endif
+
+        DoAbout((AboutRecordPtr)filterRecord);
+    } 
+    else 
+    {
+        gFilterRecord = filterRecord;
+        sSPBasic = filterRecord->sSPBasic;
+
+    #ifdef __PIWin__
+        if(hDllInstance == NULL)
+            hDllInstance = GetDLLInstance((SPPluginRef)filterRecord->plugInRef);
+    #endif
+
+        Ptr globalPtr = NULL;       // Pointer for global structure
+        GPtr globals = NULL;        // actual globals
+
+
+        globalPtr = AllocateGlobals ((allocateGlobalsPointer)result,
+                                        (allocateGlobalsPointer)filterRecord,
+                                        filterRecord->handleProcs,
+                                        sizeof(Globals),
+                                        data,
+                                        InitGlobals);
+
+        if(globalPtr == NULL)
+        {       
+            *result = memFullErr;
+            return;
+        }
+
+        globals = (GPtr)globalPtr;
+
+
+        if (gStuff->bigDocumentData != NULL)
+            gStuff->bigDocumentData->PluginUsing32BitCoordinates = true;
+
+
+        switch (selector)
+        {
+            case filterSelectorParameters:
+                DoParameters(globals);
+                break;
+            case filterSelectorPrepare:
+                DoPrepare(globals);
+                break;
+            case filterSelectorStart:
+                DoStart(globals);
+                break;
+            case filterSelectorContinue:
+                DoContinue(globals);
+                break;
+            case filterSelectorFinish:
+                DoFinish(globals);
+                break;
+            default:
+                gResult = filterBadParameters;
+                break;
+        }
+
+        if ((Handle)*data != NULL)
+            PIUnlockHandle((Handle)*data);
+    }
+}
+
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Dialog.h opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Dialog.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Dialog.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Dialog.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,88 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef _OPENCOLORIO_PS_DIALOG_H_
+#define _OPENCOLORIO_PS_DIALOG_H_
+
+#include <string>
+
+enum DialogResult
+{
+    RESULT_OK,
+    RESULT_CANCEL,
+    RESULT_EXPORT
+};
+
+enum DialogSource
+{
+    SOURCE_ENVIRONMENT,
+    SOURCE_STANDARD,
+    SOURCE_CUSTOM
+};
+
+enum DialogAction
+{
+    ACTION_LUT,
+    ACTION_CONVERT,
+    ACTION_DISPLAY
+};
+
+enum DialogInterp
+{
+    INTERPO_NEAREST,
+    INTERPO_LINEAR,
+    INTERPO_TETRAHEDRAL,
+    INTERPO_BEST
+};
+
+typedef struct DialogParams
+{
+    DialogSource    source;
+    std::string     config; // path when source == SOURCE_CUSTOM
+    DialogAction    action;
+    bool            invert;
+    DialogInterp    interpolation;
+    std::string     inputSpace;
+    std::string     outputSpace;
+    std::string     device;
+    std::string     transform;
+} DialogParams;
+
+
+// return true if user hit OK
+// if user hit OK, params block will have been modified
+//
+// send in block of parameters
+// plugHndl is bundle identifier string on Mac, hInstance on win
+// mwnd is the main window, Windows only (NULL on Mac)
+
+DialogResult OpenColorIO_PS_Dialog(DialogParams &params, const void *plugHndl, const void *mwnd);
+
+void OpenColorIO_PS_About(const void *plugHndl, const void *mwnd);
+
+#endif // _OPENCOLORIO_PS_DIALOG_H_
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS.h opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,107 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef _OPENCOLORIO_PS_H_
+#define _OPENCOLORIO_PS_H_
+
+//#include "PIDefines.h"
+#include "PIFilter.h"
+#include "PIUtilities.h"
+#include "FilterBigDocument.h"
+
+
+enum {
+    OCIO_SOURCE_NONE = 0,
+    OCIO_SOURCE_ENVIRONMENT,
+    OCIO_SOURCE_STANDARD,
+    OCIO_SOURCE_CUSTOM
+};
+typedef uint8 OCIO_Source;
+
+enum {
+    OCIO_ACTION_NONE = 0,
+    OCIO_ACTION_LUT,
+    OCIO_ACTION_CONVERT,
+    OCIO_ACTION_DISPLAY
+};
+typedef uint8 OCIO_Action;
+
+enum {
+    OCIO_INTERP_UNKNOWN = 0,
+    OCIO_INTERP_NEAREST = 1,
+    OCIO_INTERP_LINEAR = 2,
+    OCIO_INTERP_TETRAHEDRAL = 3,
+    OCIO_INTERP_BEST = 255
+};
+typedef uint8 OCIO_Interp;
+
+
+// this stuff would usually be in a header file
+typedef struct Globals
+{
+    short                   *result;                // Must always be first in Globals.
+    FilterRecord            *filterParamBlock;      // Must always be second in Globals.
+
+    Boolean                 do_dialog;
+    
+    OCIO_Source             source;
+    Str255                  configName;
+    PIPlatformFileHandle    configFileHandle;
+    OCIO_Action             action;
+    Boolean                 invert;
+    OCIO_Interp             interpolation;
+    Str255                  inputSpace;
+    Str255                  outputSpace;
+    Str255                  device;
+    Str255                  transform;
+} Globals, *GPtr, **GHdl;
+
+
+// some of the lame-ass supporting code needs this
+extern SPBasicSuite *sSPBasic;
+extern FilterRecord *gFilterRecord;
+
+#define gResult             (*(globals->result))
+#define gStuff              (globals->filterParamBlock)
+
+#ifdef PS_CS4_SDK
+typedef intptr_t entryData;
+typedef void * allocateGlobalsPointer;
+#else
+typedef long entryData;
+typedef uint32 allocateGlobalsPointer;
+#endif
+
+// our entry function
+DLLExport SPAPI void PluginMain(const int16 selector,
+                                FilterRecord * filterRecord,
+                                entryData * data,
+                                int16 * result);
+
+
+#endif // _OPENCOLORIO_PS_H_
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS.r opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS.r
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS.r	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS.r	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,302 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "OpenColorIO_PS_Version.h"
+
+// Definitions
+#define plugInName          "OpenColorIO"
+#define plugInCopyrightYear OpenColorIO_PS_Copyright_Year
+#define plugInDescription  OpenColorIO_PS_Description
+#define VersionString   OpenColorIO_PS_Version_String
+#define ReleaseString   OpenColorIO_PS_Build_Date_Manual
+#define CurrentYear     OpenColorIO_PS_Build_Year
+
+// dictionary (aete) definitions
+#define vendorName          "fnord"
+#define plugInAETEComment   "OpenColorIO"
+
+#define plugInSuiteID       'ocio'
+#define plugInClassID       plugInSuiteID
+#define plugInEventID       plugInClassID
+
+#include "PIDefines.h"
+
+#ifdef __PIMac__
+    #include "Types.r"
+    #include "SysTypes.r"
+    #include "PIGeneral.r"
+    #include "PIUtilities.r"
+#elif defined(__PIWin__)
+    #define Rez
+    #include "PIGeneral.h"
+    #include "PIUtilities.r"
+#endif
+
+#include "PITerminology.h"
+#include "PIActions.h"
+
+#include "OpenColorIO_PS_Terminology.h"
+
+
+resource 'PiPL' ( 16000, "OpenColorIO", purgeable )
+{
+    {
+        Kind { Filter },
+        Name { plugInName "..."},
+        Category { "OpenColorIO" },
+        Version { (latestFilterVersion << 16) | latestFilterSubVersion },
+
+        #ifdef __PIMac__
+            #if (defined(__x86_64__))
+                CodeMacIntel64 { "PluginMain" },
+            #endif
+            #if (defined(__i386__))
+                CodeMacIntel32 { "PluginMain" },
+            #endif
+            #if (defined(__ppc__))
+                CodeMachOPowerPC { 0, 0, "PluginMain" },
+            #endif
+        #else
+            #if defined(_WIN64)
+                CodeWin64X86 { "PluginMain" },
+            #else
+                CodeWin32X86 { "PluginMain" },
+            #endif
+        #endif
+
+        // ClassID, eventID, aete ID, uniqueString:
+        HasTerminology { plugInClassID, plugInEventID, ResourceID, vendorName " " plugInName },
+
+        SupportedModes
+        {
+            noBitmap, noGrayScale,
+            noIndexedColor, doesSupportRGBColor,
+            noCMYKColor, noHSLColor,
+            noHSBColor, noMultichannel,
+            noDuotone, noLABColor
+        },
+            
+        EnableInfo
+        {
+            "in (PSHOP_ImageMode, RGBMode, RGB48Mode, RGB96Mode)"
+        },
+
+        FilterLayerSupport {doesSupportFilterLayers}, // lets us work on smart objects
+
+        PlugInMaxSize { 2000000, 2000000 },
+
+        FilterCaseInfo {
+            {   /* array: 7 elements */
+                /* Flat data, no selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination,
+                /* Flat data with selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination,
+                /* Floating selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination,
+                /* Editable transparency, no selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination,
+                /* Editable transparency, with selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination,
+                /* Preserved transparency, no selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination,
+                /* Preserved transparency, with selection */
+                inStraightData,
+                outStraightData,
+                doNotWriteOutsideSelection,
+                doesNotFilterLayerMasks,
+                doesNotWorkWithBlankData,
+                copySourceToDestination
+            }
+        }
+    }
+};
+
+resource 'aete' (ResourceID, plugInName " dictionary", purgeable)
+{
+    1, 0, english, roman,                                   /* aete version and language specifiers */
+    {
+        vendorName,                                         /* vendor suite name */
+        "OpenColorIO",                                 /* optional description */
+        plugInSuiteID,                                      /* suite ID */
+        1,                                                  /* suite code, must be 1 */
+        1,                                                  /* suite level, must be 1 */
+        {                                                   /* structure for filters */
+            plugInName,                                     /* unique filter name */
+            plugInAETEComment,                              /* optional description */
+            plugInClassID,                                  /* class ID, must be unique or Suite ID */
+            plugInEventID,                                  /* event ID, must be unique */
+            
+            NO_REPLY,                                       /* never a reply */
+            IMAGE_DIRECT_PARAMETER,                         /* direct parameter, used by Photoshop */
+            {                                               /* parameters here, if any */
+                "Source",                                   /* parameter name */
+                ocioKeySource,                                  /* parameter key ID */
+                typeSource,                                 /* parameter type ID */
+                "Source of the OCIO configuration",         /* optional description */
+                flagsEnumeratedParameter,                   /* parameter flags */               
+
+                "Configuration",
+                ocioKeyConfigName,
+                typeChar,
+                "OCIO Configuration Name",
+                flagsSingleParameter,       
+
+                "File",
+                ocioKeyConfigFileHandle,
+                typePlatformFilePath,
+                "OCIO Configuration File",
+                flagsSingleParameter,       
+
+                "Action",
+                ocioKeyAction,
+                typeAction,
+                "OCIO Action",
+                flagsEnumeratedParameter,
+                
+                "Invert",
+                ocioKeyInvert,
+                typeBoolean,
+                "Invert LUT",
+                flagsSingleParameter,
+                
+                "Interpolation",
+                ocioKeyInterpolation,
+                typeInterpolation,
+                "OCIO Interpolation",
+                flagsEnumeratedParameter,
+                
+                "Input Space",
+                ocioKeyInputSpace,
+                typeChar,
+                "OCIO Input Space",
+                flagsSingleParameter,
+                
+                "Output Space",
+                ocioKeyOutputSpace,
+                typeChar,
+                "OCIO Output Space",
+                flagsSingleParameter,
+                
+                "Transform",
+                ocioKeyTransform,
+                typeChar,
+                "OCIO Transform",
+                flagsSingleParameter,
+                
+                "Device",
+                ocioKeyDevice,
+                typeChar,
+                "OCIO Device",
+                flagsSingleParameter
+            }
+        },
+        {},                                                 /* non-filter plug-in class here */
+        {},                                                 /* comparison ops (not supported) */
+        {                                                   /* any enumerations */
+            typeSource,
+            {
+                "Environment",
+                sourceEnvironment,
+                "$OCIO Environment Variable",
+                
+                "Standard",
+                sourceStandard,
+                "Standard OCIO Configuration",
+                
+                "Custom",
+                sourceCustom,
+                "Custom Configuration Path"
+            },
+            
+            typeAction,
+            {
+                "LUT",
+                actionLUT,
+                "Apply a LUT",
+                
+                "Convert",
+                actionConvert,
+                "Convert Transform",
+                
+                "Display",
+                actionDisplay,
+                "Display Transform"
+            },
+            
+            typeInterpolation,
+            {
+                "Nearest",
+                interpNearest,
+                "Nearest Interpolation",
+                
+                "Linear",
+                interpLinear,
+                "Linear Interpolation",
+                
+                "Tetrahedral",
+                interpTetrahedral,
+                "Tetrahedral Interpolation",
+                
+                "Best",
+                interpBest,
+                "Best Interpolation"
+            }
+        }
+    }
+};
+
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Terminology.h opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Terminology.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Terminology.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Terminology.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#define OpenColorIOSignature    'ocio'
+
+#define ocioKeySource           'oSrc'
+#define ocioKeyConfigName       'oCfN'
+#define ocioKeyConfigFileHandle 'oCfH'
+#define ocioKeyAction           'oAct'
+#define ocioKeyInvert           'oInv'
+#define ocioKeyInterpolation    'oInt'
+#define ocioKeyInputSpace       'oInp'
+#define ocioKeyOutputSpace      'oOut'
+#define ocioKeyTransform        'oTrn'
+#define ocioKeyDevice           'oDev'
+
+#define typeSource          'tSrc'
+#define sourceEnvironment   'sEnv'
+#define sourceStandard      'sStd'
+#define sourceCustom        'sCus'
+
+#define typeAction          'tAct'
+#define actionLUT           'aLUT'
+#define actionConvert       'aCvt'
+#define actionDisplay       'aDis'
+
+#define typeInterpolation   'tInt'
+#define interpNearest       'tNer'
+#define interpLinear        'tLin'
+#define interpTetrahedral   'tTet'
+#define interpBest          'tBst'
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Version.h opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Version.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/OpenColorIO_PS_Version.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/OpenColorIO_PS_Version.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+Copyright (c) 2003-2017 Sony Pictures Imageworks Inc., et al.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of Sony Pictures Imageworks nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef _OPENCOLORIO_PS_VERSION_H_
+#define _OPENCOLORIO_PS_VERSION_H_
+
+
+#define OpenColorIO_PS_Major_Version 1
+#define OpenColorIO_PS_Minor_Version 0
+#define OpenColorIO_PS_Version_String "1.0"
+#define OpenColorIO_PS_Beta_String "Beta 4"
+#define OpenColorIO_PS_Build_Date __DATE__
+#define OpenColorIO_PS_Build_Date_Manual "13 February 2017"
+#define OpenColorIO_PS_Build_Complete_Manual "v1.0 Beta 4 - " OpenColorIO_PS_Build_Date
+#define OpenColorIO_PS_Copyright_Year "2017"
+#define OpenColorIO_PS_Build_Year "2017"
+
+#define OpenColorIO_PS_Description "OpenColorIO"
+
+
+#endif // _OPENCOLORIO_PS_VERSION_H_
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.sln opencolorio-1.1.0~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.sln
--- opencolorio-1.0.9~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.sln	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.sln	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,72 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenColorIO_PS", "OpenColorIO_PS.vcproj", "{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930} = {069FB60C-57CE-4D0F-9EC2-068E2A3F2930}
+		{8B308357-C548-49D9-9134-8A61D57D524C} = {8B308357-C548-49D9-9134-8A61D57D524C}
+		{A19BA95E-D8ED-4958-883B-32561AF905EA} = {A19BA95E-D8ED-4958-883B-32561AF905EA}
+		{F1DAC6DE-348A-4215-87B2-7584578291AC} = {F1DAC6DE-348A-4215-87B2-7584578291AC}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenColorIO", "..\..\..\aftereffects\vc\vc9\OpenColorIO.vcproj", "{8B308357-C548-49D9-9134-8A61D57D524C}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lcms", "..\..\..\aftereffects\vc\vc9\ext\lcms.vcproj", "{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "..\..\..\aftereffects\vc\vc9\ext\tinyxml.vcproj", "{A19BA95E-D8ED-4958-883B-32561AF905EA}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yaml", "..\..\..\aftereffects\vc\vc9\ext\yaml.vcproj", "{F1DAC6DE-348A-4215-87B2-7584578291AC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Debug|Win32.Build.0 = Debug|Win32
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Debug|x64.ActiveCfg = Debug|x64
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Debug|x64.Build.0 = Debug|x64
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Release|Win32.ActiveCfg = Release|Win32
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Release|Win32.Build.0 = Release|Win32
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Release|x64.ActiveCfg = Release|x64
+		{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}.Release|x64.Build.0 = Release|x64
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Debug|Win32.Build.0 = Debug|Win32
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Debug|x64.ActiveCfg = Debug|x64
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Debug|x64.Build.0 = Debug|x64
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Release|Win32.ActiveCfg = Release|Win32
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Release|Win32.Build.0 = Release|Win32
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Release|x64.ActiveCfg = Release|x64
+		{8B308357-C548-49D9-9134-8A61D57D524C}.Release|x64.Build.0 = Release|x64
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Debug|Win32.ActiveCfg = Debug|Win32
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Debug|Win32.Build.0 = Debug|Win32
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Debug|x64.ActiveCfg = Debug|x64
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Debug|x64.Build.0 = Debug|x64
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Release|Win32.ActiveCfg = Release|Win32
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Release|Win32.Build.0 = Release|Win32
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Release|x64.ActiveCfg = Release|x64
+		{069FB60C-57CE-4D0F-9EC2-068E2A3F2930}.Release|x64.Build.0 = Release|x64
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Debug|Win32.Build.0 = Debug|Win32
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Debug|x64.ActiveCfg = Debug|x64
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Debug|x64.Build.0 = Debug|x64
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Release|Win32.ActiveCfg = Release|Win32
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Release|Win32.Build.0 = Release|Win32
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Release|x64.ActiveCfg = Release|x64
+		{A19BA95E-D8ED-4958-883B-32561AF905EA}.Release|x64.Build.0 = Release|x64
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Debug|Win32.Build.0 = Debug|Win32
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Debug|x64.ActiveCfg = Debug|x64
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Debug|x64.Build.0 = Debug|x64
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Release|Win32.ActiveCfg = Release|Win32
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Release|Win32.Build.0 = Release|Win32
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Release|x64.ActiveCfg = Release|x64
+		{F1DAC6DE-348A-4215-87B2-7584578291AC}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.vcproj opencolorio-1.1.0~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.vcproj
--- opencolorio-1.0.9~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.vcproj	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/vc/vc9/OpenColorIO_PS.vcproj	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,858 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="OpenColorIO_PS"
+	ProjectGUID="{7C8F25C0-1ADD-4A2B-961E-2FCFDF5E6D2B}"
+	RootNamespace="OpenColorIO_PS"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/Dissolve.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\aftereffects;..\..\..\aftereffects\vc\vc9;..\..\..\apps\ociobakelut;..\..\..\..\export;..\..\..\..\ext\boost_1_48_0;&quot;..\..\..\..\ext\lcms2-2.1\include&quot;;&quot;..\..\..\..\ext\glew-1.7.0\include&quot;;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\PICA_SP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_USRDLL;PS_CS4_SDK;SUPPLY_HINSTANCE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib version.lib Mscms.lib"
+				OutputFile="$(OutDir)\OpenColorIO PS.8bf"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release/Dissolve.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)\OpenColorIO_PS.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Release64/Dissolve.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\aftereffects;..\..\..\aftereffects\vc\vc9;..\..\..\apps\ociobakelut;..\..\..\..\export;..\..\..\..\ext\boost_1_48_0;&quot;..\..\..\..\ext\lcms2-2.1\include&quot;;&quot;..\..\..\..\ext\glew-1.7.0\include&quot;;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\PICA_SP"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_USRDLL;PS_CS4_SDK;SUPPLY_HINSTANCE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib version.lib Mscms.lib"
+				OutputFile="$(OutDir)\OpenColorIO PS.8bf"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				ProgramDatabaseFile=".\Release64/Dissolve.pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)\OpenColorIO_PS.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/Dissolve.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\aftereffects;..\..\..\aftereffects\vc\vc9;..\..\..\apps\ociobakelut;..\..\..\..\export;..\..\..\..\ext\boost_1_48_0;&quot;..\..\..\..\ext\lcms2-2.1\include&quot;;&quot;..\..\..\..\ext\glew-1.7.0\include&quot;;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\PICA_SP"
+				PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;PS_CS4_SDK;SUPPLY_HINSTANCE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib version.lib Mscms.lib"
+				OutputFile="$(OutDir)\OpenColorIO PS.8bf"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)\OpenColorIO_PS.lib"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Debug|x64"
+			OutputDirectory="build\$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(ProjectName)\$(PlatformName)\$(ConfigurationName)"
+			ConfigurationType="2"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="3"
+				TypeLibraryName=".\Debug64/Dissolve.tlb"
+				HeaderFileName=""
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\aftereffects;..\..\..\aftereffects\vc\vc9;..\..\..\apps\ociobakelut;..\..\..\..\export;..\..\..\..\ext\boost_1_48_0;&quot;..\..\..\..\ext\lcms2-2.1\include&quot;;&quot;..\..\..\..\ext\glew-1.7.0\include&quot;;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\..\PhotoshopAPI\PICA_SP"
+				PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_USRDLL;PS_CS4_SDK;SUPPLY_HINSTANCE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				BrowseInformation="1"
+				WarningLevel="3"
+				SuppressStartupBanner="true"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1033"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="odbc32.lib odbccp32.lib version.lib Mscms.lib"
+				OutputFile="$(OutDir)\OpenColorIO PS.8bf"
+				LinkIncremental="2"
+				SuppressStartupBanner="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(IntDir)\$(TargetName).pdb"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
+				ImportLibrary="$(IntDir)\OpenColorIO_PS.lib"
+				TargetMachine="17"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\..\..\apps\ociobakelut\ocioicc.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\aftereffects\win\OpenColorIO_AE_Dialogs_Win.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS_Context.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\win\OpenColorIO_PS_Dialogs_Win.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\..\..\apps\ociobakelut\ocioicc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\aftereffects\OpenColorIO_AE_Dialogs.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS_Context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS_Dialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS_Terminology.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS_Version.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+			>
+			<File
+				RelativePath="..\..\..\aftereffects\win\OpenColorIO.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\OpenColorIO_PS.r"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Resources&quot; /I&quot;..\..&quot; /EP /DMSWindows=1 /DWIN32=1 /Tc&quot;$(InputPath)&quot; &gt; &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\resources\cnvtpipl.exe&quot; &quot;$(IntDir)\$(InputName).rr&quot; &quot;$(InputName).rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;"
+						Outputs="$(InputName).rc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Resources&quot; /I&quot;..\..&quot; /EP /DMSWindows=1 /DWIN32=1 /Tc&quot;$(InputPath)&quot; &gt; &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\resources\cnvtpipl.exe&quot; &quot;$(IntDir)\$(InputName).rr&quot; &quot;$(InputName)_x64.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;"
+						Outputs="$(InputName).rc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Resources&quot; /I&quot;..\..&quot; /EP /DMSWindows=1 /DWIN32=1 /Tc&quot;$(InputPath)&quot; &gt; &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\resources\cnvtpipl.exe&quot; &quot;$(IntDir)\$(InputName).rr&quot; &quot;$(InputName).rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;"
+						Outputs="$(InputName).rc"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="cl /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Includes&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\Photoshop&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\PhotoshopAPI\PICA_SP&quot; /I&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Resources&quot; /I&quot;..\..&quot; /EP /DMSWindows=1 /DWIN32=1 /Tc&quot;$(InputPath)&quot; &gt; &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;&quot;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\resources\cnvtpipl.exe&quot; &quot;$(IntDir)\$(InputName).rr&quot; &quot;$(InputName)_x64.rc&quot;&#x0D;&#x0A;del &quot;$(IntDir)\$(InputName).rr&quot;&#x0D;&#x0A;"
+						Outputs="$(InputName).rc"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="OpenColorIO_PS.rc"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="..\Common;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\AS;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PICA;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PS-Suites;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\resources;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\Output\Objs\Dissolve\Release"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="..\Common;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\AS;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PICA;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PS-Suites;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\resources;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\Output\Objs\Dissolve\Release64"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="..\Common;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\AS;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PICA;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PS-Suites;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\resources;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\Output\Objs\Dissolve\Debug"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+						PreprocessorDefinitions=""
+						AdditionalIncludeDirectories="..\Common;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\ADM;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\AS;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PICA;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\Photoshop\PS-Suites;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Headers\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\Photoshop;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Rez-files\SDK;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\resources;..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\Output\Objs\Dissolve\Debug64"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\win\OpenColorIO_PS_Dialog.rc"
+				>
+			</File>
+			<File
+				RelativePath=".\OpenColorIO_PS_x64.rc"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					ExcludedFromBuild="true"
+					>
+					<Tool
+						Name="VCResourceCompilerTool"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Common Sources"
+			Filter="*.c*;*.h*;"
+			>
+			<File
+				RelativePath="..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\sources\DialogUtilitiesWin.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\sources\FilterBigDocument.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\sources\PIDLLInstance.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\sources\PIUSuites.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\Sources\PIUtilities.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\..\..\..\ext\adobe_photoshop_cs5_sdk_win\pluginsdk\samplecode\common\sources\PIUtilitiesWin.cpp"
+				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="2"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ISOLATION_AWARE_ENABLED=1;WIN32=1;NDEBUG;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Debug|x64"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						AdditionalIncludeDirectories=""
+						PreprocessorDefinitions="ISOLATION_AWARE_ENABLED=1;WIN32=1;_DEBUG;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_DEPRECATE;_WINDOWS;_MBCS;_USRDLL;DISSOLVE_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						BrowseInformation="1"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialog.rc opencolorio-1.1.0~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialog.rc
--- opencolorio-1.0.9~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialog.rc	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialog.rc	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,92 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource1.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource1.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+OCIODIALOG DIALOGEX 0, 0, 316, 168
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "OpenColorIO"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,205,147,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,259,147,50,14
+    PUSHBUTTON      "Export...",3,7,147,50,14
+    RTEXT           "Configuration:",4,71,16,47,8
+    COMBOBOX        5,125,14,99,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Convert",6,"Button",BS_AUTORADIOBUTTON,84,40,42,10
+    CONTROL         "Display",7,"Button",BS_AUTORADIOBUTTON,155,40,39,10
+    RTEXT           "Input Space:",8,77,65,42,8
+    COMBOBOX        9,125,63,99,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Output Space:",11,71,88,48,8
+    COMBOBOX        12,125,87,99,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    RTEXT           "Transform:",14,83,112,36,8
+    COMBOBOX        15,125,111,99,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    CONTROL         "Invert",16,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,250,65,36,10
+    PUSHBUTTON      ">",10,230,62,15,14
+    PUSHBUTTON      ">",13,230,86,15,14
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialogs_Win.cpp opencolorio-1.1.0~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialogs_Win.cpp
--- opencolorio-1.0.9~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialogs_Win.cpp	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/win/OpenColorIO_PS_Dialogs_Win.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,1037 @@
+
+#include "OpenColorIO_PS_Dialog.h"
+
+#include <Windows.h>
+#include <Shlobj.h>
+//#include <commctrl.h>
+//#include <stdio.h>
+
+#include <fstream>
+#include <map>
+#include <cstdlib>
+
+#include "OpenColorIO_PS_Context.h"
+#include "OpenColorIO_PS_Version.h"
+
+#include "OpenColorIO_AE_Dialogs.h"
+
+#include "ocioicc.h"
+
+
+static HINSTANCE hDllInstance = NULL;
+
+enum {
+    DLOG_noUI = -1,
+	DLOG_OK = IDOK,
+	DLOG_Cancel = IDCANCEL,
+	DLOG_Export = 3,
+	DLOG_Configuration_Label,
+	DLOG_Configuration_Menu,
+	DLOG_Convert_Radio,
+	DLOG_Display_Radio,
+	DLOG_Menu1_Label,
+	DLOG_Menu1_Menu,
+	DLOG_Menu1_Button,
+	DLOG_Menu2_Label,
+	DLOG_Menu2_Menu,
+	DLOG_Menu2_Button,
+	DLOG_Menu3_Label,
+	DLOG_Menu3_Menu,
+	DLOG_Invert_Check
+};
+
+static DialogSource    g_source;
+static std::string     g_config; // path when source == SOURCE_CUSTOM
+static DialogAction    g_action;
+static bool            g_invert;
+static DialogInterp    g_interpolation;
+static std::string     g_inputSpace;
+static std::string     g_outputSpace;
+static std::string     g_device;
+static std::string     g_transform;
+
+static WORD	g_item_clicked = 0;
+
+static OpenColorIO_PS_Context *g_context = NULL;
+
+static HWND g_configutationToolTip = NULL;
+
+// sensible Win macros
+#define GET_ITEM(ITEM)	GetDlgItem(hwndDlg, (ITEM))
+
+#define SET_LABEL_STRING(ITEM, STRING)	SetDlgItemText(hwndDlg, (ITEM), (STRING));
+
+#define SET_CHECK(ITEM, VAL)	SendMessage(GET_ITEM(ITEM), BM_SETCHECK, (WPARAM)(VAL), (LPARAM)0)
+#define GET_CHECK(ITEM)			SendMessage(GET_ITEM(ITEM), BM_GETCHECK, (WPARAM)0, (LPARAM)0)
+
+#define ADD_MENU_ITEM(MENU, INDEX, STRING, VALUE, SELECTED) \
+				SendMessage(GET_ITEM(MENU),( UINT)CB_ADDSTRING, (WPARAM)0, (LPARAM)(LPCTSTR)STRING ); \
+				SendMessage(GET_ITEM(MENU),(UINT)CB_SETITEMDATA, (WPARAM)INDEX, (LPARAM)(DWORD)VALUE); \
+				if(SELECTED) \
+					SendMessage(GET_ITEM(MENU), CB_SETCURSEL, (WPARAM)INDEX, (LPARAM)0);
+
+#define GET_NUMBER_MENU_ITEMS(MENU)	SendMessage(GET_ITEM(MENU), CB_GETCOUNT , (WPARAM)0, (LPARAM)0);
+//#define GET_VALUE_OF_MENU_ITEM(MENU, INDEX)	SendMessage(GET_ITEM(MENU), CB_GETITEMDATA, (WPARAM)(INDEX), (LPARAM)0);
+#define GET_STRING_OF_MENU_ITEM(MENU, INDEX, BUF)	SendMessage(GET_ITEM(MENU), (UINT)CB_GETLBTEXT, (WPARAM)(INDEX), (LPARAM)(BUF))
+
+#define GET_MENU_VALUE(MENU)		SendMessage(GET_ITEM(MENU), (UINT)CB_GETITEMDATA, (WPARAM)SendMessage(GET_ITEM(MENU),(UINT)CB_GETCURSEL, (WPARAM)0, (LPARAM)0), (LPARAM)0)
+
+#define GET_MENU_VALUE_STRING(MENU, BUF)	SendMessage(GET_ITEM(MENU), (UINT)CB_GETLBTEXT, (WPARAM)SendMessage(GET_ITEM(MENU),(UINT)CB_GETCURSEL, (WPARAM)0, (LPARAM)0), (LPARAM)(BUF))
+
+#define SELECT_STRING_ITEM(MENU, STRING)	SendMessage(GET_ITEM(MENU), CB_SELECTSTRING, (WPARAM)-1, (LPARAM)(STRING));
+
+#define REMOVE_ALL_MENU_ITEMS(MENU)	SendMessage(GET_ITEM(MENU), CB_RESETCONTENT, (WPARAM)0, (LPARAM)0);
+
+#define ENABLE_ITEM(ITEM, ENABLE)	EnableWindow(GetDlgItem(hwndDlg, (ITEM)), (ENABLE));
+
+#define SHOW_ITEM(ITEM, SHOW)		ShowWindow(GetDlgItem(hwndDlg, (ITEM)), (SHOW) ? SW_SHOW : SW_HIDE)
+
+static void TrackInvert(HWND hwndDlg, bool readFromControl)
+{
+	assert(readFromControl); // should always be from the control
+
+	g_invert = GET_CHECK(DLOG_Invert_Check);
+}
+
+static void TrackMenu3(HWND hwndDlg, bool readFromControl)
+{
+    assert(g_action == ACTION_DISPLAY);
+    
+    const int transformMenu = DLOG_Menu3_Menu;
+
+    if(readFromControl)
+    {
+		char buf[256];
+
+		GET_MENU_VALUE_STRING(transformMenu, buf);
+
+		g_transform = buf;
+    }
+	else
+    {
+        // set menu from value
+		bool match = false;
+
+		const int numberOfItems = GET_NUMBER_MENU_ITEMS(transformMenu);
+		
+		for(int i=0; i < numberOfItems && !match; i++)
+		{
+			char buf[256];
+
+			GET_STRING_OF_MENU_ITEM(transformMenu, i, buf);
+
+			if(g_transform == buf)
+			{
+				match = true;
+
+				SendMessage(GET_ITEM(transformMenu), CB_SETCURSEL, (WPARAM)i, (LPARAM)0);
+			}
+		}
+		
+		
+		if(!match)
+		{
+			const std::string defaultTransform = g_context->getDefaultTransform(g_device);
+			
+			for(int i=0; i < numberOfItems && !match; i++)
+			{
+				char buf[256];
+
+				GET_STRING_OF_MENU_ITEM(transformMenu, i, buf);
+
+				if(defaultTransform == buf)
+				{
+					SendMessage(GET_ITEM(transformMenu), CB_SETCURSEL, (WPARAM)i, (LPARAM)0);
+				}
+			}
+
+			g_transform = defaultTransform;
+		}
+    }
+}
+
+static void TrackMenu2(HWND hwndDlg, bool readFromControl)
+{
+    if(g_action == ACTION_DISPLAY)
+    {
+        const int deviceMenu = DLOG_Menu2_Menu;
+        
+		if(readFromControl)
+		{
+			char buf[256];
+
+			GET_MENU_VALUE_STRING(deviceMenu, buf);
+
+			g_device = buf;
+		}
+		else
+		{
+			SELECT_STRING_ITEM(deviceMenu, g_device.c_str());
+		}
+    }
+    else
+    {
+        assert(g_action == ACTION_CONVERT);
+        
+		const int outputMenu = DLOG_Menu2_Menu;
+        
+		if(readFromControl)
+		{
+			char buf[256];
+
+			GET_MENU_VALUE_STRING(outputMenu, buf);
+
+			g_outputSpace = buf;
+		}
+		else
+		{
+			SELECT_STRING_ITEM(outputMenu, g_outputSpace.c_str());
+		}
+    }
+    
+    
+    if(g_action == ACTION_DISPLAY)
+    {
+        const SpaceVec transforms = g_context->getTransforms(g_device);
+        
+		const int transformMenu = DLOG_Menu3_Menu;
+        
+		REMOVE_ALL_MENU_ITEMS(transformMenu);
+        
+		int index = 0;
+
+        for(SpaceVec::const_iterator i = transforms.begin(); i != transforms.end(); ++i)
+        {
+			ADD_MENU_ITEM(transformMenu, index, i->c_str(), index, (g_transform == *i));
+			index++;
+        }
+        
+        TrackMenu3(hwndDlg, false);
+    }
+}
+
+static void TrackMenu1(HWND hwndDlg, bool readFromControl)
+{
+	assert(readFromControl); // should always be from the control
+
+    if(g_action == ACTION_LUT)
+    {
+        g_interpolation = (DialogInterp)GET_MENU_VALUE(DLOG_Menu1_Menu);
+    }
+    else
+    {
+		char buf[256] = { '\0' };
+
+		GET_MENU_VALUE_STRING(DLOG_Menu1_Menu, buf);
+
+        g_inputSpace = buf;
+    }
+}
+
+static void TrackMenu1Button(HWND hwndDlg)
+{
+    if(g_context != NULL)
+    {
+        const bool chosen = ColorSpacePopUpMenu(g_context->getConfig(), g_inputSpace, false, hwndDlg);
+        
+        if(chosen)
+        {
+			const int inputSpaceMenu = DLOG_Menu1_Menu;
+
+			const int numberOfItems = GET_NUMBER_MENU_ITEMS(inputSpaceMenu);
+			
+			for(int i=0; i < numberOfItems; i++)
+			{
+				char buf[256];
+
+				GET_STRING_OF_MENU_ITEM(inputSpaceMenu, i, buf);
+
+				if(g_inputSpace == buf)
+				{
+					SendMessage(GET_ITEM(inputSpaceMenu), CB_SETCURSEL, (WPARAM)i, (LPARAM)0);
+				}
+			}
+        }
+    }
+}
+
+static void TrackMenu2Button(HWND hwndDlg)
+{
+    if(g_context != NULL)
+    {
+        const bool chosen = ColorSpacePopUpMenu(g_context->getConfig(), g_outputSpace, false, hwndDlg);
+        
+        if(chosen)
+        {
+			const int outputSpaceMenu = DLOG_Menu2_Menu;
+
+			const int numberOfItems = GET_NUMBER_MENU_ITEMS(outputSpaceMenu);
+			
+			for(int i=0; i < numberOfItems; i++)
+			{
+				char buf[256];
+
+				GET_STRING_OF_MENU_ITEM(outputSpaceMenu, i, buf);
+
+				if(g_outputSpace == buf)
+				{
+					SendMessage(GET_ITEM(outputSpaceMenu), CB_SETCURSEL, (WPARAM)i, (LPARAM)0);
+				}
+			}
+        }
+    }
+}
+
+static void TrackActionRadios(HWND hwndDlg, bool readFromControl)
+{
+	if(readFromControl)
+	{
+		if( GET_CHECK(DLOG_Display_Radio) )
+		{
+			g_action = ACTION_DISPLAY;
+		}
+		else
+		{
+			g_action = ACTION_CONVERT;
+		}
+	}
+	else
+	{
+		assert(g_action != ACTION_LUT);
+
+		if(g_action == ACTION_DISPLAY)
+		{
+			SET_CHECK(DLOG_Convert_Radio, FALSE);
+			SET_CHECK(DLOG_Display_Radio, TRUE);
+		}
+		else
+		{
+			SET_CHECK(DLOG_Convert_Radio, TRUE);
+			SET_CHECK(DLOG_Display_Radio, FALSE);
+		}
+	}
+   
+    
+    assert(g_context != NULL);
+    
+    const int inputLabel = DLOG_Menu1_Label;
+	const int inputMenu = DLOG_Menu1_Menu;
+
+	SET_LABEL_STRING(inputLabel, "Input Space:");
+    
+	REMOVE_ALL_MENU_ITEMS(inputMenu);
+    
+    const SpaceVec &colorSpaces = g_context->getColorSpaces();
+    
+	int index = 0;
+
+    for(SpaceVec::const_iterator i = colorSpaces.begin(); i != colorSpaces.end(); ++i)
+    {
+		ADD_MENU_ITEM(inputMenu, index, i->c_str(), index, (g_inputSpace == *i));
+		index++;
+    }
+    
+	SHOW_ITEM(DLOG_Menu1_Button, TRUE);
+    
+    
+    if(g_action == ACTION_DISPLAY)
+    {
+        const int deviceLabel = DLOG_Menu2_Label;
+        const int deviceMenu = DLOG_Menu2_Menu;
+        
+        const int transformLabel = DLOG_Menu3_Label;
+        const int transformMenu = DLOG_Menu3_Menu;
+        
+		SET_LABEL_STRING(deviceLabel, "Device:");
+		SHOW_ITEM(deviceLabel, TRUE);
+
+		SHOW_ITEM(deviceMenu, TRUE);
+        
+		REMOVE_ALL_MENU_ITEMS(deviceMenu);
+        
+        const SpaceVec &devices = g_context->getDevices();
+        
+		index = 0;
+
+        for(SpaceVec::const_iterator i = devices.begin(); i != devices.end(); ++i)
+        {
+			ADD_MENU_ITEM(deviceMenu, index, i->c_str(), index, (g_device == *i));
+			index++;
+        }
+        
+        SHOW_ITEM(DLOG_Menu2_Button, FALSE);
+                
+        
+		SET_LABEL_STRING(transformLabel, "Device:");
+		SHOW_ITEM(transformLabel, TRUE);
+
+		SHOW_ITEM(transformMenu, TRUE);
+        
+		REMOVE_ALL_MENU_ITEMS(transformMenu);
+        
+
+        TrackMenu2(hwndDlg, false);
+    }
+    else
+    {
+        assert(g_action == ACTION_CONVERT);
+        
+        const int outputLabel = DLOG_Menu2_Label;
+        const int outputMenu = DLOG_Menu2_Menu;
+        
+		SET_LABEL_STRING(outputLabel, "Output Space:");
+		SHOW_ITEM(outputLabel, TRUE);
+
+		SHOW_ITEM(outputMenu, TRUE);
+        
+		REMOVE_ALL_MENU_ITEMS(outputMenu);
+        
+		index = 0;
+
+        for(SpaceVec::const_iterator i = colorSpaces.begin(); i != colorSpaces.end(); ++i)
+        {
+			ADD_MENU_ITEM(outputMenu, index, i->c_str(), index, (g_outputSpace == *i));
+			index++;
+        }
+        
+        SHOW_ITEM(DLOG_Menu2_Button, TRUE);
+        
+        
+		SHOW_ITEM(DLOG_Menu3_Label, FALSE);
+		SHOW_ITEM(DLOG_Menu3_Menu, FALSE);
+    }
+}
+
+enum {
+	CONFIG_ENVIRONMENT = 0,
+	CONFIG_SEPERATOR,
+	CONFIG_STANDARD,
+	CONFIG_CUSTOM
+};
+
+static void TrackConfigMenu(HWND hwndDlg, bool readFromControl)
+{
+	std::string configPath;
+
+	if(readFromControl)
+	{
+		const LRESULT source = GET_MENU_VALUE(DLOG_Configuration_Menu);
+
+		if(source == CONFIG_SEPERATOR)
+		{
+			// invalid, read from params
+			TrackConfigMenu(hwndDlg, false);
+			return;
+		}
+		else if(source == CONFIG_ENVIRONMENT)
+		{
+			char *envFile = std::getenv("OCIO");
+
+			g_source = SOURCE_ENVIRONMENT;
+			
+			if(envFile != NULL)
+			{
+				configPath = envFile;
+			}
+		}
+		else if(source == CONFIG_CUSTOM)
+		{
+			ExtensionMap extensions;
+
+            for(int i=0; i < OCIO::FileTransform::getNumFormats(); ++i)
+            {
+				const std::string extension = OCIO::FileTransform::getFormatExtensionByIndex(i);
+				const std::string format = OCIO::FileTransform::getFormatNameByIndex(i);
+                
+				if(extension != "ccc") // .ccc files require an ID parameter
+					extensions[ extension ] = format;
+            }
+
+			extensions[ "ocio" ] = "OCIO Format";
+
+			char temp_path[256] = { '\0' };
+			
+			const bool clickedOK = OpenFile(temp_path, 255, extensions, hwndDlg);
+
+			if(clickedOK)
+			{
+				g_source = SOURCE_CUSTOM;
+				
+				g_config = temp_path;
+
+				configPath = g_config;
+			}
+			else
+			{
+				// go back to whatever we had
+				TrackConfigMenu(hwndDlg, false);
+				return;
+			}
+		}
+		else
+		{
+			assert(source == CONFIG_STANDARD);
+
+			char menu_string[256] = { '\0' };
+
+			GET_MENU_VALUE_STRING(DLOG_Configuration_Menu, menu_string);
+			
+			g_source = SOURCE_STANDARD;
+
+			g_config = menu_string;
+
+			configPath = GetStdConfigPath(g_config);
+		}
+	}
+	else
+	{
+		if(g_source == SOURCE_ENVIRONMENT)
+		{
+			char *envFile = std::getenv("OCIO");
+
+			SELECT_STRING_ITEM(DLOG_Configuration_Menu, "$OCIO");
+			
+			if(envFile != NULL)
+			{
+				configPath = envFile;
+			}
+		}
+		else if(g_source == SOURCE_CUSTOM)
+		{
+			SELECT_STRING_ITEM(DLOG_Configuration_Menu, "Custom...");
+
+			configPath = g_config;
+		}
+		else
+		{
+			assert(g_source == SOURCE_STANDARD);
+
+			SELECT_STRING_ITEM(DLOG_Configuration_Menu, g_config.c_str());
+
+			configPath = GetStdConfigPath(g_config);
+		}
+	}
+	
+
+    if( !configPath.empty() )
+    {
+        try
+        {
+            delete g_context;
+        
+            g_context = new OpenColorIO_PS_Context(configPath);
+            
+            
+            if( g_context->isLUT() )
+            {
+                g_action = ACTION_LUT;
+                
+				SHOW_ITEM(DLOG_Invert_Check, TRUE);
+                
+                if( g_context->canInvertLUT() )
+                {
+					ENABLE_ITEM(DLOG_Invert_Check, TRUE);
+                }
+                else
+                {
+                    ENABLE_ITEM(DLOG_Invert_Check, FALSE);
+                
+                    g_invert = false;
+                }
+                
+				SET_CHECK(DLOG_Invert_Check, g_invert);
+                
+				SHOW_ITEM(DLOG_Convert_Radio, FALSE);
+				SHOW_ITEM(DLOG_Display_Radio, FALSE);
+
+                
+                const int interpLabel = DLOG_Menu1_Label;
+				const int interpMenu = DLOG_Menu1_Menu;
+
+				const bool canTetrahedral = !g_context->canInvertLUT();
+
+				SET_LABEL_STRING(interpLabel, "Interpolation:");
+                
+                // interpolation menu
+				REMOVE_ALL_MENU_ITEMS(interpMenu);
+
+				ADD_MENU_ITEM(interpMenu, 0, "Nearest Neighbor", INTERPO_NEAREST, (g_interpolation == INTERPO_NEAREST));
+				ADD_MENU_ITEM(interpMenu, 1, "Linear", INTERPO_LINEAR, (g_interpolation == INTERPO_LINEAR));
+
+				if(canTetrahedral)
+					ADD_MENU_ITEM(interpMenu, 2, "Tetrahedral", INTERPO_TETRAHEDRAL, (g_interpolation == INTERPO_TETRAHEDRAL));
+
+				ADD_MENU_ITEM(interpMenu, 3, "Best", INTERPO_BEST, (g_interpolation == INTERPO_BEST));
+                
+
+                SHOW_ITEM(DLOG_Menu1_Button, FALSE);
+                
+				SHOW_ITEM(DLOG_Menu2_Label, FALSE);
+				SHOW_ITEM(DLOG_Menu2_Menu, FALSE);
+                SHOW_ITEM(DLOG_Menu2_Button, FALSE);
+                
+				SHOW_ITEM(DLOG_Menu3_Label, FALSE);
+				SHOW_ITEM(DLOG_Menu3_Menu, FALSE);
+            }
+            else
+            {
+                SHOW_ITEM(DLOG_Invert_Check, FALSE);
+            
+                if(g_action == ACTION_LUT)
+                {
+                    g_action = ACTION_CONVERT;
+                }
+                
+				SHOW_ITEM(DLOG_Convert_Radio, TRUE);
+				SHOW_ITEM(DLOG_Display_Radio, TRUE);
+                                
+                
+                const SpaceVec &colorSpaces = g_context->getColorSpaces();
+                
+                if(-1 == FindSpace(colorSpaces, g_inputSpace))
+                {
+                    g_inputSpace = g_context->getDefaultColorSpace();
+                }
+                
+                if(-1 == FindSpace(colorSpaces, g_outputSpace))
+                {
+                    g_outputSpace = g_context->getDefaultColorSpace();
+                }
+                
+                
+                const SpaceVec &devices = g_context->getDevices();
+                
+                if(-1 == FindSpace(devices, g_device))
+                {
+                    g_device = g_context->getDefaultDevice();
+                }
+                
+                
+                const SpaceVec transforms = g_context->getTransforms(g_device);
+                
+                if(-1 == FindSpace(transforms, g_transform))
+                {
+                    g_transform = g_context->getDefaultTransform(g_device);
+                }
+                
+                
+                TrackActionRadios(hwndDlg, false);
+            }
+        }
+        catch(const std::exception &e)
+        {
+			MessageBox(hwndDlg, e.what(), "OpenColorIO error", MB_OK);
+
+            if(g_source != SOURCE_ENVIRONMENT)
+            {
+                g_source = SOURCE_ENVIRONMENT;
+                
+                TrackConfigMenu(hwndDlg, false);
+            }
+        }
+        catch(...)
+        {
+			MessageBox(hwndDlg, "Some unknown error", "OpenColorIO error", MB_OK);
+
+            if(g_source != SOURCE_ENVIRONMENT)
+            {
+                g_source = SOURCE_ENVIRONMENT;
+                
+                TrackConfigMenu(hwndDlg, false);
+            }
+        }
+    }
+	else
+	{
+		delete g_context;
+
+		g_context = NULL;
+
+		REMOVE_ALL_MENU_ITEMS(DLOG_Menu1_Menu);
+		REMOVE_ALL_MENU_ITEMS(DLOG_Menu2_Menu);
+		REMOVE_ALL_MENU_ITEMS(DLOG_Menu3_Menu);
+	}
+            
+    // set the tooltip
+	char toolTipString[256];
+
+	strncpy(toolTipString, configPath.c_str(), 255);
+
+	
+	if(g_configutationToolTip != NULL)
+	{
+		DestroyWindow(g_configutationToolTip);
+		g_configutationToolTip = NULL;
+	}
+
+	g_configutationToolTip = CreateWindowEx(NULL, TOOLTIPS_CLASS, NULL,
+											  WS_POPUP | TTS_ALWAYSTIP, // TTS_BALLOON
+											  CW_USEDEFAULT, CW_USEDEFAULT,
+											  CW_USEDEFAULT, CW_USEDEFAULT,
+											  hwndDlg, NULL, 
+											  hDllInstance, NULL);
+	assert(g_configutationToolTip != NULL);
+
+	TOOLINFO toolInfo = { 0 };
+	toolInfo.cbSize = sizeof(toolInfo);
+	toolInfo.hwnd = hwndDlg;
+	toolInfo.uFlags = TTF_IDISHWND | TTF_SUBCLASS;
+	toolInfo.uId = (UINT_PTR)GET_ITEM(DLOG_Configuration_Menu);
+	toolInfo.lpszText = toolTipString;
+
+	const LRESULT setTooltip = SendMessage(g_configutationToolTip, TTM_ADDTOOL, 0, (LPARAM)&toolInfo);
+
+	assert(setTooltip);
+}
+
+static void DoExport(HWND hwndDlg)
+{
+	if(g_context != NULL)
+	{
+		try
+		{
+			ExtensionMap extensions;
+		    
+			for(int i=0; i < OCIO::Baker::getNumFormats(); ++i)
+			{
+				const char *extension = OCIO::Baker::getFormatExtensionByIndex(i);
+				const char *format = OCIO::Baker::getFormatNameByIndex(i);
+		        
+				extensions[ extension ] = format;
+			}
+		    
+			extensions[ "icc" ] = "ICC Profile";
+		    
+
+			char path[256] = { '\0' };
+		    
+			const bool result = SaveFile(path, 255, extensions, hwndDlg);
+		    
+		    
+			if(result)
+			{
+				std::string the_path(path);
+				std::string the_extension = the_path.substr( the_path.find_last_of('.') + 1 );
+		        
+				bool do_export = true;
+		        
+				std::string monitor_icc_path;
+		        
+				if(the_extension == "icc")
+				{
+					char monitor_path[256] = {'\0'};
+		        
+					do_export = GetMonitorProfile(monitor_path, 255, hwndDlg);
+		        
+					if(do_export)
+					{
+						OCIO::ConstProcessorRcPtr processor;
+	                    
+						if(g_action == ACTION_CONVERT)
+						{
+							processor = g_context->getConvertProcessor(g_inputSpace, g_outputSpace);
+						}
+						else if(g_action == ACTION_DISPLAY)
+						{
+							processor = g_context->getDisplayProcessor(g_inputSpace, g_device, g_transform);
+						}
+						else
+						{
+							assert(g_action == ACTION_LUT);
+	                        
+							const OCIO::Interpolation interp = (g_interpolation == INTERPO_NEAREST ? OCIO::INTERP_NEAREST :
+																g_interpolation == INTERPO_LINEAR ? OCIO::INTERP_LINEAR :
+																g_interpolation == INTERPO_TETRAHEDRAL ? OCIO::INTERP_TETRAHEDRAL :
+																OCIO::INTERP_BEST);
+	                        
+							const OCIO::TransformDirection direction = (g_invert ? OCIO::TRANSFORM_DIR_INVERSE : OCIO::TRANSFORM_DIR_FORWARD);
+	                        
+							processor = g_context->getLUTProcessor(interp, direction);
+						}
+	                    
+	                    
+						int cubesize = 32;
+						int whitepointtemp = 6505;
+						std::string copyright = "OpenColorIO, Sony Imageworks";
+	                    
+						// create a description tag from the filename
+						const char delimiter = '\\';
+						const size_t filename_start = the_path.find_last_of(delimiter) + 1;
+						const size_t filename_end = the_path.find_last_of('.') - 1;
+				        
+						std::string description = the_path.substr(the_path.find_last_of(delimiter) + 1,
+															1 + filename_end - filename_start);
+
+						SaveICCProfileToFile(the_path, processor, cubesize, whitepointtemp,
+												monitor_path, description, copyright, false);
+					}
+				}
+				else
+				{
+					// need an extension->format map
+					std::map<std::string, std::string> extensions;
+	                
+					for(int i=0; i < OCIO::Baker::getNumFormats(); ++i)
+					{
+						const char *extension = OCIO::Baker::getFormatExtensionByIndex(i);
+						const char *format = OCIO::Baker::getFormatNameByIndex(i);
+	                    
+						extensions[ extension ] = format;
+					}
+	                
+					std::string format = extensions[ the_extension ];
+	                
+	                
+					OCIO::BakerRcPtr baker;
+	                
+					if(g_action == ACTION_CONVERT)
+					{
+						baker = g_context->getConvertBaker(g_inputSpace, g_outputSpace);
+					}
+					else if(g_action == ACTION_DISPLAY)
+					{
+						baker = g_context->getDisplayBaker(g_inputSpace, g_device, g_transform);
+					}
+					else
+					{
+						assert(g_action == ACTION_LUT);
+	                    
+						const OCIO::Interpolation interp = (g_interpolation == INTERPO_NEAREST ? OCIO::INTERP_NEAREST :
+															g_interpolation == INTERPO_LINEAR ? OCIO::INTERP_LINEAR :
+															g_interpolation == INTERPO_TETRAHEDRAL ? OCIO::INTERP_TETRAHEDRAL :
+															OCIO::INTERP_BEST);
+	                    
+						const OCIO::TransformDirection direction = (g_invert ? OCIO::TRANSFORM_DIR_INVERSE : OCIO::TRANSFORM_DIR_FORWARD);
+	                    
+						baker = g_context->getLUTBaker(interp, direction);
+					}
+	                
+					baker->setFormat( format.c_str() );
+	                
+					std::ofstream f(the_path.c_str());
+					baker->bake(f);
+				}
+			}
+		}
+        catch(const std::exception &e)
+        {
+			MessageBox(hwndDlg, e.what(), "OpenColorIO error", MB_OK);
+
+            if(g_source != SOURCE_ENVIRONMENT)
+            {
+                g_source = SOURCE_ENVIRONMENT;
+                
+                TrackConfigMenu(hwndDlg, false);
+            }
+        }
+        catch(...)
+        {
+			MessageBox(hwndDlg, "Some unknown error", "OpenColorIO error", MB_OK);
+
+            if(g_source != SOURCE_ENVIRONMENT)
+            {
+                g_source = SOURCE_ENVIRONMENT;
+                
+                TrackConfigMenu(hwndDlg, false);
+            }
+        }
+	}
+}
+
+static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{ 
+    BOOL fError; 
+ 
+    switch (message) 
+    { 
+		case WM_INITDIALOG:
+			do{
+				int index = 0;
+				
+				char *envFile = std::getenv("OCIO");
+
+				const DWORD envType = (envFile == NULL ? CONFIG_SEPERATOR : CONFIG_ENVIRONMENT);
+				const bool envSelected = (envFile == NULL != NULL && g_source == SOURCE_ENVIRONMENT);
+
+				ADD_MENU_ITEM(DLOG_Configuration_Menu, index, "$OCIO", CONFIG_ENVIRONMENT, envSelected);
+				index++;
+
+				ADD_MENU_ITEM(DLOG_Configuration_Menu, index, "-", CONFIG_SEPERATOR, FALSE);
+				index++;
+
+				ConfigVec standardConfigs;
+				GetStdConfigs(standardConfigs);
+				
+				if(standardConfigs.size() > 0)
+				{
+					for(int i=0; i < standardConfigs.size(); i++)
+					{
+						const std::string &config = standardConfigs[i];
+						
+						const bool selected = (g_source == SOURCE_STANDARD && config == g_config);
+
+						ADD_MENU_ITEM(DLOG_Configuration_Menu, index, config.c_str(), CONFIG_STANDARD, selected);
+						index++;
+					}
+				}
+				else
+				{
+					std::string label = "No standard configs";
+
+					char appdata_path[MAX_PATH];
+					HRESULT result = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL,
+														SHGFP_TYPE_CURRENT, appdata_path);
+
+					if(result == S_OK)
+					{
+						label = "(No configs in " + std::string(appdata_path) + "\\OpenColorIO\\)";
+					}
+
+					ADD_MENU_ITEM(DLOG_Configuration_Menu, index, label.c_str(), CONFIG_SEPERATOR, FALSE);
+					index++;
+				}
+
+				ADD_MENU_ITEM(DLOG_Configuration_Menu, index, "-", CONFIG_SEPERATOR, FALSE);
+				index++;
+
+				ADD_MENU_ITEM(DLOG_Configuration_Menu, index, "Custom...", CONFIG_CUSTOM, g_source == SOURCE_CUSTOM);
+				index++;
+				
+
+				TrackConfigMenu(hwndDlg, false);
+
+			}while(0);
+		return TRUE;
+ 
+		case WM_NOTIFY:
+			return FALSE;
+
+        case WM_COMMAND: 
+			g_item_clicked = LOWORD(wParam);
+
+			const int menuParam = HIWORD(wParam);
+
+            switch (LOWORD(wParam)) 
+            { 
+                case DLOG_OK: 
+				case DLOG_Cancel:  // do the same thing, but g_item_clicked will be different
+
+					delete g_context;
+					g_context = NULL;
+					
+					DestroyWindow(g_configutationToolTip);
+					g_configutationToolTip = NULL;
+
+					// quit dialog
+					//PostMessage((HWND)hwndDlg, WM_QUIT, (WPARAM)WA_ACTIVE, lParam);
+					EndDialog(hwndDlg, 0);
+                    //DestroyWindow(hwndDlg); 
+				return TRUE;
+
+
+				case DLOG_Export:
+					DoExport(hwndDlg);
+				return TRUE;
+
+
+				case DLOG_Configuration_Menu:
+					if(menuParam == CBN_SELCHANGE)
+						TrackConfigMenu(hwndDlg, true);
+				return TRUE;
+
+
+				case DLOG_Convert_Radio:
+				case DLOG_Display_Radio:
+					TrackActionRadios(hwndDlg, true);
+				return TRUE;
+
+
+				case DLOG_Menu1_Menu:
+					if(menuParam == CBN_SELCHANGE)
+						TrackMenu1(hwndDlg, true);
+				return TRUE;
+
+
+				case DLOG_Menu1_Button:
+					TrackMenu1Button(hwndDlg);
+				return TRUE;
+
+
+				case DLOG_Menu2_Menu:
+					if(menuParam == CBN_SELCHANGE)
+						TrackMenu2(hwndDlg, true);
+				return TRUE;
+
+
+				case DLOG_Menu2_Button:
+					TrackMenu2Button(hwndDlg);
+				return TRUE;
+
+				
+				case DLOG_Menu3_Menu:
+					if(menuParam == CBN_SELCHANGE)
+						TrackMenu3(hwndDlg, true);
+				return TRUE;
+
+
+				case DLOG_Invert_Check:
+					TrackInvert(hwndDlg, true);
+				return TRUE;
+            } 
+
+			return FALSE;
+    } 
+    return FALSE; 
+} 
+
+DialogResult OpenColorIO_PS_Dialog(DialogParams &params, const void *plugHndl, const void *mwnd)
+{
+	hDllInstance = (HINSTANCE)plugHndl;
+	SetHInstance(hDllInstance);
+
+	g_source = params.source;
+	g_config = params.config;
+	g_action = params.action;
+	g_invert = params.invert;
+	g_interpolation = params.interpolation;
+	g_inputSpace = params.inputSpace;
+	g_outputSpace = params.outputSpace;
+	g_device = params.device;
+	g_transform = params.transform;
+	
+
+	const int status = DialogBox((HINSTANCE)plugHndl, (LPSTR)"OCIODIALOG", (HWND)mwnd, (DLGPROC)DialogProc);
+	
+
+	if(g_item_clicked == IDOK)
+	{
+		params.source = g_source;
+		params.config = g_config;
+		params.action = g_action;
+		params.invert = g_invert;
+		params.interpolation = g_interpolation;
+		params.inputSpace = g_inputSpace;
+		params.outputSpace = g_outputSpace;
+		params.device = g_device;
+		params.transform = g_transform;
+
+		return RESULT_OK;
+	}
+	else
+		return RESULT_CANCEL;
+}
+
+void OpenColorIO_PS_About(const void *plugHndl, const void *mwnd)
+{
+	const std::string ocioVersion = OCIO::GetVersion();
+	
+	const std::string endl = "\n";
+
+	std::string text = std::string("OpenColorIO PS") + endl +
+						OpenColorIO_PS_Beta_String + endl +
+						__DATE__ + endl +
+						endl +
+						"OCIO version " + OCIO::GetVersion();
+
+	MessageBox((HWND)mwnd, text.c_str(), "OpenColorIO", MB_OK);
+}
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/win/resource1.h opencolorio-1.1.0~dfsg0/src/photoshop/win/resource1.h
--- opencolorio-1.0.9~dfsg0/src/photoshop/win/resource1.h	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/win/resource1.h	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by OpenColorIO_PS_Dialog.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        102
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1013
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff -Nru opencolorio-1.0.9~dfsg0/src/photoshop/xcode/OpenColorIO_PS.xcodeproj/project.pbxproj opencolorio-1.1.0~dfsg0/src/photoshop/xcode/OpenColorIO_PS.xcodeproj/project.pbxproj
--- opencolorio-1.0.9~dfsg0/src/photoshop/xcode/OpenColorIO_PS.xcodeproj/project.pbxproj	1970-01-01 00:00:00.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/photoshop/xcode/OpenColorIO_PS.xcodeproj/project.pbxproj	2018-01-05 01:38:27.000000000 +0000
@@ -0,0 +1,1726 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 42;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		2A4150441E33FD6900E3954B /* OpenColorIO_PS_Context.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A4150431E33FD6900E3954B /* OpenColorIO_PS_Context.cpp */; };
+		2A644C9D1E316E6C00AAEF84 /* OpenColorIO_PS_Dialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A644C9C1E316E6C00AAEF84 /* OpenColorIO_PS_Dialog.xib */; };
+		2A644CB41E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A644CB31E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.mm */; };
+		2A644CBB1E31787500AAEF84 /* OpenColorIO_PS_Dialog_Cocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A644CBA1E31787500AAEF84 /* OpenColorIO_PS_Dialog_Cocoa.mm */; };
+		2A644DBA1E31FAAF00AAEF84 /* liblcms.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A644DB31E31FAA500AAEF84 /* liblcms.a */; };
+		2A644DBB1E31FAB000AAEF84 /* libOpenColorIO.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A644DA71E31FA7800AAEF84 /* libOpenColorIO.a */; };
+		2A644DBC1E31FAB000AAEF84 /* libtinyxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A644DB61E31FAA500AAEF84 /* libtinyxml.a */; };
+		2A644DBD1E31FAB100AAEF84 /* libyaml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2A644DB91E31FAA500AAEF84 /* libyaml.a */; };
+		2A7523751E3ECDEA00BB5897 /* ocioicc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A7523731E3ECDEA00BB5897 /* ocioicc.cpp */; };
+		2A7523961E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7523941E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.m */; };
+		2A7523971E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2A7523951E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser.xib */; };
+		2A7529E21E3FB64000BB5897 /* OpenColorIO_AE_Dialogs_Cocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 2A7529E11E3FB64000BB5897 /* OpenColorIO_AE_Dialogs_Cocoa.mm */; };
+		2A7529E71E3FB66000BB5897 /* OpenColorIO_AE_Menu.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A7529E61E3FB66000BB5897 /* OpenColorIO_AE_Menu.m */; };
+		2A7F211B1E2F4E57003428D7 /* OpenColorIO_PS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2A7F21181E2F4E57003428D7 /* OpenColorIO_PS.cpp */; };
+		2A7F211C1E2F4E57003428D7 /* OpenColorIO_PS.r in Rez */ = {isa = PBXBuildFile; fileRef = 2A7F211A1E2F4E57003428D7 /* OpenColorIO_PS.r */; };
+		2AF20A8312065C87001E5E3F /* FilterBigDocument.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2AF20A8212065C87001E5E3F /* FilterBigDocument.cpp */; };
+		2AF20AE712065E0E001E5E3F /* PIUtilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64126C3409F97A19006DF4E6 /* PIUtilities.cpp */; };
+		2AF20AEA12065E19001E5E3F /* DialogUtilitiesMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64126C2F09F979F7006DF4E6 /* DialogUtilitiesMac.cpp */; };
+		2AF20B9112066147001E5E3F /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 646B5CA910D31664001A7C6E /* Cocoa.framework */; };
+		2AF20B9C12066179001E5E3F /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; };
+		64126C2B09F979EA006DF4E6 /* PIUSuites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 64126C2A09F979EA006DF4E6 /* PIUSuites.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		2A644DA61E31FA7800AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DA21E31FA7800AAEF84 /* OpenColorIO.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2ACF567114776A0A00991ED5;
+			remoteInfo = OpenColorIO;
+		};
+		2A644DB21E31FAA500AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DA81E31FAA500AAEF84 /* lcms.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2ACF9E56147824F500991ED5;
+			remoteInfo = lcms;
+		};
+		2A644DB51E31FAA500AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DAB1E31FAA500AAEF84 /* tinyxml.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2ACF55441477682B00991ED5;
+			remoteInfo = tinyxml;
+		};
+		2A644DB81E31FAA500AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DAE1E31FAA500AAEF84 /* yaml.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = 2ACF559C1477692300991ED5;
+			remoteInfo = yaml;
+		};
+		2A644DBE1E31FACE00AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DA81E31FAA500AAEF84 /* lcms.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 2ACF9E55147824F500991ED5;
+			remoteInfo = lcms;
+		};
+		2A644DC01E31FACE00AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DAE1E31FAA500AAEF84 /* yaml.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 2ACF559B1477692300991ED5;
+			remoteInfo = yaml;
+		};
+		2A644DC21E31FACE00AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DAB1E31FAA500AAEF84 /* tinyxml.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 2ACF55431477682B00991ED5;
+			remoteInfo = tinyxml;
+		};
+		2A644DC41E31FACE00AAEF84 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 2A644DA21E31FA7800AAEF84 /* OpenColorIO.xcodeproj */;
+			proxyType = 1;
+			remoteGlobalIDString = 2ACF567014776A0A00991ED5;
+			remoteInfo = OpenColorIO;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		2A4150421E33FD6900E3954B /* OpenColorIO_PS_Context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_PS_Context.h; path = ../OpenColorIO_PS_Context.h; sourceTree = SOURCE_ROOT; };
+		2A4150431E33FD6900E3954B /* OpenColorIO_PS_Context.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenColorIO_PS_Context.cpp; path = ../OpenColorIO_PS_Context.cpp; sourceTree = SOURCE_ROOT; };
+		2A644C1A1E3166FC00AAEF84 /* OpenColorIO_PS_Dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_PS_Dialog.h; path = ../OpenColorIO_PS_Dialog.h; sourceTree = SOURCE_ROOT; };
+		2A644C9C1E316E6C00AAEF84 /* OpenColorIO_PS_Dialog.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OpenColorIO_PS_Dialog.xib; path = ../mac/OpenColorIO_PS_Dialog.xib; sourceTree = SOURCE_ROOT; };
+		2A644CB21E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_PS_Dialog_Controller.h; path = ../mac/OpenColorIO_PS_Dialog_Controller.h; sourceTree = SOURCE_ROOT; };
+		2A644CB31E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenColorIO_PS_Dialog_Controller.mm; path = ../mac/OpenColorIO_PS_Dialog_Controller.mm; sourceTree = SOURCE_ROOT; };
+		2A644CBA1E31787500AAEF84 /* OpenColorIO_PS_Dialog_Cocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenColorIO_PS_Dialog_Cocoa.mm; path = ../mac/OpenColorIO_PS_Dialog_Cocoa.mm; sourceTree = SOURCE_ROOT; };
+		2A644DA21E31FA7800AAEF84 /* OpenColorIO.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OpenColorIO.xcodeproj; path = ../../aftereffects/xcode/OpenColorIO.xcodeproj; sourceTree = SOURCE_ROOT; };
+		2A644DA81E31FAA500AAEF84 /* lcms.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = lcms.xcodeproj; path = ../../aftereffects/xcode/ext/lcms.xcodeproj; sourceTree = SOURCE_ROOT; };
+		2A644DAB1E31FAA500AAEF84 /* tinyxml.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = tinyxml.xcodeproj; path = ../../aftereffects/xcode/ext/tinyxml.xcodeproj; sourceTree = SOURCE_ROOT; };
+		2A644DAE1E31FAA500AAEF84 /* yaml.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = yaml.xcodeproj; path = ../../aftereffects/xcode/ext/yaml.xcodeproj; sourceTree = SOURCE_ROOT; };
+		2A7523731E3ECDEA00BB5897 /* ocioicc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ocioicc.cpp; path = ../../apps/ociobakelut/ocioicc.cpp; sourceTree = SOURCE_ROOT; };
+		2A7523741E3ECDEA00BB5897 /* ocioicc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ocioicc.h; path = ../../apps/ociobakelut/ocioicc.h; sourceTree = SOURCE_ROOT; };
+		2A7523931E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_AE_MonitorProfileChooser_Controller.h; path = ../../aftereffects/mac/OpenColorIO_AE_MonitorProfileChooser_Controller.h; sourceTree = SOURCE_ROOT; };
+		2A7523941E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OpenColorIO_AE_MonitorProfileChooser_Controller.m; path = ../../aftereffects/mac/OpenColorIO_AE_MonitorProfileChooser_Controller.m; sourceTree = SOURCE_ROOT; };
+		2A7523951E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = OpenColorIO_AE_MonitorProfileChooser.xib; path = ../../aftereffects/mac/OpenColorIO_AE_MonitorProfileChooser.xib; sourceTree = SOURCE_ROOT; };
+		2A7529DF1E3FB61100BB5897 /* OpenColorIO_AE_Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_AE_Dialogs.h; path = ../../aftereffects/OpenColorIO_AE_Dialogs.h; sourceTree = SOURCE_ROOT; };
+		2A7529E11E3FB64000BB5897 /* OpenColorIO_AE_Dialogs_Cocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenColorIO_AE_Dialogs_Cocoa.mm; path = ../../aftereffects/mac/OpenColorIO_AE_Dialogs_Cocoa.mm; sourceTree = SOURCE_ROOT; };
+		2A7529E51E3FB66000BB5897 /* OpenColorIO_AE_Menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_AE_Menu.h; path = ../../aftereffects/mac/OpenColorIO_AE_Menu.h; sourceTree = SOURCE_ROOT; };
+		2A7529E61E3FB66000BB5897 /* OpenColorIO_AE_Menu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OpenColorIO_AE_Menu.m; path = ../../aftereffects/mac/OpenColorIO_AE_Menu.m; sourceTree = SOURCE_ROOT; };
+		2A7F21161E2F4E57003428D7 /* OpenColorIO_PS_Terminology.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_PS_Terminology.h; path = ../OpenColorIO_PS_Terminology.h; sourceTree = SOURCE_ROOT; };
+		2A7F21171E2F4E57003428D7 /* OpenColorIO_PS_Version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_PS_Version.h; path = ../OpenColorIO_PS_Version.h; sourceTree = SOURCE_ROOT; };
+		2A7F21181E2F4E57003428D7 /* OpenColorIO_PS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OpenColorIO_PS.cpp; path = ../OpenColorIO_PS.cpp; sourceTree = SOURCE_ROOT; };
+		2A7F21191E2F4E57003428D7 /* OpenColorIO_PS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenColorIO_PS.h; path = ../OpenColorIO_PS.h; sourceTree = SOURCE_ROOT; };
+		2A7F211A1E2F4E57003428D7 /* OpenColorIO_PS.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; name = OpenColorIO_PS.r; path = ../OpenColorIO_PS.r; sourceTree = SOURCE_ROOT; };
+		2AF20A8212065C87001E5E3F /* FilterBigDocument.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FilterBigDocument.cpp; sourceTree = "<group>"; };
+		2AF20A8412065C91001E5E3F /* FilterBigDocument.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterBigDocument.h; sourceTree = "<group>"; };
+		2AF20A8D12065CC7001E5E3F /* ADMAGMTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMAGMTypes.h; sourceTree = "<group>"; };
+		2AF20A8E12065CC7001E5E3F /* ADMBasic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMBasic.h; sourceTree = "<group>"; };
+		2AF20A8F12065CC7001E5E3F /* ADMCustomResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMCustomResource.h; sourceTree = "<group>"; };
+		2AF20A9012065CC7001E5E3F /* ADMDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMDialog.h; sourceTree = "<group>"; };
+		2AF20A9112065CC7001E5E3F /* ADMDialogGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMDialogGroup.h; sourceTree = "<group>"; };
+		2AF20A9212065CC7001E5E3F /* ADMDrawer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMDrawer.h; sourceTree = "<group>"; };
+		2AF20A9312065CC7001E5E3F /* ADMEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMEntry.h; sourceTree = "<group>"; };
+		2AF20A9412065CC7001E5E3F /* ADMHierarchyList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHierarchyList.h; sourceTree = "<group>"; };
+		2AF20A9512065CC7001E5E3F /* ADMHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHost.h; sourceTree = "<group>"; };
+		2AF20A9612065CC7001E5E3F /* ADMHostInit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHostInit.h; sourceTree = "<group>"; };
+		2AF20A9712065CC7001E5E3F /* ADMHostInitUnicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHostInitUnicode.h; sourceTree = "<group>"; };
+		2AF20A9812065CC7001E5E3F /* ADMHostWin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHostWin.h; sourceTree = "<group>"; };
+		2AF20A9912065CC7001E5E3F /* ADMIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMIcon.h; sourceTree = "<group>"; };
+		2AF20A9A12065CC7001E5E3F /* ADMImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMImage.h; sourceTree = "<group>"; };
+		2AF20A9B12065CC7001E5E3F /* ADMItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMItem.h; sourceTree = "<group>"; };
+		2AF20A9C12065CC7001E5E3F /* ADMList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMList.h; sourceTree = "<group>"; };
+		2AF20A9D12065CC7001E5E3F /* ADMListEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMListEntry.h; sourceTree = "<group>"; };
+		2AF20A9E12065CC7001E5E3F /* ADMNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMNotifier.h; sourceTree = "<group>"; };
+		2AF20A9F12065CC7001E5E3F /* ADMRadioGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMRadioGroup.h; sourceTree = "<group>"; };
+		2AF20AA012065CC7001E5E3F /* ADMResource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMResource.h; sourceTree = "<group>"; };
+		2AF20AA112065CC7001E5E3F /* ADMStandardTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMStandardTypes.h; sourceTree = "<group>"; };
+		2AF20AA212065CC7001E5E3F /* ADMTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMTracker.h; sourceTree = "<group>"; };
+		2AF20AA312065CC7001E5E3F /* ADMTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMTypes.h; sourceTree = "<group>"; };
+		2AF20AA412065CC7001E5E3F /* ADMUITConversionSuite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMUITConversionSuite.h; sourceTree = "<group>"; };
+		2AF20AA512065CC7001E5E3F /* ADMVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMVersion.h; sourceTree = "<group>"; };
+		2AF20AA612065CC7001E5E3F /* ADMWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMWindow.h; sourceTree = "<group>"; };
+		2AF20AA812065CC7001E5E3F /* ADMBasicOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMBasicOld.h; sourceTree = "<group>"; };
+		2AF20AA912065CC7001E5E3F /* ADMCustomResourceOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMCustomResourceOld.h; sourceTree = "<group>"; };
+		2AF20AAA12065CC7001E5E3F /* ADMDialogGroupOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMDialogGroupOld.h; sourceTree = "<group>"; };
+		2AF20AAB12065CC7001E5E3F /* ADMDialogOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMDialogOld.h; sourceTree = "<group>"; };
+		2AF20AAC12065CC7001E5E3F /* ADMDrawerOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMDrawerOld.h; sourceTree = "<group>"; };
+		2AF20AAD12065CC7001E5E3F /* ADMEntryOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMEntryOld.h; sourceTree = "<group>"; };
+		2AF20AAE12065CC7001E5E3F /* ADMHierarchyListOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHierarchyListOld.h; sourceTree = "<group>"; };
+		2AF20AAF12065CC7001E5E3F /* ADMHostInitOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHostInitOld.h; sourceTree = "<group>"; };
+		2AF20AB012065CC7001E5E3F /* ADMHostOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMHostOld.h; sourceTree = "<group>"; };
+		2AF20AB112065CC7001E5E3F /* ADMIconOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMIconOld.h; sourceTree = "<group>"; };
+		2AF20AB212065CC7001E5E3F /* ADMImageOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMImageOld.h; sourceTree = "<group>"; };
+		2AF20AB312065CC7001E5E3F /* ADMItemOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMItemOld.h; sourceTree = "<group>"; };
+		2AF20AB412065CC7001E5E3F /* ADMListEntryOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMListEntryOld.h; sourceTree = "<group>"; };
+		2AF20AB512065CC7001E5E3F /* ADMListOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMListOld.h; sourceTree = "<group>"; };
+		2AF20AB612065CC7001E5E3F /* ADMNotifierOld.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADMNotifierOld.h; sourceTree = "<group>"; };
+		2AF20AB712065CC7001E5E3F /* PlatformConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformConfig.h; sourceTree = "<group>"; };
+		2AF20AB812065CC7001E5E3F /* PlatformPragma.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlatformPragma.h; sourceTree = "<group>"; };
+		6412691809F974D9006DF4E6 /* ADSP.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ADSP.h; path = /Developer/Headers/FlatCarbon/ADSP.h; sourceTree = "<absolute>"; };
+		6412691909F974D9006DF4E6 /* AEDataModel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEDataModel.h; path = /Developer/Headers/FlatCarbon/AEDataModel.h; sourceTree = "<absolute>"; };
+		6412691A09F974D9006DF4E6 /* AEDataModel.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AEDataModel.r; path = /Developer/Headers/FlatCarbon/AEDataModel.r; sourceTree = "<absolute>"; };
+		6412691B09F974D9006DF4E6 /* AEHelpers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEHelpers.h; path = /Developer/Headers/FlatCarbon/AEHelpers.h; sourceTree = "<absolute>"; };
+		6412691C09F974D9006DF4E6 /* AEInteraction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEInteraction.h; path = /Developer/Headers/FlatCarbon/AEInteraction.h; sourceTree = "<absolute>"; };
+		6412691D09F974D9006DF4E6 /* AEMach.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEMach.h; path = /Developer/Headers/FlatCarbon/AEMach.h; sourceTree = "<absolute>"; };
+		6412691E09F974D9006DF4E6 /* AEObjects.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEObjects.h; path = /Developer/Headers/FlatCarbon/AEObjects.h; sourceTree = "<absolute>"; };
+		6412691F09F974D9006DF4E6 /* AEObjects.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AEObjects.r; path = /Developer/Headers/FlatCarbon/AEObjects.r; sourceTree = "<absolute>"; };
+		6412692009F974D9006DF4E6 /* AEPackObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEPackObject.h; path = /Developer/Headers/FlatCarbon/AEPackObject.h; sourceTree = "<absolute>"; };
+		6412692109F974D9006DF4E6 /* AERegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AERegistry.h; path = /Developer/Headers/FlatCarbon/AERegistry.h; sourceTree = "<absolute>"; };
+		6412692209F974D9006DF4E6 /* AERegistry.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AERegistry.r; path = /Developer/Headers/FlatCarbon/AERegistry.r; sourceTree = "<absolute>"; };
+		6412692309F974D9006DF4E6 /* AEUserTermTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AEUserTermTypes.h; path = /Developer/Headers/FlatCarbon/AEUserTermTypes.h; sourceTree = "<absolute>"; };
+		6412692409F974D9006DF4E6 /* AEUserTermTypes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AEUserTermTypes.r; path = /Developer/Headers/FlatCarbon/AEUserTermTypes.r; sourceTree = "<absolute>"; };
+		6412692509F974D9006DF4E6 /* AEWideUserTermTypes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AEWideUserTermTypes.r; path = /Developer/Headers/FlatCarbon/AEWideUserTermTypes.r; sourceTree = "<absolute>"; };
+		6412692609F974D9006DF4E6 /* AIFF.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIFF.h; path = /Developer/Headers/FlatCarbon/AIFF.h; sourceTree = "<absolute>"; };
+		6412692709F974D9006DF4E6 /* Aliases.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Aliases.h; path = /Developer/Headers/FlatCarbon/Aliases.h; sourceTree = "<absolute>"; };
+		6412692809F974D9006DF4E6 /* Appearance.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Appearance.h; path = /Developer/Headers/FlatCarbon/Appearance.h; sourceTree = "<absolute>"; };
+		6412692909F974D9006DF4E6 /* Appearance.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Appearance.r; path = /Developer/Headers/FlatCarbon/Appearance.r; sourceTree = "<absolute>"; };
+		6412692A09F974D9006DF4E6 /* AppleDiskPartitions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleDiskPartitions.h; path = /Developer/Headers/FlatCarbon/AppleDiskPartitions.h; sourceTree = "<absolute>"; };
+		6412692B09F974D9006DF4E6 /* AppleEvents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleEvents.h; path = /Developer/Headers/FlatCarbon/AppleEvents.h; sourceTree = "<absolute>"; };
+		6412692C09F974D9006DF4E6 /* AppleEvents.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AppleEvents.r; path = /Developer/Headers/FlatCarbon/AppleEvents.r; sourceTree = "<absolute>"; };
+		6412692D09F974D9006DF4E6 /* AppleGuide.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleGuide.h; path = /Developer/Headers/FlatCarbon/AppleGuide.h; sourceTree = "<absolute>"; };
+		6412692E09F974D9006DF4E6 /* AppleHelp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleHelp.h; path = /Developer/Headers/FlatCarbon/AppleHelp.h; sourceTree = "<absolute>"; };
+		6412692F09F974D9006DF4E6 /* AppleScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleScript.h; path = /Developer/Headers/FlatCarbon/AppleScript.h; sourceTree = "<absolute>"; };
+		6412693009F974D9006DF4E6 /* AppleTalk.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AppleTalk.h; path = /Developer/Headers/FlatCarbon/AppleTalk.h; sourceTree = "<absolute>"; };
+		6412693109F974D9006DF4E6 /* ApplicationServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ApplicationServices.h; path = /Developer/Headers/FlatCarbon/ApplicationServices.h; sourceTree = "<absolute>"; };
+		6412693209F974D9006DF4E6 /* ApplicationServices.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = ApplicationServices.r; path = /Developer/Headers/FlatCarbon/ApplicationServices.r; sourceTree = "<absolute>"; };
+		6412693309F974D9006DF4E6 /* ASDebugging.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ASDebugging.h; path = /Developer/Headers/FlatCarbon/ASDebugging.h; sourceTree = "<absolute>"; };
+		6412693409F974D9006DF4E6 /* ASRegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ASRegistry.h; path = /Developer/Headers/FlatCarbon/ASRegistry.h; sourceTree = "<absolute>"; };
+		6412693509F974D9006DF4E6 /* ASRegistry.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = ASRegistry.r; path = /Developer/Headers/FlatCarbon/ASRegistry.r; sourceTree = "<absolute>"; };
+		6412693609F974D9006DF4E6 /* ATA.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ATA.h; path = /Developer/Headers/FlatCarbon/ATA.h; sourceTree = "<absolute>"; };
+		6412693709F974D9006DF4E6 /* ATSFont.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ATSFont.h; path = /Developer/Headers/FlatCarbon/ATSFont.h; sourceTree = "<absolute>"; };
+		6412693809F974D9006DF4E6 /* ATSLayoutTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ATSLayoutTypes.h; path = /Developer/Headers/FlatCarbon/ATSLayoutTypes.h; sourceTree = "<absolute>"; };
+		6412693909F974D9006DF4E6 /* ATSTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ATSTypes.h; path = /Developer/Headers/FlatCarbon/ATSTypes.h; sourceTree = "<absolute>"; };
+		6412693A09F974D9006DF4E6 /* ATSUnicode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ATSUnicode.h; path = /Developer/Headers/FlatCarbon/ATSUnicode.h; sourceTree = "<absolute>"; };
+		6412693B09F974D9006DF4E6 /* AVComponents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AVComponents.h; path = /Developer/Headers/FlatCarbon/AVComponents.h; sourceTree = "<absolute>"; };
+		6412693C09F974D9006DF4E6 /* AVComponents.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AVComponents.k.h; path = /Developer/Headers/FlatCarbon/AVComponents.k.h; sourceTree = "<absolute>"; };
+		6412693D09F974D9006DF4E6 /* AVComponents.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = AVComponents.r; path = /Developer/Headers/FlatCarbon/AVComponents.r; sourceTree = "<absolute>"; };
+		6412693E09F974D9006DF4E6 /* AVLTree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AVLTree.h; path = /Developer/Headers/FlatCarbon/AVLTree.h; sourceTree = "<absolute>"; };
+		6412693F09F974D9006DF4E6 /* Balloons.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Balloons.h; path = /Developer/Headers/FlatCarbon/Balloons.h; sourceTree = "<absolute>"; };
+		6412694009F974D9006DF4E6 /* Balloons.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Balloons.r; path = /Developer/Headers/FlatCarbon/Balloons.r; sourceTree = "<absolute>"; };
+		6412694109F974D9006DF4E6 /* BalloonTypes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = BalloonTypes.r; path = /Developer/Headers/FlatCarbon/BalloonTypes.r; sourceTree = "<absolute>"; };
+		6412694209F974D9006DF4E6 /* Carbon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Carbon.h; path = /Developer/Headers/FlatCarbon/Carbon.h; sourceTree = "<absolute>"; };
+		6412694309F974D9006DF4E6 /* Carbon.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Carbon.r; path = /Developer/Headers/FlatCarbon/Carbon.r; sourceTree = "<absolute>"; };
+		6412694409F974D9006DF4E6 /* CarbonEvents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CarbonEvents.h; path = /Developer/Headers/FlatCarbon/CarbonEvents.h; sourceTree = "<absolute>"; };
+		6412694509F974D9006DF4E6 /* CarbonEvents.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = CarbonEvents.r; path = /Developer/Headers/FlatCarbon/CarbonEvents.r; sourceTree = "<absolute>"; };
+		6412694609F974D9006DF4E6 /* CardServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CardServices.h; path = /Developer/Headers/FlatCarbon/CardServices.h; sourceTree = "<absolute>"; };
+		6412694709F974D9006DF4E6 /* CFArray.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFArray.h; path = /Developer/Headers/FlatCarbon/CFArray.h; sourceTree = "<absolute>"; };
+		6412694809F974D9006DF4E6 /* CFBag.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFBag.h; path = /Developer/Headers/FlatCarbon/CFBag.h; sourceTree = "<absolute>"; };
+		6412694909F974D9006DF4E6 /* CFBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFBase.h; path = /Developer/Headers/FlatCarbon/CFBase.h; sourceTree = "<absolute>"; };
+		6412694A09F974D9006DF4E6 /* CFBundle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFBundle.h; path = /Developer/Headers/FlatCarbon/CFBundle.h; sourceTree = "<absolute>"; };
+		6412694B09F974D9006DF4E6 /* CFCharacterSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFCharacterSet.h; path = /Developer/Headers/FlatCarbon/CFCharacterSet.h; sourceTree = "<absolute>"; };
+		6412694C09F974D9006DF4E6 /* CFData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFData.h; path = /Developer/Headers/FlatCarbon/CFData.h; sourceTree = "<absolute>"; };
+		6412694D09F974D9006DF4E6 /* CFDate.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFDate.h; path = /Developer/Headers/FlatCarbon/CFDate.h; sourceTree = "<absolute>"; };
+		6412694E09F974D9006DF4E6 /* CFDictionary.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFDictionary.h; path = /Developer/Headers/FlatCarbon/CFDictionary.h; sourceTree = "<absolute>"; };
+		6412694F09F974D9006DF4E6 /* CFNumber.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFNumber.h; path = /Developer/Headers/FlatCarbon/CFNumber.h; sourceTree = "<absolute>"; };
+		6412695009F974D9006DF4E6 /* CFPlugIn.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFPlugIn.h; path = /Developer/Headers/FlatCarbon/CFPlugIn.h; sourceTree = "<absolute>"; };
+		6412695109F974D9006DF4E6 /* CFPlugInCOM.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFPlugInCOM.h; path = /Developer/Headers/FlatCarbon/CFPlugInCOM.h; sourceTree = "<absolute>"; };
+		6412695209F974D9006DF4E6 /* CFPreferences.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFPreferences.h; path = /Developer/Headers/FlatCarbon/CFPreferences.h; sourceTree = "<absolute>"; };
+		6412695309F974D9006DF4E6 /* CFPropertyList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFPropertyList.h; path = /Developer/Headers/FlatCarbon/CFPropertyList.h; sourceTree = "<absolute>"; };
+		6412695409F974D9006DF4E6 /* CFSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFSet.h; path = /Developer/Headers/FlatCarbon/CFSet.h; sourceTree = "<absolute>"; };
+		6412695509F974D9006DF4E6 /* CFString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFString.h; path = /Developer/Headers/FlatCarbon/CFString.h; sourceTree = "<absolute>"; };
+		6412695609F974D9006DF4E6 /* CFStringEncodingExt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFStringEncodingExt.h; path = /Developer/Headers/FlatCarbon/CFStringEncodingExt.h; sourceTree = "<absolute>"; };
+		6412695709F974D9006DF4E6 /* CFTimeZone.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFTimeZone.h; path = /Developer/Headers/FlatCarbon/CFTimeZone.h; sourceTree = "<absolute>"; };
+		6412695809F974D9006DF4E6 /* CFTree.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFTree.h; path = /Developer/Headers/FlatCarbon/CFTree.h; sourceTree = "<absolute>"; };
+		6412695909F974D9006DF4E6 /* CFURL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFURL.h; path = /Developer/Headers/FlatCarbon/CFURL.h; sourceTree = "<absolute>"; };
+		6412695A09F974D9006DF4E6 /* CFURLAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFURLAccess.h; path = /Developer/Headers/FlatCarbon/CFURLAccess.h; sourceTree = "<absolute>"; };
+		6412695B09F974D9006DF4E6 /* CFUUID.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFUUID.h; path = /Developer/Headers/FlatCarbon/CFUUID.h; sourceTree = "<absolute>"; };
+		6412695C09F974D9006DF4E6 /* CFXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFXMLNode.h; path = /Developer/Headers/FlatCarbon/CFXMLNode.h; sourceTree = "<absolute>"; };
+		6412695D09F974D9006DF4E6 /* CFXMLParser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CFXMLParser.h; path = /Developer/Headers/FlatCarbon/CFXMLParser.h; sourceTree = "<absolute>"; };
+		6412695E09F974D9006DF4E6 /* CGAffineTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGAffineTransform.h; path = /Developer/Headers/FlatCarbon/CGAffineTransform.h; sourceTree = "<absolute>"; };
+		6412695F09F974D9006DF4E6 /* CGBase.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGBase.h; path = /Developer/Headers/FlatCarbon/CGBase.h; sourceTree = "<absolute>"; };
+		6412696009F974D9006DF4E6 /* CGBitmapContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGBitmapContext.h; path = /Developer/Headers/FlatCarbon/CGBitmapContext.h; sourceTree = "<absolute>"; };
+		6412696109F974D9006DF4E6 /* CGColorSpace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGColorSpace.h; path = /Developer/Headers/FlatCarbon/CGColorSpace.h; sourceTree = "<absolute>"; };
+		6412696209F974D9006DF4E6 /* CGContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGContext.h; path = /Developer/Headers/FlatCarbon/CGContext.h; sourceTree = "<absolute>"; };
+		6412696309F974D9006DF4E6 /* CGDataConsumer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGDataConsumer.h; path = /Developer/Headers/FlatCarbon/CGDataConsumer.h; sourceTree = "<absolute>"; };
+		6412696409F974D9006DF4E6 /* CGDataProvider.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGDataProvider.h; path = /Developer/Headers/FlatCarbon/CGDataProvider.h; sourceTree = "<absolute>"; };
+		6412696509F974D9006DF4E6 /* CGDirectDisplay.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGDirectDisplay.h; path = /Developer/Headers/FlatCarbon/CGDirectDisplay.h; sourceTree = "<absolute>"; };
+		6412696609F974D9006DF4E6 /* CGDirectPalette.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGDirectPalette.h; path = /Developer/Headers/FlatCarbon/CGDirectPalette.h; sourceTree = "<absolute>"; };
+		6412696709F974D9006DF4E6 /* CGError.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGError.h; path = /Developer/Headers/FlatCarbon/CGError.h; sourceTree = "<absolute>"; };
+		6412696809F974D9006DF4E6 /* CGFont.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGFont.h; path = /Developer/Headers/FlatCarbon/CGFont.h; sourceTree = "<absolute>"; };
+		6412696909F974D9006DF4E6 /* CGGeometry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGGeometry.h; path = /Developer/Headers/FlatCarbon/CGGeometry.h; sourceTree = "<absolute>"; };
+		6412696A09F974D9006DF4E6 /* CGImage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGImage.h; path = /Developer/Headers/FlatCarbon/CGImage.h; sourceTree = "<absolute>"; };
+		6412696B09F974D9006DF4E6 /* CGPattern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGPattern.h; path = /Developer/Headers/FlatCarbon/CGPattern.h; sourceTree = "<absolute>"; };
+		6412696C09F974D9006DF4E6 /* CGPDFContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGPDFContext.h; path = /Developer/Headers/FlatCarbon/CGPDFContext.h; sourceTree = "<absolute>"; };
+		6412696D09F974D9006DF4E6 /* CGPDFDocument.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGPDFDocument.h; path = /Developer/Headers/FlatCarbon/CGPDFDocument.h; sourceTree = "<absolute>"; };
+		6412696E09F974D9006DF4E6 /* CGRemoteOperation.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGRemoteOperation.h; path = /Developer/Headers/FlatCarbon/CGRemoteOperation.h; sourceTree = "<absolute>"; };
+		6412696F09F974D9006DF4E6 /* CGWindowLevel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CGWindowLevel.h; path = /Developer/Headers/FlatCarbon/CGWindowLevel.h; sourceTree = "<absolute>"; };
+		6412697009F974D9006DF4E6 /* CMAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMAcceleration.h; path = /Developer/Headers/FlatCarbon/CMAcceleration.h; sourceTree = "<absolute>"; };
+		6412697109F974D9006DF4E6 /* CMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMApplication.h; path = /Developer/Headers/FlatCarbon/CMApplication.h; sourceTree = "<absolute>"; };
+		6412697209F974D9006DF4E6 /* CMCalibrator.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMCalibrator.h; path = /Developer/Headers/FlatCarbon/CMCalibrator.h; sourceTree = "<absolute>"; };
+		6412697309F974D9006DF4E6 /* CMComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMComponent.h; path = /Developer/Headers/FlatCarbon/CMComponent.h; sourceTree = "<absolute>"; };
+		6412697409F974D9006DF4E6 /* CMConversions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMConversions.h; path = /Developer/Headers/FlatCarbon/CMConversions.h; sourceTree = "<absolute>"; };
+		6412697509F974D9006DF4E6 /* CMDeviceIntegration.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMDeviceIntegration.h; path = /Developer/Headers/FlatCarbon/CMDeviceIntegration.h; sourceTree = "<absolute>"; };
+		6412697609F974D9006DF4E6 /* CMICCProfile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMICCProfile.h; path = /Developer/Headers/FlatCarbon/CMICCProfile.h; sourceTree = "<absolute>"; };
+		6412697709F974D9006DF4E6 /* CMMComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMMComponent.h; path = /Developer/Headers/FlatCarbon/CMMComponent.h; sourceTree = "<absolute>"; };
+		6412697809F974D9006DF4E6 /* CMPRComponent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMPRComponent.h; path = /Developer/Headers/FlatCarbon/CMPRComponent.h; sourceTree = "<absolute>"; };
+		6412697909F974D9006DF4E6 /* CMScriptingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMScriptingPlugin.h; path = /Developer/Headers/FlatCarbon/CMScriptingPlugin.h; sourceTree = "<absolute>"; };
+		6412697A09F974D9006DF4E6 /* CMTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CMTypes.h; path = /Developer/Headers/FlatCarbon/CMTypes.h; sourceTree = "<absolute>"; };
+		6412697B09F974D9006DF4E6 /* CodeFragments.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CodeFragments.h; path = /Developer/Headers/FlatCarbon/CodeFragments.h; sourceTree = "<absolute>"; };
+		6412697C09F974D9006DF4E6 /* CodeFragments.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = CodeFragments.r; path = /Developer/Headers/FlatCarbon/CodeFragments.r; sourceTree = "<absolute>"; };
+		6412697D09F974D9006DF4E6 /* CodeFragmentTypes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = CodeFragmentTypes.r; path = /Developer/Headers/FlatCarbon/CodeFragmentTypes.r; sourceTree = "<absolute>"; };
+		6412697E09F974D9006DF4E6 /* Collections.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Collections.h; path = /Developer/Headers/FlatCarbon/Collections.h; sourceTree = "<absolute>"; };
+		6412697F09F974D9006DF4E6 /* Collections.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Collections.r; path = /Developer/Headers/FlatCarbon/Collections.r; sourceTree = "<absolute>"; };
+		6412698009F974D9006DF4E6 /* ColorPicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ColorPicker.h; path = /Developer/Headers/FlatCarbon/ColorPicker.h; sourceTree = "<absolute>"; };
+		6412698109F974D9006DF4E6 /* ColorPickerComponents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ColorPickerComponents.h; path = /Developer/Headers/FlatCarbon/ColorPickerComponents.h; sourceTree = "<absolute>"; };
+		6412698209F974D9006DF4E6 /* CommResources.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CommResources.h; path = /Developer/Headers/FlatCarbon/CommResources.h; sourceTree = "<absolute>"; };
+		6412698309F974D9006DF4E6 /* CommResources.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = CommResources.r; path = /Developer/Headers/FlatCarbon/CommResources.r; sourceTree = "<absolute>"; };
+		6412698409F974D9006DF4E6 /* Components.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Components.h; path = /Developer/Headers/FlatCarbon/Components.h; sourceTree = "<absolute>"; };
+		6412698509F974D9006DF4E6 /* Components.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Components.k.h; path = /Developer/Headers/FlatCarbon/Components.k.h; sourceTree = "<absolute>"; };
+		6412698609F974D9006DF4E6 /* Components.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Components.r; path = /Developer/Headers/FlatCarbon/Components.r; sourceTree = "<absolute>"; };
+		6412698709F974D9006DF4E6 /* ConditionalMacros.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ConditionalMacros.h; path = /Developer/Headers/FlatCarbon/ConditionalMacros.h; sourceTree = "<absolute>"; };
+		6412698809F974D9006DF4E6 /* ConditionalMacros.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = ConditionalMacros.r; path = /Developer/Headers/FlatCarbon/ConditionalMacros.r; sourceTree = "<absolute>"; };
+		6412698909F974D9006DF4E6 /* Connections.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Connections.h; path = /Developer/Headers/FlatCarbon/Connections.h; sourceTree = "<absolute>"; };
+		6412698A09F974D9006DF4E6 /* ConnectionTools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ConnectionTools.h; path = /Developer/Headers/FlatCarbon/ConnectionTools.h; sourceTree = "<absolute>"; };
+		6412698B09F974D9006DF4E6 /* ControlDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ControlDefinitions.h; path = /Developer/Headers/FlatCarbon/ControlDefinitions.h; sourceTree = "<absolute>"; };
+		6412698C09F974D9006DF4E6 /* ControlDefinitions.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = ControlDefinitions.r; path = /Developer/Headers/FlatCarbon/ControlDefinitions.r; sourceTree = "<absolute>"; };
+		6412698D09F974D9006DF4E6 /* Controls.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Controls.h; path = /Developer/Headers/FlatCarbon/Controls.h; sourceTree = "<absolute>"; };
+		6412698E09F974D9006DF4E6 /* Controls.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Controls.r; path = /Developer/Headers/FlatCarbon/Controls.r; sourceTree = "<absolute>"; };
+		6412698F09F974D9006DF4E6 /* ControlStrip.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ControlStrip.h; path = /Developer/Headers/FlatCarbon/ControlStrip.h; sourceTree = "<absolute>"; };
+		6412699009F974D9006DF4E6 /* CoreServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CoreServices.h; path = /Developer/Headers/FlatCarbon/CoreServices.h; sourceTree = "<absolute>"; };
+		6412699109F974D9006DF4E6 /* CoreServices.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = CoreServices.r; path = /Developer/Headers/FlatCarbon/CoreServices.r; sourceTree = "<absolute>"; };
+		6412699209F974D9006DF4E6 /* CRMSerialDevices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CRMSerialDevices.h; path = /Developer/Headers/FlatCarbon/CRMSerialDevices.h; sourceTree = "<absolute>"; };
+		6412699309F974D9006DF4E6 /* CryptoMessageSyntax.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CryptoMessageSyntax.h; path = /Developer/Headers/FlatCarbon/CryptoMessageSyntax.h; sourceTree = "<absolute>"; };
+		6412699409F974D9006DF4E6 /* CTBUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CTBUtilities.h; path = /Developer/Headers/FlatCarbon/CTBUtilities.h; sourceTree = "<absolute>"; };
+		6412699509F974D9006DF4E6 /* CursorDevices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = CursorDevices.h; path = /Developer/Headers/FlatCarbon/CursorDevices.h; sourceTree = "<absolute>"; };
+		6412699609F974D9006DF4E6 /* DatabaseAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DatabaseAccess.h; path = /Developer/Headers/FlatCarbon/DatabaseAccess.h; sourceTree = "<absolute>"; };
+		6412699709F974D9006DF4E6 /* DatabaseAccess.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = DatabaseAccess.r; path = /Developer/Headers/FlatCarbon/DatabaseAccess.r; sourceTree = "<absolute>"; };
+		6412699809F974D9006DF4E6 /* DateTimeUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DateTimeUtils.h; path = /Developer/Headers/FlatCarbon/DateTimeUtils.h; sourceTree = "<absolute>"; };
+		6412699909F974D9006DF4E6 /* Debugging.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Debugging.h; path = /Developer/Headers/FlatCarbon/Debugging.h; sourceTree = "<absolute>"; };
+		6412699A09F974D9006DF4E6 /* DeskBus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DeskBus.h; path = /Developer/Headers/FlatCarbon/DeskBus.h; sourceTree = "<absolute>"; };
+		6412699B09F974D9006DF4E6 /* DesktopPrinting.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DesktopPrinting.h; path = /Developer/Headers/FlatCarbon/DesktopPrinting.h; sourceTree = "<absolute>"; };
+		6412699C09F974D9006DF4E6 /* DesktopPrinting.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = DesktopPrinting.r; path = /Developer/Headers/FlatCarbon/DesktopPrinting.r; sourceTree = "<absolute>"; };
+		6412699D09F974D9006DF4E6 /* DeviceControl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DeviceControl.h; path = /Developer/Headers/FlatCarbon/DeviceControl.h; sourceTree = "<absolute>"; };
+		6412699E09F974D9006DF4E6 /* DeviceControl.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DeviceControl.k.h; path = /Developer/Headers/FlatCarbon/DeviceControl.k.h; sourceTree = "<absolute>"; };
+		6412699F09F974D9006DF4E6 /* Devices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Devices.h; path = /Developer/Headers/FlatCarbon/Devices.h; sourceTree = "<absolute>"; };
+		641269A009F974D9006DF4E6 /* Devices.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Devices.r; path = /Developer/Headers/FlatCarbon/Devices.r; sourceTree = "<absolute>"; };
+		641269A109F974D9006DF4E6 /* Dialogs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Dialogs.h; path = /Developer/Headers/FlatCarbon/Dialogs.h; sourceTree = "<absolute>"; };
+		641269A209F974D9006DF4E6 /* Dialogs.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Dialogs.r; path = /Developer/Headers/FlatCarbon/Dialogs.r; sourceTree = "<absolute>"; };
+		641269A309F974D9006DF4E6 /* Dictionary.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Dictionary.h; path = /Developer/Headers/FlatCarbon/Dictionary.h; sourceTree = "<absolute>"; };
+		641269A409F974D9006DF4E6 /* DiskInit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DiskInit.h; path = /Developer/Headers/FlatCarbon/DiskInit.h; sourceTree = "<absolute>"; };
+		641269A509F974D9006DF4E6 /* Disks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Disks.h; path = /Developer/Headers/FlatCarbon/Disks.h; sourceTree = "<absolute>"; };
+		641269A609F974D9006DF4E6 /* Displays.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Displays.h; path = /Developer/Headers/FlatCarbon/Displays.h; sourceTree = "<absolute>"; };
+		641269A709F974D9006DF4E6 /* Displays.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Displays.r; path = /Developer/Headers/FlatCarbon/Displays.r; sourceTree = "<absolute>"; };
+		641269A809F974D9006DF4E6 /* Drag.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Drag.h; path = /Developer/Headers/FlatCarbon/Drag.h; sourceTree = "<absolute>"; };
+		641269A909F974D9006DF4E6 /* DrawSprocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DrawSprocket.h; path = /Developer/Headers/FlatCarbon/DrawSprocket.h; sourceTree = "<absolute>"; };
+		641269AA09F974D9006DF4E6 /* DriverFamilyMatching.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DriverFamilyMatching.h; path = /Developer/Headers/FlatCarbon/DriverFamilyMatching.h; sourceTree = "<absolute>"; };
+		641269AB09F974D9006DF4E6 /* DriverGestalt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DriverGestalt.h; path = /Developer/Headers/FlatCarbon/DriverGestalt.h; sourceTree = "<absolute>"; };
+		641269AC09F974D9006DF4E6 /* DriverServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DriverServices.h; path = /Developer/Headers/FlatCarbon/DriverServices.h; sourceTree = "<absolute>"; };
+		641269AD09F974D9006DF4E6 /* DriverSupport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DriverSupport.h; path = /Developer/Headers/FlatCarbon/DriverSupport.h; sourceTree = "<absolute>"; };
+		641269AE09F974D9006DF4E6 /* DriverSynchronization.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DriverSynchronization.h; path = /Developer/Headers/FlatCarbon/DriverSynchronization.h; sourceTree = "<absolute>"; };
+		641269AF09F974D9006DF4E6 /* Editions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Editions.h; path = /Developer/Headers/FlatCarbon/Editions.h; sourceTree = "<absolute>"; };
+		641269B009F974D9006DF4E6 /* Endian.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Endian.h; path = /Developer/Headers/FlatCarbon/Endian.h; sourceTree = "<absolute>"; };
+		641269B109F974D9006DF4E6 /* ENET.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ENET.h; path = /Developer/Headers/FlatCarbon/ENET.h; sourceTree = "<absolute>"; };
+		641269B209F974D9006DF4E6 /* EPPC.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = EPPC.h; path = /Developer/Headers/FlatCarbon/EPPC.h; sourceTree = "<absolute>"; };
+		641269B309F974D9006DF4E6 /* EPPC.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = EPPC.r; path = /Developer/Headers/FlatCarbon/EPPC.r; sourceTree = "<absolute>"; };
+		641269B409F974D9006DF4E6 /* Errors.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Errors.h; path = /Developer/Headers/FlatCarbon/Errors.h; sourceTree = "<absolute>"; };
+		641269B509F974D9006DF4E6 /* Events.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Events.h; path = /Developer/Headers/FlatCarbon/Events.h; sourceTree = "<absolute>"; };
+		641269B609F974D9006DF4E6 /* Files.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Files.h; path = /Developer/Headers/FlatCarbon/Files.h; sourceTree = "<absolute>"; };
+		641269B709F974D9006DF4E6 /* FileSigning.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileSigning.h; path = /Developer/Headers/FlatCarbon/FileSigning.h; sourceTree = "<absolute>"; };
+		641269B809F974D9006DF4E6 /* FileTransfers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileTransfers.h; path = /Developer/Headers/FlatCarbon/FileTransfers.h; sourceTree = "<absolute>"; };
+		641269B909F974D9006DF4E6 /* FileTransferTools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileTransferTools.h; path = /Developer/Headers/FlatCarbon/FileTransferTools.h; sourceTree = "<absolute>"; };
+		641269BA09F974D9006DF4E6 /* FileTypesAndCreators.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileTypesAndCreators.h; path = /Developer/Headers/FlatCarbon/FileTypesAndCreators.h; sourceTree = "<absolute>"; };
+		641269BB09F974D9006DF4E6 /* FileTypesAndCreators.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = FileTypesAndCreators.r; path = /Developer/Headers/FlatCarbon/FileTypesAndCreators.r; sourceTree = "<absolute>"; };
+		641269BC09F974D9006DF4E6 /* FindByContent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FindByContent.h; path = /Developer/Headers/FlatCarbon/FindByContent.h; sourceTree = "<absolute>"; };
+		641269BD09F974D9006DF4E6 /* Finder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Finder.h; path = /Developer/Headers/FlatCarbon/Finder.h; sourceTree = "<absolute>"; };
+		641269BE09F974D9006DF4E6 /* Finder.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Finder.r; path = /Developer/Headers/FlatCarbon/Finder.r; sourceTree = "<absolute>"; };
+		641269BF09F974D9006DF4E6 /* FinderRegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FinderRegistry.h; path = /Developer/Headers/FlatCarbon/FinderRegistry.h; sourceTree = "<absolute>"; };
+		641269C009F974D9006DF4E6 /* FinderRegistry.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = FinderRegistry.r; path = /Developer/Headers/FlatCarbon/FinderRegistry.r; sourceTree = "<absolute>"; };
+		641269C109F974D9006DF4E6 /* FixMath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FixMath.h; path = /Developer/Headers/FlatCarbon/FixMath.h; sourceTree = "<absolute>"; };
+		641269C209F974D9006DF4E6 /* Folders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Folders.h; path = /Developer/Headers/FlatCarbon/Folders.h; sourceTree = "<absolute>"; };
+		641269C309F974D9006DF4E6 /* Folders.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Folders.r; path = /Developer/Headers/FlatCarbon/Folders.r; sourceTree = "<absolute>"; };
+		641269C409F974D9006DF4E6 /* Fonts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Fonts.h; path = /Developer/Headers/FlatCarbon/Fonts.h; sourceTree = "<absolute>"; };
+		641269C509F974D9006DF4E6 /* Fonts.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Fonts.r; path = /Developer/Headers/FlatCarbon/Fonts.r; sourceTree = "<absolute>"; };
+		641269C609F974D9006DF4E6 /* FontSync.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FontSync.h; path = /Developer/Headers/FlatCarbon/FontSync.h; sourceTree = "<absolute>"; };
+		641269C709F974D9006DF4E6 /* fp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fp.h; path = /Developer/Headers/FlatCarbon/fp.h; sourceTree = "<absolute>"; };
+		641269C809F974D9006DF4E6 /* FSM.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FSM.h; path = /Developer/Headers/FlatCarbon/FSM.h; sourceTree = "<absolute>"; };
+		641269C909F974D9006DF4E6 /* Gestalt.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Gestalt.h; path = /Developer/Headers/FlatCarbon/Gestalt.h; sourceTree = "<absolute>"; };
+		641269CA09F974D9006DF4E6 /* Gestalt.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Gestalt.r; path = /Developer/Headers/FlatCarbon/Gestalt.r; sourceTree = "<absolute>"; };
+		641269CB09F974D9006DF4E6 /* GoggleSprocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GoggleSprocket.h; path = /Developer/Headers/FlatCarbon/GoggleSprocket.h; sourceTree = "<absolute>"; };
+		641269CC09F974D9006DF4E6 /* GXEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXEnvironment.h; path = /Developer/Headers/FlatCarbon/GXEnvironment.h; sourceTree = "<absolute>"; };
+		641269CD09F974D9006DF4E6 /* GXErrors.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXErrors.h; path = /Developer/Headers/FlatCarbon/GXErrors.h; sourceTree = "<absolute>"; };
+		641269CE09F974D9006DF4E6 /* GXFonts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXFonts.h; path = /Developer/Headers/FlatCarbon/GXFonts.h; sourceTree = "<absolute>"; };
+		641269CF09F974D9006DF4E6 /* GXGraphics.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXGraphics.h; path = /Developer/Headers/FlatCarbon/GXGraphics.h; sourceTree = "<absolute>"; };
+		641269D009F974D9006DF4E6 /* GXLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXLayout.h; path = /Developer/Headers/FlatCarbon/GXLayout.h; sourceTree = "<absolute>"; };
+		641269D109F974D9006DF4E6 /* GXMath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXMath.h; path = /Developer/Headers/FlatCarbon/GXMath.h; sourceTree = "<absolute>"; };
+		641269D209F974D9006DF4E6 /* GXMessages.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXMessages.h; path = /Developer/Headers/FlatCarbon/GXMessages.h; sourceTree = "<absolute>"; };
+		641269D309F974D9006DF4E6 /* GXPrinterDrivers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXPrinterDrivers.h; path = /Developer/Headers/FlatCarbon/GXPrinterDrivers.h; sourceTree = "<absolute>"; };
+		641269D409F974D9006DF4E6 /* GXPrinting.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXPrinting.h; path = /Developer/Headers/FlatCarbon/GXPrinting.h; sourceTree = "<absolute>"; };
+		641269D509F974D9006DF4E6 /* GXTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GXTypes.h; path = /Developer/Headers/FlatCarbon/GXTypes.h; sourceTree = "<absolute>"; };
+		641269D609F974D9006DF4E6 /* HFSVolumes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HFSVolumes.h; path = /Developer/Headers/FlatCarbon/HFSVolumes.h; sourceTree = "<absolute>"; };
+		641269D709F974D9006DF4E6 /* HID.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HID.h; path = /Developer/Headers/FlatCarbon/HID.h; sourceTree = "<absolute>"; };
+		641269D809F974D9006DF4E6 /* HTMLRendering.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HTMLRendering.h; path = /Developer/Headers/FlatCarbon/HTMLRendering.h; sourceTree = "<absolute>"; };
+		641269D909F974D9006DF4E6 /* HyperXCmd.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = HyperXCmd.h; path = /Developer/Headers/FlatCarbon/HyperXCmd.h; sourceTree = "<absolute>"; };
+		641269DA09F974D9006DF4E6 /* IAExtractor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IAExtractor.h; path = /Developer/Headers/FlatCarbon/IAExtractor.h; sourceTree = "<absolute>"; };
+		641269DB09F974D9006DF4E6 /* IAExtractor.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = IAExtractor.r; path = /Developer/Headers/FlatCarbon/IAExtractor.r; sourceTree = "<absolute>"; };
+		641269DC09F974D9006DF4E6 /* IBCarbonRuntime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IBCarbonRuntime.h; path = /Developer/Headers/FlatCarbon/IBCarbonRuntime.h; sourceTree = "<absolute>"; };
+		641269DD09F974D9006DF4E6 /* ICAApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ICAApplication.h; path = /Developer/Headers/FlatCarbon/ICAApplication.h; sourceTree = "<absolute>"; };
+		641269DE09F974D9006DF4E6 /* ICACamera.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ICACamera.h; path = /Developer/Headers/FlatCarbon/ICACamera.h; sourceTree = "<absolute>"; };
+		641269DF09F974D9006DF4E6 /* ICADevice.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ICADevice.h; path = /Developer/Headers/FlatCarbon/ICADevice.h; sourceTree = "<absolute>"; };
+		641269E009F974D9006DF4E6 /* Icons.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Icons.h; path = /Developer/Headers/FlatCarbon/Icons.h; sourceTree = "<absolute>"; };
+		641269E109F974D9006DF4E6 /* Icons.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Icons.r; path = /Developer/Headers/FlatCarbon/Icons.r; sourceTree = "<absolute>"; };
+		641269E209F974D9006DF4E6 /* ImageCodec.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageCodec.h; path = /Developer/Headers/FlatCarbon/ImageCodec.h; sourceTree = "<absolute>"; };
+		641269E309F974D9006DF4E6 /* ImageCodec.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageCodec.k.h; path = /Developer/Headers/FlatCarbon/ImageCodec.k.h; sourceTree = "<absolute>"; };
+		641269E409F974D9006DF4E6 /* ImageCodec.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = ImageCodec.r; path = /Developer/Headers/FlatCarbon/ImageCodec.r; sourceTree = "<absolute>"; };
+		641269E509F974D9006DF4E6 /* ImageCompression.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageCompression.h; path = /Developer/Headers/FlatCarbon/ImageCompression.h; sourceTree = "<absolute>"; };
+		641269E609F974D9006DF4E6 /* ImageCompression.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImageCompression.k.h; path = /Developer/Headers/FlatCarbon/ImageCompression.k.h; sourceTree = "<absolute>"; };
+		641269E709F974D9006DF4E6 /* ImageCompression.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = ImageCompression.r; path = /Developer/Headers/FlatCarbon/ImageCompression.r; sourceTree = "<absolute>"; };
+		641269E809F974D9006DF4E6 /* InputSprocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InputSprocket.h; path = /Developer/Headers/FlatCarbon/InputSprocket.h; sourceTree = "<absolute>"; };
+		641269E909F974D9006DF4E6 /* InputSprocket.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = InputSprocket.r; path = /Developer/Headers/FlatCarbon/InputSprocket.r; sourceTree = "<absolute>"; };
+		641269EA09F974D9006DF4E6 /* InternetConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = InternetConfig.h; path = /Developer/Headers/FlatCarbon/InternetConfig.h; sourceTree = "<absolute>"; };
+		641269EB09F974D9006DF4E6 /* Interrupts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Interrupts.h; path = /Developer/Headers/FlatCarbon/Interrupts.h; sourceTree = "<absolute>"; };
+		641269EC09F974D9006DF4E6 /* IntlResources.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IntlResources.h; path = /Developer/Headers/FlatCarbon/IntlResources.h; sourceTree = "<absolute>"; };
+		641269ED09F974D9006DF4E6 /* IntlResources.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = IntlResources.r; path = /Developer/Headers/FlatCarbon/IntlResources.r; sourceTree = "<absolute>"; };
+		641269EE09F974D9006DF4E6 /* IsochronousDataHandler.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IsochronousDataHandler.h; path = /Developer/Headers/FlatCarbon/IsochronousDataHandler.h; sourceTree = "<absolute>"; };
+		641269EF09F974D9006DF4E6 /* IsochronousDataHandler.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = IsochronousDataHandler.k.h; path = /Developer/Headers/FlatCarbon/IsochronousDataHandler.k.h; sourceTree = "<absolute>"; };
+		641269F009F974D9006DF4E6 /* IsochronousDataHandler.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = IsochronousDataHandler.r; path = /Developer/Headers/FlatCarbon/IsochronousDataHandler.r; sourceTree = "<absolute>"; };
+		641269F109F974D9006DF4E6 /* JManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = JManager.h; path = /Developer/Headers/FlatCarbon/JManager.h; sourceTree = "<absolute>"; };
+		641269F209F974D9006DF4E6 /* Kernel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Kernel.h; path = /Developer/Headers/FlatCarbon/Kernel.h; sourceTree = "<absolute>"; };
+		641269F309F974D9006DF4E6 /* Keyboards.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Keyboards.h; path = /Developer/Headers/FlatCarbon/Keyboards.h; sourceTree = "<absolute>"; };
+		641269F409F974D9006DF4E6 /* Keychain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Keychain.h; path = /Developer/Headers/FlatCarbon/Keychain.h; sourceTree = "<absolute>"; };
+		641269F509F974D9006DF4E6 /* KeychainCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KeychainCore.h; path = /Developer/Headers/FlatCarbon/KeychainCore.h; sourceTree = "<absolute>"; };
+		641269F609F974D9006DF4E6 /* KeychainHI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = KeychainHI.h; path = /Developer/Headers/FlatCarbon/KeychainHI.h; sourceTree = "<absolute>"; };
+		641269F709F974D9006DF4E6 /* LanguageAnalysis.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LanguageAnalysis.h; path = /Developer/Headers/FlatCarbon/LanguageAnalysis.h; sourceTree = "<absolute>"; };
+		641269F809F974D9006DF4E6 /* LaunchServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LaunchServices.h; path = /Developer/Headers/FlatCarbon/LaunchServices.h; sourceTree = "<absolute>"; };
+		641269F909F974D9006DF4E6 /* Lists.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Lists.h; path = /Developer/Headers/FlatCarbon/Lists.h; sourceTree = "<absolute>"; };
+		641269FA09F974D9006DF4E6 /* LocationManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LocationManager.h; path = /Developer/Headers/FlatCarbon/LocationManager.h; sourceTree = "<absolute>"; };
+		641269FB09F974D9006DF4E6 /* LocationManager.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LocationManager.k.h; path = /Developer/Headers/FlatCarbon/LocationManager.k.h; sourceTree = "<absolute>"; };
+		641269FC09F974D9006DF4E6 /* LocationManager.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = LocationManager.r; path = /Developer/Headers/FlatCarbon/LocationManager.r; sourceTree = "<absolute>"; };
+		641269FD09F974D9006DF4E6 /* LowMem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = LowMem.h; path = /Developer/Headers/FlatCarbon/LowMem.h; sourceTree = "<absolute>"; };
+		641269FE09F974D9006DF4E6 /* MacApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacApplication.h; path = /Developer/Headers/FlatCarbon/MacApplication.h; sourceTree = "<absolute>"; };
+		641269FF09F974D9006DF4E6 /* MacErrors.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacErrors.h; path = /Developer/Headers/FlatCarbon/MacErrors.h; sourceTree = "<absolute>"; };
+		64126A0009F974D9006DF4E6 /* MacHelp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacHelp.h; path = /Developer/Headers/FlatCarbon/MacHelp.h; sourceTree = "<absolute>"; };
+		64126A0109F974D9006DF4E6 /* MachineExceptions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MachineExceptions.h; path = /Developer/Headers/FlatCarbon/MachineExceptions.h; sourceTree = "<absolute>"; };
+		64126A0209F974D9006DF4E6 /* MacLocales.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacLocales.h; path = /Developer/Headers/FlatCarbon/MacLocales.h; sourceTree = "<absolute>"; };
+		64126A0309F974D9006DF4E6 /* MacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacMemory.h; path = /Developer/Headers/FlatCarbon/MacMemory.h; sourceTree = "<absolute>"; };
+		64126A0409F974D9006DF4E6 /* MacTCP.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacTCP.h; path = /Developer/Headers/FlatCarbon/MacTCP.h; sourceTree = "<absolute>"; };
+		64126A0509F974D9006DF4E6 /* MacTextEditor.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacTextEditor.h; path = /Developer/Headers/FlatCarbon/MacTextEditor.h; sourceTree = "<absolute>"; };
+		64126A0609F974D9006DF4E6 /* MacTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacTypes.h; path = /Developer/Headers/FlatCarbon/MacTypes.h; sourceTree = "<absolute>"; };
+		64126A0709F974D9006DF4E6 /* MacTypes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = MacTypes.r; path = /Developer/Headers/FlatCarbon/MacTypes.r; sourceTree = "<absolute>"; };
+		64126A0809F974D9006DF4E6 /* MacWindows.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacWindows.h; path = /Developer/Headers/FlatCarbon/MacWindows.h; sourceTree = "<absolute>"; };
+		64126A0909F974D9006DF4E6 /* MacWindows.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = MacWindows.r; path = /Developer/Headers/FlatCarbon/MacWindows.r; sourceTree = "<absolute>"; };
+		64126A0A09F974D9006DF4E6 /* Math64.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Math64.h; path = /Developer/Headers/FlatCarbon/Math64.h; sourceTree = "<absolute>"; };
+		64126A0B09F974D9006DF4E6 /* MediaHandlers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MediaHandlers.h; path = /Developer/Headers/FlatCarbon/MediaHandlers.h; sourceTree = "<absolute>"; };
+		64126A0C09F974D9006DF4E6 /* MediaHandlers.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MediaHandlers.k.h; path = /Developer/Headers/FlatCarbon/MediaHandlers.k.h; sourceTree = "<absolute>"; };
+		64126A0D09F974D9006DF4E6 /* Memory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Memory.h; path = /Developer/Headers/FlatCarbon/Memory.h; sourceTree = "<absolute>"; };
+		64126A0E09F974D9006DF4E6 /* Menus.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Menus.h; path = /Developer/Headers/FlatCarbon/Menus.h; sourceTree = "<absolute>"; };
+		64126A0F09F974D9006DF4E6 /* Menus.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Menus.r; path = /Developer/Headers/FlatCarbon/Menus.r; sourceTree = "<absolute>"; };
+		64126A1009F974D9006DF4E6 /* MIDI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MIDI.h; path = /Developer/Headers/FlatCarbon/MIDI.h; sourceTree = "<absolute>"; };
+		64126A1109F974D9006DF4E6 /* MixedMode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MixedMode.h; path = /Developer/Headers/FlatCarbon/MixedMode.h; sourceTree = "<absolute>"; };
+		64126A1209F974D9006DF4E6 /* MixedMode.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = MixedMode.r; path = /Developer/Headers/FlatCarbon/MixedMode.r; sourceTree = "<absolute>"; };
+		64126A1309F974D9006DF4E6 /* Movies.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Movies.h; path = /Developer/Headers/FlatCarbon/Movies.h; sourceTree = "<absolute>"; };
+		64126A1409F974D9006DF4E6 /* Movies.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Movies.k.h; path = /Developer/Headers/FlatCarbon/Movies.k.h; sourceTree = "<absolute>"; };
+		64126A1509F974D9006DF4E6 /* MoviesFormat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MoviesFormat.h; path = /Developer/Headers/FlatCarbon/MoviesFormat.h; sourceTree = "<absolute>"; };
+		64126A1609F974D9006DF4E6 /* Multiprocessing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Multiprocessing.h; path = /Developer/Headers/FlatCarbon/Multiprocessing.h; sourceTree = "<absolute>"; };
+		64126A1709F974D9006DF4E6 /* MultiprocessingInfo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MultiprocessingInfo.h; path = /Developer/Headers/FlatCarbon/MultiprocessingInfo.h; sourceTree = "<absolute>"; };
+		64126A1809F974D9006DF4E6 /* NameRegistry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NameRegistry.h; path = /Developer/Headers/FlatCarbon/NameRegistry.h; sourceTree = "<absolute>"; };
+		64126A1909F974D9006DF4E6 /* Navigation.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Navigation.h; path = /Developer/Headers/FlatCarbon/Navigation.h; sourceTree = "<absolute>"; };
+		64126A1A09F974D9006DF4E6 /* NetSprocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NetSprocket.h; path = /Developer/Headers/FlatCarbon/NetSprocket.h; sourceTree = "<absolute>"; };
+		64126A1B09F974D9006DF4E6 /* NetworkSetup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NetworkSetup.h; path = /Developer/Headers/FlatCarbon/NetworkSetup.h; sourceTree = "<absolute>"; };
+		64126A1C09F974D9006DF4E6 /* NetworkSetup.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = NetworkSetup.r; path = /Developer/Headers/FlatCarbon/NetworkSetup.r; sourceTree = "<absolute>"; };
+		64126A1D09F974D9006DF4E6 /* Notification.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Notification.h; path = /Developer/Headers/FlatCarbon/Notification.h; sourceTree = "<absolute>"; };
+		64126A1E09F974D9006DF4E6 /* NSL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSL.h; path = /Developer/Headers/FlatCarbon/NSL.h; sourceTree = "<absolute>"; };
+		64126A1F09F974D9006DF4E6 /* NSLCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSLCore.h; path = /Developer/Headers/FlatCarbon/NSLCore.h; sourceTree = "<absolute>"; };
+		64126A2009F974D9006DF4E6 /* NumberFormatting.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NumberFormatting.h; path = /Developer/Headers/FlatCarbon/NumberFormatting.h; sourceTree = "<absolute>"; };
+		64126A2109F974D9006DF4E6 /* OpenTptAppleTalk.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptAppleTalk.h; path = /Developer/Headers/FlatCarbon/OpenTptAppleTalk.h; sourceTree = "<absolute>"; };
+		64126A2209F974D9006DF4E6 /* OpenTptClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptClient.h; path = /Developer/Headers/FlatCarbon/OpenTptClient.h; sourceTree = "<absolute>"; };
+		64126A2309F974D9006DF4E6 /* OpenTptCommon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptCommon.h; path = /Developer/Headers/FlatCarbon/OpenTptCommon.h; sourceTree = "<absolute>"; };
+		64126A2409F974D9006DF4E6 /* OpenTptConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptConfig.h; path = /Developer/Headers/FlatCarbon/OpenTptConfig.h; sourceTree = "<absolute>"; };
+		64126A2509F974D9006DF4E6 /* OpenTptDevLinks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptDevLinks.h; path = /Developer/Headers/FlatCarbon/OpenTptDevLinks.h; sourceTree = "<absolute>"; };
+		64126A2609F974D9006DF4E6 /* OpenTptGlobalNew.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptGlobalNew.h; path = /Developer/Headers/FlatCarbon/OpenTptGlobalNew.h; sourceTree = "<absolute>"; };
+		64126A2709F974D9006DF4E6 /* OpenTptInternet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptInternet.h; path = /Developer/Headers/FlatCarbon/OpenTptInternet.h; sourceTree = "<absolute>"; };
+		64126A2809F974D9006DF4E6 /* OpenTptISDN.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptISDN.h; path = /Developer/Headers/FlatCarbon/OpenTptISDN.h; sourceTree = "<absolute>"; };
+		64126A2909F974D9006DF4E6 /* OpenTptLinks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptLinks.h; path = /Developer/Headers/FlatCarbon/OpenTptLinks.h; sourceTree = "<absolute>"; };
+		64126A2A09F974D9006DF4E6 /* OpenTptModule.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptModule.h; path = /Developer/Headers/FlatCarbon/OpenTptModule.h; sourceTree = "<absolute>"; };
+		64126A2B09F974D9006DF4E6 /* OpenTptPCISupport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptPCISupport.h; path = /Developer/Headers/FlatCarbon/OpenTptPCISupport.h; sourceTree = "<absolute>"; };
+		64126A2C09F974D9006DF4E6 /* OpenTptSerial.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptSerial.h; path = /Developer/Headers/FlatCarbon/OpenTptSerial.h; sourceTree = "<absolute>"; };
+		64126A2D09F974D9006DF4E6 /* OpenTptXTI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTptXTI.h; path = /Developer/Headers/FlatCarbon/OpenTptXTI.h; sourceTree = "<absolute>"; };
+		64126A2E09F974D9006DF4E6 /* OpenTransport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTransport.h; path = /Developer/Headers/FlatCarbon/OpenTransport.h; sourceTree = "<absolute>"; };
+		64126A2F09F974D9006DF4E6 /* OpenTransport.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = OpenTransport.r; path = /Developer/Headers/FlatCarbon/OpenTransport.r; sourceTree = "<absolute>"; };
+		64126A3009F974D9006DF4E6 /* OpenTransportKernel.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTransportKernel.h; path = /Developer/Headers/FlatCarbon/OpenTransportKernel.h; sourceTree = "<absolute>"; };
+		64126A3109F974D9006DF4E6 /* OpenTransportKernel.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = OpenTransportKernel.r; path = /Developer/Headers/FlatCarbon/OpenTransportKernel.r; sourceTree = "<absolute>"; };
+		64126A3209F974D9006DF4E6 /* OpenTransportProtocol.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTransportProtocol.h; path = /Developer/Headers/FlatCarbon/OpenTransportProtocol.h; sourceTree = "<absolute>"; };
+		64126A3309F974D9006DF4E6 /* OpenTransportProtocol.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = OpenTransportProtocol.r; path = /Developer/Headers/FlatCarbon/OpenTransportProtocol.r; sourceTree = "<absolute>"; };
+		64126A3409F974D9006DF4E6 /* OpenTransportProviders.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTransportProviders.h; path = /Developer/Headers/FlatCarbon/OpenTransportProviders.h; sourceTree = "<absolute>"; };
+		64126A3509F974D9006DF4E6 /* OpenTransportProviders.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = OpenTransportProviders.r; path = /Developer/Headers/FlatCarbon/OpenTransportProviders.r; sourceTree = "<absolute>"; };
+		64126A3609F974D9006DF4E6 /* OpenTransportUNIX.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OpenTransportUNIX.h; path = /Developer/Headers/FlatCarbon/OpenTransportUNIX.h; sourceTree = "<absolute>"; };
+		64126A3709F974D9006DF4E6 /* OSA.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OSA.h; path = /Developer/Headers/FlatCarbon/OSA.h; sourceTree = "<absolute>"; };
+		64126A3809F974D9006DF4E6 /* OSA.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OSA.k.h; path = /Developer/Headers/FlatCarbon/OSA.k.h; sourceTree = "<absolute>"; };
+		64126A3909F974D9006DF4E6 /* OSAComp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OSAComp.h; path = /Developer/Headers/FlatCarbon/OSAComp.h; sourceTree = "<absolute>"; };
+		64126A3A09F974D9006DF4E6 /* OSAGeneric.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OSAGeneric.h; path = /Developer/Headers/FlatCarbon/OSAGeneric.h; sourceTree = "<absolute>"; };
+		64126A3B09F974D9006DF4E6 /* OSUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = OSUtils.h; path = /Developer/Headers/FlatCarbon/OSUtils.h; sourceTree = "<absolute>"; };
+		64126A3C09F974D9006DF4E6 /* OSUtils.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = OSUtils.r; path = /Developer/Headers/FlatCarbon/OSUtils.r; sourceTree = "<absolute>"; };
+		64126A3D09F974D9006DF4E6 /* OTConfig.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = OTConfig.r; path = /Developer/Headers/FlatCarbon/OTConfig.r; sourceTree = "<absolute>"; };
+		64126A3E09F974D9006DF4E6 /* Packages.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Packages.h; path = /Developer/Headers/FlatCarbon/Packages.h; sourceTree = "<absolute>"; };
+		64126A3F09F974D9006DF4E6 /* Palettes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Palettes.h; path = /Developer/Headers/FlatCarbon/Palettes.h; sourceTree = "<absolute>"; };
+		64126A4009F974D9006DF4E6 /* Palettes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Palettes.r; path = /Developer/Headers/FlatCarbon/Palettes.r; sourceTree = "<absolute>"; };
+		64126A4109F974D9006DF4E6 /* Patches.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Patches.h; path = /Developer/Headers/FlatCarbon/Patches.h; sourceTree = "<absolute>"; };
+		64126A4209F974D9006DF4E6 /* PCCard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PCCard.h; path = /Developer/Headers/FlatCarbon/PCCard.h; sourceTree = "<absolute>"; };
+		64126A4309F974D9006DF4E6 /* PCCardAdapterPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PCCardAdapterPlugin.h; path = /Developer/Headers/FlatCarbon/PCCardAdapterPlugin.h; sourceTree = "<absolute>"; };
+		64126A4409F974D9006DF4E6 /* PCCardEnablerPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PCCardEnablerPlugin.h; path = /Developer/Headers/FlatCarbon/PCCardEnablerPlugin.h; sourceTree = "<absolute>"; };
+		64126A4509F974D9006DF4E6 /* PCCardEnablerPlugin.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = PCCardEnablerPlugin.r; path = /Developer/Headers/FlatCarbon/PCCardEnablerPlugin.r; sourceTree = "<absolute>"; };
+		64126A4609F974D9006DF4E6 /* PCCardTuples.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PCCardTuples.h; path = /Developer/Headers/FlatCarbon/PCCardTuples.h; sourceTree = "<absolute>"; };
+		64126A4709F974D9006DF4E6 /* PCI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PCI.h; path = /Developer/Headers/FlatCarbon/PCI.h; sourceTree = "<absolute>"; };
+		64126A4809F974D9006DF4E6 /* PEFBinaryFormat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PEFBinaryFormat.h; path = /Developer/Headers/FlatCarbon/PEFBinaryFormat.h; sourceTree = "<absolute>"; };
+		64126A4909F974D9006DF4E6 /* Pict.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Pict.r; path = /Developer/Headers/FlatCarbon/Pict.r; sourceTree = "<absolute>"; };
+		64126A4A09F974D9006DF4E6 /* PictUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PictUtils.h; path = /Developer/Headers/FlatCarbon/PictUtils.h; sourceTree = "<absolute>"; };
+		64126A4B09F974D9006DF4E6 /* PictUtils.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = PictUtils.r; path = /Developer/Headers/FlatCarbon/PictUtils.r; sourceTree = "<absolute>"; };
+		64126A4C09F974D9006DF4E6 /* PLStringFuncs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PLStringFuncs.h; path = /Developer/Headers/FlatCarbon/PLStringFuncs.h; sourceTree = "<absolute>"; };
+		64126A4D09F974D9006DF4E6 /* PMApplication.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PMApplication.h; path = /Developer/Headers/FlatCarbon/PMApplication.h; sourceTree = "<absolute>"; };
+		64126A4E09F974D9006DF4E6 /* PMCore.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PMCore.h; path = /Developer/Headers/FlatCarbon/PMCore.h; sourceTree = "<absolute>"; };
+		64126A4F09F974D9006DF4E6 /* PMDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PMDefinitions.h; path = /Developer/Headers/FlatCarbon/PMDefinitions.h; sourceTree = "<absolute>"; };
+		64126A5009F974D9006DF4E6 /* Power.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Power.h; path = /Developer/Headers/FlatCarbon/Power.h; sourceTree = "<absolute>"; };
+		64126A5109F974D9006DF4E6 /* PPCToolbox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PPCToolbox.h; path = /Developer/Headers/FlatCarbon/PPCToolbox.h; sourceTree = "<absolute>"; };
+		64126A5209F974D9006DF4E6 /* PPCToolbox.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = PPCToolbox.r; path = /Developer/Headers/FlatCarbon/PPCToolbox.r; sourceTree = "<absolute>"; };
+		64126A5309F974D9006DF4E6 /* Printing.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Printing.h; path = /Developer/Headers/FlatCarbon/Printing.h; sourceTree = "<absolute>"; };
+		64126A5409F974D9006DF4E6 /* Processes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Processes.h; path = /Developer/Headers/FlatCarbon/Processes.h; sourceTree = "<absolute>"; };
+		64126A5509F974D9006DF4E6 /* Processes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Processes.r; path = /Developer/Headers/FlatCarbon/Processes.r; sourceTree = "<absolute>"; };
+		64126A5609F974D9006DF4E6 /* QD3D.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3D.h; path = /Developer/Headers/FlatCarbon/QD3D.h; sourceTree = "<absolute>"; };
+		64126A5709F974D9006DF4E6 /* QD3DAcceleration.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DAcceleration.h; path = /Developer/Headers/FlatCarbon/QD3DAcceleration.h; sourceTree = "<absolute>"; };
+		64126A5809F974D9006DF4E6 /* QD3DCamera.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DCamera.h; path = /Developer/Headers/FlatCarbon/QD3DCamera.h; sourceTree = "<absolute>"; };
+		64126A5909F974D9006DF4E6 /* QD3DController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DController.h; path = /Developer/Headers/FlatCarbon/QD3DController.h; sourceTree = "<absolute>"; };
+		64126A5A09F974D9006DF4E6 /* QD3DCustomElements.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DCustomElements.h; path = /Developer/Headers/FlatCarbon/QD3DCustomElements.h; sourceTree = "<absolute>"; };
+		64126A5B09F974D9006DF4E6 /* QD3DDrawContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DDrawContext.h; path = /Developer/Headers/FlatCarbon/QD3DDrawContext.h; sourceTree = "<absolute>"; };
+		64126A5C09F974D9006DF4E6 /* QD3DErrors.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DErrors.h; path = /Developer/Headers/FlatCarbon/QD3DErrors.h; sourceTree = "<absolute>"; };
+		64126A5D09F974D9006DF4E6 /* QD3DExtension.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DExtension.h; path = /Developer/Headers/FlatCarbon/QD3DExtension.h; sourceTree = "<absolute>"; };
+		64126A5E09F974D9006DF4E6 /* QD3DGeometry.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DGeometry.h; path = /Developer/Headers/FlatCarbon/QD3DGeometry.h; sourceTree = "<absolute>"; };
+		64126A5F09F974D9006DF4E6 /* QD3DGroup.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DGroup.h; path = /Developer/Headers/FlatCarbon/QD3DGroup.h; sourceTree = "<absolute>"; };
+		64126A6009F974D9006DF4E6 /* QD3DIO.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DIO.h; path = /Developer/Headers/FlatCarbon/QD3DIO.h; sourceTree = "<absolute>"; };
+		64126A6109F974D9006DF4E6 /* QD3DLight.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DLight.h; path = /Developer/Headers/FlatCarbon/QD3DLight.h; sourceTree = "<absolute>"; };
+		64126A6209F974D9006DF4E6 /* QD3DMath.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DMath.h; path = /Developer/Headers/FlatCarbon/QD3DMath.h; sourceTree = "<absolute>"; };
+		64126A6309F974D9006DF4E6 /* QD3DPick.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DPick.h; path = /Developer/Headers/FlatCarbon/QD3DPick.h; sourceTree = "<absolute>"; };
+		64126A6409F974D9006DF4E6 /* QD3DRenderer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DRenderer.h; path = /Developer/Headers/FlatCarbon/QD3DRenderer.h; sourceTree = "<absolute>"; };
+		64126A6509F974D9006DF4E6 /* QD3DSet.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DSet.h; path = /Developer/Headers/FlatCarbon/QD3DSet.h; sourceTree = "<absolute>"; };
+		64126A6609F974D9006DF4E6 /* QD3DShader.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DShader.h; path = /Developer/Headers/FlatCarbon/QD3DShader.h; sourceTree = "<absolute>"; };
+		64126A6709F974D9006DF4E6 /* QD3DStorage.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DStorage.h; path = /Developer/Headers/FlatCarbon/QD3DStorage.h; sourceTree = "<absolute>"; };
+		64126A6809F974D9006DF4E6 /* QD3DString.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DString.h; path = /Developer/Headers/FlatCarbon/QD3DString.h; sourceTree = "<absolute>"; };
+		64126A6909F974D9006DF4E6 /* QD3DStyle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DStyle.h; path = /Developer/Headers/FlatCarbon/QD3DStyle.h; sourceTree = "<absolute>"; };
+		64126A6A09F974D9006DF4E6 /* QD3DTransform.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DTransform.h; path = /Developer/Headers/FlatCarbon/QD3DTransform.h; sourceTree = "<absolute>"; };
+		64126A6B09F974D9006DF4E6 /* QD3DView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DView.h; path = /Developer/Headers/FlatCarbon/QD3DView.h; sourceTree = "<absolute>"; };
+		64126A6C09F974D9006DF4E6 /* QD3DViewer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DViewer.h; path = /Developer/Headers/FlatCarbon/QD3DViewer.h; sourceTree = "<absolute>"; };
+		64126A6D09F974D9006DF4E6 /* QD3DWinViewer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QD3DWinViewer.h; path = /Developer/Headers/FlatCarbon/QD3DWinViewer.h; sourceTree = "<absolute>"; };
+		64126A6E09F974D9006DF4E6 /* QDOffscreen.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QDOffscreen.h; path = /Developer/Headers/FlatCarbon/QDOffscreen.h; sourceTree = "<absolute>"; };
+		64126A6F09F974D9006DF4E6 /* QTML.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QTML.h; path = /Developer/Headers/FlatCarbon/QTML.h; sourceTree = "<absolute>"; };
+		64126A7009F974D9006DF4E6 /* QTSMovie.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QTSMovie.h; path = /Developer/Headers/FlatCarbon/QTSMovie.h; sourceTree = "<absolute>"; };
+		64126A7109F974D9006DF4E6 /* QTSMovie.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QTSMovie.k.h; path = /Developer/Headers/FlatCarbon/QTSMovie.k.h; sourceTree = "<absolute>"; };
+		64126A7209F974D9006DF4E6 /* QTSMovie.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = QTSMovie.r; path = /Developer/Headers/FlatCarbon/QTSMovie.r; sourceTree = "<absolute>"; };
+		64126A7309F974D9006DF4E6 /* QTStreamingComponents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QTStreamingComponents.h; path = /Developer/Headers/FlatCarbon/QTStreamingComponents.h; sourceTree = "<absolute>"; };
+		64126A7409F974D9006DF4E6 /* QTStreamingComponents.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QTStreamingComponents.k.h; path = /Developer/Headers/FlatCarbon/QTStreamingComponents.k.h; sourceTree = "<absolute>"; };
+		64126A7509F974D9006DF4E6 /* QTStreamingComponents.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = QTStreamingComponents.r; path = /Developer/Headers/FlatCarbon/QTStreamingComponents.r; sourceTree = "<absolute>"; };
+		64126A7609F974D9006DF4E6 /* Quickdraw.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Quickdraw.h; path = /Developer/Headers/FlatCarbon/Quickdraw.h; sourceTree = "<absolute>"; };
+		64126A7709F974D9006DF4E6 /* Quickdraw.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Quickdraw.r; path = /Developer/Headers/FlatCarbon/Quickdraw.r; sourceTree = "<absolute>"; };
+		64126A7809F974D9006DF4E6 /* QuickdrawText.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickdrawText.h; path = /Developer/Headers/FlatCarbon/QuickdrawText.h; sourceTree = "<absolute>"; };
+		64126A7909F974D9006DF4E6 /* QuickTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTime.h; path = /Developer/Headers/FlatCarbon/QuickTime.h; sourceTree = "<absolute>"; };
+		64126A7A09F974D9006DF4E6 /* QuickTime.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = QuickTime.r; path = /Developer/Headers/FlatCarbon/QuickTime.r; sourceTree = "<absolute>"; };
+		64126A7B09F974D9006DF4E6 /* QuickTimeComponents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeComponents.h; path = /Developer/Headers/FlatCarbon/QuickTimeComponents.h; sourceTree = "<absolute>"; };
+		64126A7C09F974D9006DF4E6 /* QuickTimeComponents.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeComponents.k.h; path = /Developer/Headers/FlatCarbon/QuickTimeComponents.k.h; sourceTree = "<absolute>"; };
+		64126A7D09F974D9006DF4E6 /* QuickTimeComponents.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = QuickTimeComponents.r; path = /Developer/Headers/FlatCarbon/QuickTimeComponents.r; sourceTree = "<absolute>"; };
+		64126A7E09F974D9006DF4E6 /* QuickTimeMusic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeMusic.h; path = /Developer/Headers/FlatCarbon/QuickTimeMusic.h; sourceTree = "<absolute>"; };
+		64126A7F09F974D9006DF4E6 /* QuickTimeMusic.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeMusic.k.h; path = /Developer/Headers/FlatCarbon/QuickTimeMusic.k.h; sourceTree = "<absolute>"; };
+		64126A8009F974D9006DF4E6 /* QuickTimeStreaming.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeStreaming.h; path = /Developer/Headers/FlatCarbon/QuickTimeStreaming.h; sourceTree = "<absolute>"; };
+		64126A8109F974D9006DF4E6 /* QuickTimeVR.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeVR.h; path = /Developer/Headers/FlatCarbon/QuickTimeVR.h; sourceTree = "<absolute>"; };
+		64126A8209F974D9006DF4E6 /* QuickTimeVRFormat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = QuickTimeVRFormat.h; path = /Developer/Headers/FlatCarbon/QuickTimeVRFormat.h; sourceTree = "<absolute>"; };
+		64126A8309F974D9006DF4E6 /* RAVE.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RAVE.h; path = /Developer/Headers/FlatCarbon/RAVE.h; sourceTree = "<absolute>"; };
+		64126A8409F974D9006DF4E6 /* RAVESystem.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = RAVESystem.h; path = /Developer/Headers/FlatCarbon/RAVESystem.h; sourceTree = "<absolute>"; };
+		64126A8509F974D9006DF4E6 /* Resources.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Resources.h; path = /Developer/Headers/FlatCarbon/Resources.h; sourceTree = "<absolute>"; };
+		64126A8609F974D9006DF4E6 /* Retrace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Retrace.h; path = /Developer/Headers/FlatCarbon/Retrace.h; sourceTree = "<absolute>"; };
+		64126A8709F974D9006DF4E6 /* ROMDefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ROMDefs.h; path = /Developer/Headers/FlatCarbon/ROMDefs.h; sourceTree = "<absolute>"; };
+		64126A8809F974D9006DF4E6 /* ScalerStreamTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ScalerStreamTypes.h; path = /Developer/Headers/FlatCarbon/ScalerStreamTypes.h; sourceTree = "<absolute>"; };
+		64126A8909F974D9006DF4E6 /* ScalerTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ScalerTypes.h; path = /Developer/Headers/FlatCarbon/ScalerTypes.h; sourceTree = "<absolute>"; };
+		64126A8A09F974D9006DF4E6 /* Scrap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Scrap.h; path = /Developer/Headers/FlatCarbon/Scrap.h; sourceTree = "<absolute>"; };
+		64126A8B09F974D9006DF4E6 /* Script.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Script.h; path = /Developer/Headers/FlatCarbon/Script.h; sourceTree = "<absolute>"; };
+		64126A8C09F974D9006DF4E6 /* Script.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Script.r; path = /Developer/Headers/FlatCarbon/Script.r; sourceTree = "<absolute>"; };
+		64126A8D09F974D9006DF4E6 /* SCSI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SCSI.h; path = /Developer/Headers/FlatCarbon/SCSI.h; sourceTree = "<absolute>"; };
+		64126A8E09F974D9006DF4E6 /* SegLoad.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SegLoad.h; path = /Developer/Headers/FlatCarbon/SegLoad.h; sourceTree = "<absolute>"; };
+		64126A8F09F974D9006DF4E6 /* Serial.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Serial.h; path = /Developer/Headers/FlatCarbon/Serial.h; sourceTree = "<absolute>"; };
+		64126A9009F974D9006DF4E6 /* SFNTLayoutTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SFNTLayoutTypes.h; path = /Developer/Headers/FlatCarbon/SFNTLayoutTypes.h; sourceTree = "<absolute>"; };
+		64126A9109F974D9006DF4E6 /* SFNTTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SFNTTypes.h; path = /Developer/Headers/FlatCarbon/SFNTTypes.h; sourceTree = "<absolute>"; };
+		64126A9209F974D9006DF4E6 /* ShutDown.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ShutDown.h; path = /Developer/Headers/FlatCarbon/ShutDown.h; sourceTree = "<absolute>"; };
+		64126A9309F974D9006DF4E6 /* Slots.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Slots.h; path = /Developer/Headers/FlatCarbon/Slots.h; sourceTree = "<absolute>"; };
+		64126A9409F974D9006DF4E6 /* Slots.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Slots.r; path = /Developer/Headers/FlatCarbon/Slots.r; sourceTree = "<absolute>"; };
+		64126A9509F974D9006DF4E6 /* SocketServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SocketServices.h; path = /Developer/Headers/FlatCarbon/SocketServices.h; sourceTree = "<absolute>"; };
+		64126A9609F974D9006DF4E6 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Sound.h; path = /Developer/Headers/FlatCarbon/Sound.h; sourceTree = "<absolute>"; };
+		64126A9709F974D9006DF4E6 /* Sound.k.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Sound.k.h; path = /Developer/Headers/FlatCarbon/Sound.k.h; sourceTree = "<absolute>"; };
+		64126A9809F974D9006DF4E6 /* Sound.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Sound.r; path = /Developer/Headers/FlatCarbon/Sound.r; sourceTree = "<absolute>"; };
+		64126A9909F974D9006DF4E6 /* SoundComponents.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SoundComponents.h; path = /Developer/Headers/FlatCarbon/SoundComponents.h; sourceTree = "<absolute>"; };
+		64126A9A09F974D9006DF4E6 /* SoundComponents.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = SoundComponents.r; path = /Developer/Headers/FlatCarbon/SoundComponents.r; sourceTree = "<absolute>"; };
+		64126A9B09F974D9006DF4E6 /* SoundInput.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SoundInput.h; path = /Developer/Headers/FlatCarbon/SoundInput.h; sourceTree = "<absolute>"; };
+		64126A9C09F974D9006DF4E6 /* SoundInput.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = SoundInput.r; path = /Developer/Headers/FlatCarbon/SoundInput.r; sourceTree = "<absolute>"; };
+		64126A9D09F974D9006DF4E6 /* SoundSprocket.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SoundSprocket.h; path = /Developer/Headers/FlatCarbon/SoundSprocket.h; sourceTree = "<absolute>"; };
+		64126A9E09F974D9006DF4E6 /* Speech.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Speech.h; path = /Developer/Headers/FlatCarbon/Speech.h; sourceTree = "<absolute>"; };
+		64126A9F09F974D9006DF4E6 /* SpeechRecognition.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SpeechRecognition.h; path = /Developer/Headers/FlatCarbon/SpeechRecognition.h; sourceTree = "<absolute>"; };
+		64126AA009F974D9006DF4E6 /* SpeechSynthesis.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SpeechSynthesis.h; path = /Developer/Headers/FlatCarbon/SpeechSynthesis.h; sourceTree = "<absolute>"; };
+		64126AA109F974D9006DF4E6 /* StandardFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StandardFile.h; path = /Developer/Headers/FlatCarbon/StandardFile.h; sourceTree = "<absolute>"; };
+		64126AA209F974D9006DF4E6 /* Start.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Start.h; path = /Developer/Headers/FlatCarbon/Start.h; sourceTree = "<absolute>"; };
+		64126AA309F974D9006DF4E6 /* StringCompare.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = StringCompare.h; path = /Developer/Headers/FlatCarbon/StringCompare.h; sourceTree = "<absolute>"; };
+		64126AA409F974D9006DF4E6 /* Strings.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Strings.h; path = /Developer/Headers/FlatCarbon/Strings.h; sourceTree = "<absolute>"; };
+		64126AA509F974D9006DF4E6 /* SysTypes.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = SysTypes.r; path = /Developer/Headers/FlatCarbon/SysTypes.r; sourceTree = "<absolute>"; };
+		64126AA609F974D9006DF4E6 /* Telephones.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Telephones.h; path = /Developer/Headers/FlatCarbon/Telephones.h; sourceTree = "<absolute>"; };
+		64126AA709F974D9006DF4E6 /* Terminals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Terminals.h; path = /Developer/Headers/FlatCarbon/Terminals.h; sourceTree = "<absolute>"; };
+		64126AA809F974D9006DF4E6 /* TerminalTools.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TerminalTools.h; path = /Developer/Headers/FlatCarbon/TerminalTools.h; sourceTree = "<absolute>"; };
+		64126AA909F974D9006DF4E6 /* TextCommon.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextCommon.h; path = /Developer/Headers/FlatCarbon/TextCommon.h; sourceTree = "<absolute>"; };
+		64126AAA09F974D9006DF4E6 /* TextCommon.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = TextCommon.r; path = /Developer/Headers/FlatCarbon/TextCommon.r; sourceTree = "<absolute>"; };
+		64126AAB09F974D9006DF4E6 /* TextEdit.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextEdit.h; path = /Developer/Headers/FlatCarbon/TextEdit.h; sourceTree = "<absolute>"; };
+		64126AAC09F974D9006DF4E6 /* TextEncodingConverter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextEncodingConverter.h; path = /Developer/Headers/FlatCarbon/TextEncodingConverter.h; sourceTree = "<absolute>"; };
+		64126AAD09F974D9006DF4E6 /* TextEncodingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextEncodingPlugin.h; path = /Developer/Headers/FlatCarbon/TextEncodingPlugin.h; sourceTree = "<absolute>"; };
+		64126AAE09F974D9006DF4E6 /* TextServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextServices.h; path = /Developer/Headers/FlatCarbon/TextServices.h; sourceTree = "<absolute>"; };
+		64126AAF09F974D9006DF4E6 /* TextUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TextUtils.h; path = /Developer/Headers/FlatCarbon/TextUtils.h; sourceTree = "<absolute>"; };
+		64126AB009F974D9006DF4E6 /* Threads.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Threads.h; path = /Developer/Headers/FlatCarbon/Threads.h; sourceTree = "<absolute>"; };
+		64126AB109F974D9006DF4E6 /* Timer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Timer.h; path = /Developer/Headers/FlatCarbon/Timer.h; sourceTree = "<absolute>"; };
+		64126AB209F974D9006DF4E6 /* ToolUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ToolUtils.h; path = /Developer/Headers/FlatCarbon/ToolUtils.h; sourceTree = "<absolute>"; };
+		64126AB309F974D9006DF4E6 /* Translation.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Translation.h; path = /Developer/Headers/FlatCarbon/Translation.h; sourceTree = "<absolute>"; };
+		64126AB409F974D9006DF4E6 /* TranslationExtensions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TranslationExtensions.h; path = /Developer/Headers/FlatCarbon/TranslationExtensions.h; sourceTree = "<absolute>"; };
+		64126AB509F974D9006DF4E6 /* TranslationExtensions.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = TranslationExtensions.r; path = /Developer/Headers/FlatCarbon/TranslationExtensions.r; sourceTree = "<absolute>"; };
+		64126AB609F974D9006DF4E6 /* Traps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Traps.h; path = /Developer/Headers/FlatCarbon/Traps.h; sourceTree = "<absolute>"; };
+		64126AB709F974D9006DF4E6 /* TSMTE.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TSMTE.h; path = /Developer/Headers/FlatCarbon/TSMTE.h; sourceTree = "<absolute>"; };
+		64126AB809F974D9006DF4E6 /* Types.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Types.h; path = /Developer/Headers/FlatCarbon/Types.h; sourceTree = "<absolute>"; };
+		64126AB909F974D9006DF4E6 /* Types.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Types.r; path = /Developer/Headers/FlatCarbon/Types.r; sourceTree = "<absolute>"; };
+		64126ABA09F974D9006DF4E6 /* TypeSelect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TypeSelect.h; path = /Developer/Headers/FlatCarbon/TypeSelect.h; sourceTree = "<absolute>"; };
+		64126ABB09F974D9006DF4E6 /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Unicode.h; path = /Developer/Headers/FlatCarbon/Unicode.h; sourceTree = "<absolute>"; };
+		64126ABC09F974D9006DF4E6 /* UnicodeConverter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UnicodeConverter.h; path = /Developer/Headers/FlatCarbon/UnicodeConverter.h; sourceTree = "<absolute>"; };
+		64126ABD09F974D9006DF4E6 /* UnicodeConverter.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = UnicodeConverter.r; path = /Developer/Headers/FlatCarbon/UnicodeConverter.r; sourceTree = "<absolute>"; };
+		64126ABE09F974D9006DF4E6 /* UnicodeUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UnicodeUtilities.h; path = /Developer/Headers/FlatCarbon/UnicodeUtilities.h; sourceTree = "<absolute>"; };
+		64126ABF09F974D9006DF4E6 /* UnicodeUtilities.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = UnicodeUtilities.r; path = /Developer/Headers/FlatCarbon/UnicodeUtilities.r; sourceTree = "<absolute>"; };
+		64126AC009F974D9006DF4E6 /* URLAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = URLAccess.h; path = /Developer/Headers/FlatCarbon/URLAccess.h; sourceTree = "<absolute>"; };
+		64126AC109F974D9006DF4E6 /* USB.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = USB.h; path = /Developer/Headers/FlatCarbon/USB.h; sourceTree = "<absolute>"; };
+		64126AC209F974D9006DF4E6 /* UTCUtils.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = UTCUtils.h; path = /Developer/Headers/FlatCarbon/UTCUtils.h; sourceTree = "<absolute>"; };
+		64126AC309F974D9006DF4E6 /* vBasicOps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vBasicOps.h; path = /Developer/Headers/FlatCarbon/vBasicOps.h; sourceTree = "<absolute>"; };
+		64126AC409F974D9006DF4E6 /* vBigNum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vBigNum.h; path = /Developer/Headers/FlatCarbon/vBigNum.h; sourceTree = "<absolute>"; };
+		64126AC509F974D9006DF4E6 /* vBLAS.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vBLAS.h; path = /Developer/Headers/FlatCarbon/vBLAS.h; sourceTree = "<absolute>"; };
+		64126AC609F974D9006DF4E6 /* vDSP.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vDSP.h; path = /Developer/Headers/FlatCarbon/vDSP.h; sourceTree = "<absolute>"; };
+		64126AC709F974D9006DF4E6 /* vectorOps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vectorOps.h; path = /Developer/Headers/FlatCarbon/vectorOps.h; sourceTree = "<absolute>"; };
+		64126AC809F974D9006DF4E6 /* vfp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = vfp.h; path = /Developer/Headers/FlatCarbon/vfp.h; sourceTree = "<absolute>"; };
+		64126AC909F974D9006DF4E6 /* Video.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Video.h; path = /Developer/Headers/FlatCarbon/Video.h; sourceTree = "<absolute>"; };
+		64126ACA09F974D9006DF4E6 /* Video.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Video.r; path = /Developer/Headers/FlatCarbon/Video.r; sourceTree = "<absolute>"; };
+		64126ACB09F974D9006DF4E6 /* VideoServices.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = VideoServices.h; path = /Developer/Headers/FlatCarbon/VideoServices.h; sourceTree = "<absolute>"; };
+		64126ACC09F974D9006DF4E6 /* Windows.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Windows.h; path = /Developer/Headers/FlatCarbon/Windows.h; sourceTree = "<absolute>"; };
+		64126ACD09F974D9006DF4E6 /* Windows.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; name = Windows.r; path = /Developer/Headers/FlatCarbon/Windows.r; sourceTree = "<absolute>"; };
+		64126ACE09F974D9006DF4E6 /* WorldScript.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = WorldScript.h; path = /Developer/Headers/FlatCarbon/WorldScript.h; sourceTree = "<absolute>"; };
+		64126ACF09F974D9006DF4E6 /* ZoomedVideo.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ZoomedVideo.h; path = /Developer/Headers/FlatCarbon/ZoomedVideo.h; sourceTree = "<absolute>"; };
+		64126B2D09F9751D006DF4E6 /* ASPreInclude.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ASPreInclude.h; sourceTree = "<group>"; };
+		64126B2E09F9751D006DF4E6 /* PIAbout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIAbout.h; sourceTree = "<group>"; };
+		64126B2F09F9751D006DF4E6 /* PIAcquire.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIAcquire.h; sourceTree = "<group>"; };
+		64126B3009F9751D006DF4E6 /* PIActions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIActions.h; sourceTree = "<group>"; };
+		64126B3109F9751D006DF4E6 /* PIActionsPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIActionsPlugin.h; sourceTree = "<group>"; };
+		64126B3209F9751D006DF4E6 /* PIAliasSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIAliasSuite.h; sourceTree = "<group>"; };
+		64126B3309F9751D006DF4E6 /* PIBufferSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIBufferSuite.h; sourceTree = "<group>"; };
+		64126B3409F9751D006DF4E6 /* PIChannelPortOperations.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIChannelPortOperations.h; sourceTree = "<group>"; };
+		64126B3509F9751D006DF4E6 /* PIChannelPortsSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIChannelPortsSuite.h; sourceTree = "<group>"; };
+		64126B3609F9751D006DF4E6 /* PIColorSpaceSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIColorSpaceSuite.h; sourceTree = "<group>"; };
+		64126B3709F9751D006DF4E6 /* PIErrorSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIErrorSuite.h; sourceTree = "<group>"; };
+		64126B3809F9751D006DF4E6 /* PIExport.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIExport.h; sourceTree = "<group>"; };
+		64126B3909F9751D006DF4E6 /* PIFilter.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIFilter.h; sourceTree = "<group>"; };
+		64126B3A09F9751D006DF4E6 /* PIFormat.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIFormat.h; sourceTree = "<group>"; };
+		64126B3B09F9751D006DF4E6 /* PIGeneral.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIGeneral.h; sourceTree = "<group>"; };
+		64126B3C09F9751D006DF4E6 /* PIGetFileListSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIGetFileListSuite.h; sourceTree = "<group>"; };
+		64126B3D09F9751D006DF4E6 /* PIGetPathSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIGetPathSuite.h; sourceTree = "<group>"; };
+		64126B3E09F9751D006DF4E6 /* PIHandleSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIHandleSuite.h; sourceTree = "<group>"; };
+		64126B3F09F9751D006DF4E6 /* PIPicker.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIPicker.h; sourceTree = "<group>"; };
+		64126B4009F9751D006DF4E6 /* PIProgressSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIProgressSuite.h; sourceTree = "<group>"; };
+		64126B4109F9751D006DF4E6 /* PIProperties.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIProperties.h; sourceTree = "<group>"; };
+		64126B4209F9751D006DF4E6 /* PIResDefines.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIResDefines.h; sourceTree = "<group>"; };
+		64126B4309F9751D006DF4E6 /* PISelection.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PISelection.h; sourceTree = "<group>"; };
+		64126B4409F9751D006DF4E6 /* PIStringTerminology.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIStringTerminology.h; sourceTree = "<group>"; };
+		64126B4509F9751D006DF4E6 /* PITerminology.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PITerminology.h; sourceTree = "<group>"; };
+		64126B4609F9751D006DF4E6 /* PITypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PITypes.h; sourceTree = "<group>"; };
+		64126B4709F9751D006DF4E6 /* PIUIHooksSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIUIHooksSuite.h; sourceTree = "<group>"; };
+		64126B4809F9751D006DF4E6 /* PSErrorDefines.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSErrorDefines.h; sourceTree = "<group>"; };
+		64126B4A09F9751D006DF4E6 /* SPAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPAccess.h; sourceTree = "<group>"; };
+		64126B4B09F9751D006DF4E6 /* SPAdapts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPAdapts.h; sourceTree = "<group>"; };
+		64126B4C09F9751D006DF4E6 /* SPBasic.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPBasic.h; sourceTree = "<group>"; };
+		64126B4D09F9751D006DF4E6 /* SPBckDbg.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPBckDbg.h; sourceTree = "<group>"; };
+		64126B4E09F9751D006DF4E6 /* SPBlocks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPBlocks.h; sourceTree = "<group>"; };
+		64126B4F09F9751D006DF4E6 /* SPCaches.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPCaches.h; sourceTree = "<group>"; };
+		64126B5009F9751D006DF4E6 /* SPCOM.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPCOM.h; sourceTree = "<group>"; };
+		64126B5109F9751D006DF4E6 /* SPConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPConfig.h; sourceTree = "<group>"; };
+		64126B5309F9751D006DF4E6 /* SPErrorCodes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPErrorCodes.h; sourceTree = "<group>"; };
+		64126B5409F9751D006DF4E6 /* SPErrors.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPErrors.h; sourceTree = "<group>"; };
+		64126B5509F9751D006DF4E6 /* SPFiles.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPFiles.h; sourceTree = "<group>"; };
+		64126B5609F9751D006DF4E6 /* SPHost.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPHost.h; sourceTree = "<group>"; };
+		64126B5709F9751D006DF4E6 /* SPInterf.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPInterf.h; sourceTree = "<group>"; };
+		64126B5809F9751D006DF4E6 /* SPMData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPMData.h; sourceTree = "<group>"; };
+		64126B5909F9751D006DF4E6 /* SPObject.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPObject.h; sourceTree = "<group>"; };
+		64126B5A09F9751D006DF4E6 /* SPPiPL.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPPiPL.h; sourceTree = "<group>"; };
+		64126B5B09F9751D006DF4E6 /* SPPlugs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPPlugs.h; sourceTree = "<group>"; };
+		64126B5C09F9751D006DF4E6 /* SPProps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPProps.h; sourceTree = "<group>"; };
+		64126B5D09F9751D006DF4E6 /* SPRuntme.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPRuntme.h; sourceTree = "<group>"; };
+		64126B5E09F9751D006DF4E6 /* SPStrngs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPStrngs.h; sourceTree = "<group>"; };
+		64126B5F09F9751D006DF4E6 /* SPSTSPrp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPSTSPrp.h; sourceTree = "<group>"; };
+		64126B6009F9751D006DF4E6 /* SPSuites.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPSuites.h; sourceTree = "<group>"; };
+		64126B6109F9751D006DF4E6 /* SPTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SPTypes.h; sourceTree = "<group>"; };
+		64126B6309F9751D006DF4E6 /* PIGeneral.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = PIGeneral.r; sourceTree = "<group>"; };
+		64126B6409F9751D006DF4E6 /* PIMI.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = PIMI.r; sourceTree = "<group>"; };
+		64126B6509F9751D006DF4E6 /* PIPL.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = PIPL.r; sourceTree = "<group>"; };
+		64126B7409F97565006DF4E6 /* DialogUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = DialogUtilities.h; sourceTree = "<group>"; };
+		64126B7B09F97565006DF4E6 /* MachOMacrezXcode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MachOMacrezXcode.h; sourceTree = "<group>"; };
+		64126B7F09F97565006DF4E6 /* PIDefines.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIDefines.h; sourceTree = "<group>"; };
+		64126B8109F97565006DF4E6 /* PIMachODebug.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIMachODebug.h; sourceTree = "<group>"; };
+		64126B8209F97565006DF4E6 /* PIMachORelease.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIMachORelease.h; sourceTree = "<group>"; };
+		64126B8509F97565006DF4E6 /* PIRezMachO.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIRezMachO.h; sourceTree = "<group>"; };
+		64126B8709F97565006DF4E6 /* PIUActions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIUActions.h; sourceTree = "<group>"; };
+		64126B8909F97565006DF4E6 /* PIUFile.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIUFile.h; sourceTree = "<group>"; };
+		64126B8B09F97565006DF4E6 /* PIUI.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIUI.h; sourceTree = "<group>"; };
+		64126B8E09F97565006DF4E6 /* PIUSuites.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIUSuites.h; sourceTree = "<group>"; };
+		64126B8F09F97565006DF4E6 /* PIUtilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PIUtilities.h; sourceTree = "<group>"; };
+		64126B9A09F97565006DF4E6 /* PIUtilities.r */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.rez; path = PIUtilities.r; sourceTree = "<group>"; };
+		64126C2509F979E1006DF4E6 /* PIMacUI.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PIMacUI.cpp; sourceTree = "<group>"; };
+		64126C2A09F979EA006DF4E6 /* PIUSuites.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PIUSuites.cpp; sourceTree = "<group>"; };
+		64126C2F09F979F7006DF4E6 /* DialogUtilitiesMac.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DialogUtilitiesMac.cpp; sourceTree = "<group>"; };
+		64126C3409F97A19006DF4E6 /* PIUtilities.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PIUtilities.cpp; sourceTree = "<group>"; };
+		646B5C9E10D3159B001A7C6E /* PSIntTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PSIntTypes.h; sourceTree = "<group>"; };
+		646B5CA910D31664001A7C6E /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		646B5D5E10D31674001A7C6E /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
+		64CC2EB3111CDDB200423B46 /* JSScriptingSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSScriptingSuite.h; sourceTree = "<group>"; };
+		64CF8EE60AA3A73400120C5A /* ASZStringSuite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ASZStringSuite.h; sourceTree = "<group>"; };
+		64CF8EE70AA3A73400120C5A /* ASTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ASTypes.h; sourceTree = "<group>"; };
+		64CF8EE80AA3A73400120C5A /* ASPragma.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ASPragma.h; sourceTree = "<group>"; };
+		64CF8EE90AA3A73400120C5A /* ASConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ASConfig.h; sourceTree = "<group>"; };
+		8D01CCD20486CAD60068D4B7 /* OpenColorIO PS.plugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "OpenColorIO PS.plugin"; sourceTree = BUILT_PRODUCTS_DIR; };
+		E2880D630B0EECF5001C1C00 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		8D01CCCD0486CAD60068D4B7 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2AF20B9112066147001E5E3F /* Cocoa.framework in Frameworks */,
+				2AF20B9C12066179001E5E3F /* Carbon.framework in Frameworks */,
+				2A644DBA1E31FAAF00AAEF84 /* liblcms.a in Frameworks */,
+				2A644DBB1E31FAB000AAEF84 /* libOpenColorIO.a in Frameworks */,
+				2A644DBC1E31FAB000AAEF84 /* libtinyxml.a in Frameworks */,
+				2A644DBD1E31FAB100AAEF84 /* libyaml.a in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		089C166AFE841209C02AAC07 /* SimpleFormat */ = {
+			isa = PBXGroup;
+			children = (
+				2A7F21191E2F4E57003428D7 /* OpenColorIO_PS.h */,
+				2A7F21181E2F4E57003428D7 /* OpenColorIO_PS.cpp */,
+				2A7F21171E2F4E57003428D7 /* OpenColorIO_PS_Version.h */,
+				2A7F21161E2F4E57003428D7 /* OpenColorIO_PS_Terminology.h */,
+				2A4150421E33FD6900E3954B /* OpenColorIO_PS_Context.h */,
+				2A4150431E33FD6900E3954B /* OpenColorIO_PS_Context.cpp */,
+				2A644C1A1E3166FC00AAEF84 /* OpenColorIO_PS_Dialog.h */,
+				2A644CBA1E31787500AAEF84 /* OpenColorIO_PS_Dialog_Cocoa.mm */,
+				2A644C9C1E316E6C00AAEF84 /* OpenColorIO_PS_Dialog.xib */,
+				2A644CB21E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.h */,
+				2A644CB31E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.mm */,
+				2A7529DF1E3FB61100BB5897 /* OpenColorIO_AE_Dialogs.h */,
+				2A7529E11E3FB64000BB5897 /* OpenColorIO_AE_Dialogs_Cocoa.mm */,
+				2A7529E51E3FB66000BB5897 /* OpenColorIO_AE_Menu.h */,
+				2A7529E61E3FB66000BB5897 /* OpenColorIO_AE_Menu.m */,
+				2A7523931E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.h */,
+				2A7523941E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.m */,
+				2A7523951E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser.xib */,
+				2A7523741E3ECDEA00BB5897 /* ocioicc.h */,
+				2A7523731E3ECDEA00BB5897 /* ocioicc.cpp */,
+				2A7F211A1E2F4E57003428D7 /* OpenColorIO_PS.r */,
+				64126B7009F97565006DF4E6 /* SDK common */,
+				64126AD309F9751C006DF4E6 /* Photoshop common */,
+				6412691709F974D9006DF4E6 /* Mac OS common */,
+				089C1671FE841209C02AAC07 /* External Frameworks and Libraries */,
+				2A644DA21E31FA7800AAEF84 /* OpenColorIO.xcodeproj */,
+				2A644DA81E31FAA500AAEF84 /* lcms.xcodeproj */,
+				2A644DAB1E31FAA500AAEF84 /* tinyxml.xcodeproj */,
+				2A644DAE1E31FAA500AAEF84 /* yaml.xcodeproj */,
+				19C28FB4FE9D528D11CA2CBB /* Products */,
+			);
+			name = SimpleFormat;
+			sourceTree = "<group>";
+		};
+		089C1671FE841209C02AAC07 /* External Frameworks and Libraries */ = {
+			isa = PBXGroup;
+			children = (
+				646B5D5E10D31674001A7C6E /* AppKit.framework */,
+				08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */,
+				646B5CA910D31664001A7C6E /* Cocoa.framework */,
+			);
+			name = "External Frameworks and Libraries";
+			sourceTree = "<group>";
+		};
+		19C28FB4FE9D528D11CA2CBB /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				8D01CCD20486CAD60068D4B7 /* OpenColorIO PS.plugin */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2A644DA31E31FA7800AAEF84 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2A644DA71E31FA7800AAEF84 /* libOpenColorIO.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2A644DA91E31FAA500AAEF84 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2A644DB31E31FAA500AAEF84 /* liblcms.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2A644DAC1E31FAA500AAEF84 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2A644DB61E31FAA500AAEF84 /* libtinyxml.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2A644DAF1E31FAA500AAEF84 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				2A644DB91E31FAA500AAEF84 /* libyaml.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		2AF20A8B12065CC6001E5E3F /* adm */ = {
+			isa = PBXGroup;
+			children = (
+				2AF20A8D12065CC7001E5E3F /* ADMAGMTypes.h */,
+				2AF20A8E12065CC7001E5E3F /* ADMBasic.h */,
+				2AF20A8F12065CC7001E5E3F /* ADMCustomResource.h */,
+				2AF20A9012065CC7001E5E3F /* ADMDialog.h */,
+				2AF20A9112065CC7001E5E3F /* ADMDialogGroup.h */,
+				2AF20A9212065CC7001E5E3F /* ADMDrawer.h */,
+				2AF20A9312065CC7001E5E3F /* ADMEntry.h */,
+				2AF20A9412065CC7001E5E3F /* ADMHierarchyList.h */,
+				2AF20A9512065CC7001E5E3F /* ADMHost.h */,
+				2AF20A9612065CC7001E5E3F /* ADMHostInit.h */,
+				2AF20A9712065CC7001E5E3F /* ADMHostInitUnicode.h */,
+				2AF20A9812065CC7001E5E3F /* ADMHostWin.h */,
+				2AF20A9912065CC7001E5E3F /* ADMIcon.h */,
+				2AF20A9A12065CC7001E5E3F /* ADMImage.h */,
+				2AF20A9B12065CC7001E5E3F /* ADMItem.h */,
+				2AF20A9C12065CC7001E5E3F /* ADMList.h */,
+				2AF20A9D12065CC7001E5E3F /* ADMListEntry.h */,
+				2AF20A9E12065CC7001E5E3F /* ADMNotifier.h */,
+				2AF20A9F12065CC7001E5E3F /* ADMRadioGroup.h */,
+				2AF20AA012065CC7001E5E3F /* ADMResource.h */,
+				2AF20AA112065CC7001E5E3F /* ADMStandardTypes.h */,
+				2AF20AA212065CC7001E5E3F /* ADMTracker.h */,
+				2AF20AA312065CC7001E5E3F /* ADMTypes.h */,
+				2AF20AA412065CC7001E5E3F /* ADMUITConversionSuite.h */,
+				2AF20AA512065CC7001E5E3F /* ADMVersion.h */,
+				2AF20AA612065CC7001E5E3F /* ADMWindow.h */,
+				2AF20AA712065CC7001E5E3F /* legacy */,
+				2AF20AB712065CC7001E5E3F /* PlatformConfig.h */,
+				2AF20AB812065CC7001E5E3F /* PlatformPragma.h */,
+			);
+			path = adm;
+			sourceTree = "<group>";
+		};
+		2AF20AA712065CC7001E5E3F /* legacy */ = {
+			isa = PBXGroup;
+			children = (
+				2AF20AA812065CC7001E5E3F /* ADMBasicOld.h */,
+				2AF20AA912065CC7001E5E3F /* ADMCustomResourceOld.h */,
+				2AF20AAA12065CC7001E5E3F /* ADMDialogGroupOld.h */,
+				2AF20AAB12065CC7001E5E3F /* ADMDialogOld.h */,
+				2AF20AAC12065CC7001E5E3F /* ADMDrawerOld.h */,
+				2AF20AAD12065CC7001E5E3F /* ADMEntryOld.h */,
+				2AF20AAE12065CC7001E5E3F /* ADMHierarchyListOld.h */,
+				2AF20AAF12065CC7001E5E3F /* ADMHostInitOld.h */,
+				2AF20AB012065CC7001E5E3F /* ADMHostOld.h */,
+				2AF20AB112065CC7001E5E3F /* ADMIconOld.h */,
+				2AF20AB212065CC7001E5E3F /* ADMImageOld.h */,
+				2AF20AB312065CC7001E5E3F /* ADMItemOld.h */,
+				2AF20AB412065CC7001E5E3F /* ADMListEntryOld.h */,
+				2AF20AB512065CC7001E5E3F /* ADMListOld.h */,
+				2AF20AB612065CC7001E5E3F /* ADMNotifierOld.h */,
+			);
+			path = legacy;
+			sourceTree = "<group>";
+		};
+		6412691709F974D9006DF4E6 /* Mac OS common */ = {
+			isa = PBXGroup;
+			children = (
+				6412691809F974D9006DF4E6 /* ADSP.h */,
+				6412691909F974D9006DF4E6 /* AEDataModel.h */,
+				6412691A09F974D9006DF4E6 /* AEDataModel.r */,
+				6412691B09F974D9006DF4E6 /* AEHelpers.h */,
+				6412691C09F974D9006DF4E6 /* AEInteraction.h */,
+				6412691D09F974D9006DF4E6 /* AEMach.h */,
+				6412691E09F974D9006DF4E6 /* AEObjects.h */,
+				6412691F09F974D9006DF4E6 /* AEObjects.r */,
+				6412692009F974D9006DF4E6 /* AEPackObject.h */,
+				6412692109F974D9006DF4E6 /* AERegistry.h */,
+				6412692209F974D9006DF4E6 /* AERegistry.r */,
+				6412692309F974D9006DF4E6 /* AEUserTermTypes.h */,
+				6412692409F974D9006DF4E6 /* AEUserTermTypes.r */,
+				6412692509F974D9006DF4E6 /* AEWideUserTermTypes.r */,
+				6412692609F974D9006DF4E6 /* AIFF.h */,
+				6412692709F974D9006DF4E6 /* Aliases.h */,
+				6412692809F974D9006DF4E6 /* Appearance.h */,
+				6412692909F974D9006DF4E6 /* Appearance.r */,
+				6412692A09F974D9006DF4E6 /* AppleDiskPartitions.h */,
+				6412692B09F974D9006DF4E6 /* AppleEvents.h */,
+				6412692C09F974D9006DF4E6 /* AppleEvents.r */,
+				6412692D09F974D9006DF4E6 /* AppleGuide.h */,
+				6412692E09F974D9006DF4E6 /* AppleHelp.h */,
+				6412692F09F974D9006DF4E6 /* AppleScript.h */,
+				6412693009F974D9006DF4E6 /* AppleTalk.h */,
+				6412693109F974D9006DF4E6 /* ApplicationServices.h */,
+				6412693209F974D9006DF4E6 /* ApplicationServices.r */,
+				6412693309F974D9006DF4E6 /* ASDebugging.h */,
+				6412693409F974D9006DF4E6 /* ASRegistry.h */,
+				6412693509F974D9006DF4E6 /* ASRegistry.r */,
+				6412693609F974D9006DF4E6 /* ATA.h */,
+				6412693709F974D9006DF4E6 /* ATSFont.h */,
+				6412693809F974D9006DF4E6 /* ATSLayoutTypes.h */,
+				6412693909F974D9006DF4E6 /* ATSTypes.h */,
+				6412693A09F974D9006DF4E6 /* ATSUnicode.h */,
+				6412693B09F974D9006DF4E6 /* AVComponents.h */,
+				6412693C09F974D9006DF4E6 /* AVComponents.k.h */,
+				6412693D09F974D9006DF4E6 /* AVComponents.r */,
+				6412693E09F974D9006DF4E6 /* AVLTree.h */,
+				6412693F09F974D9006DF4E6 /* Balloons.h */,
+				6412694009F974D9006DF4E6 /* Balloons.r */,
+				6412694109F974D9006DF4E6 /* BalloonTypes.r */,
+				6412694209F974D9006DF4E6 /* Carbon.h */,
+				6412694309F974D9006DF4E6 /* Carbon.r */,
+				6412694409F974D9006DF4E6 /* CarbonEvents.h */,
+				6412694509F974D9006DF4E6 /* CarbonEvents.r */,
+				6412694609F974D9006DF4E6 /* CardServices.h */,
+				6412694709F974D9006DF4E6 /* CFArray.h */,
+				6412694809F974D9006DF4E6 /* CFBag.h */,
+				6412694909F974D9006DF4E6 /* CFBase.h */,
+				6412694A09F974D9006DF4E6 /* CFBundle.h */,
+				6412694B09F974D9006DF4E6 /* CFCharacterSet.h */,
+				6412694C09F974D9006DF4E6 /* CFData.h */,
+				6412694D09F974D9006DF4E6 /* CFDate.h */,
+				6412694E09F974D9006DF4E6 /* CFDictionary.h */,
+				6412694F09F974D9006DF4E6 /* CFNumber.h */,
+				6412695009F974D9006DF4E6 /* CFPlugIn.h */,
+				6412695109F974D9006DF4E6 /* CFPlugInCOM.h */,
+				6412695209F974D9006DF4E6 /* CFPreferences.h */,
+				6412695309F974D9006DF4E6 /* CFPropertyList.h */,
+				6412695409F974D9006DF4E6 /* CFSet.h */,
+				6412695509F974D9006DF4E6 /* CFString.h */,
+				6412695609F974D9006DF4E6 /* CFStringEncodingExt.h */,
+				6412695709F974D9006DF4E6 /* CFTimeZone.h */,
+				6412695809F974D9006DF4E6 /* CFTree.h */,
+				6412695909F974D9006DF4E6 /* CFURL.h */,
+				6412695A09F974D9006DF4E6 /* CFURLAccess.h */,
+				6412695B09F974D9006DF4E6 /* CFUUID.h */,
+				6412695C09F974D9006DF4E6 /* CFXMLNode.h */,
+				6412695D09F974D9006DF4E6 /* CFXMLParser.h */,
+				6412695E09F974D9006DF4E6 /* CGAffineTransform.h */,
+				6412695F09F974D9006DF4E6 /* CGBase.h */,
+				6412696009F974D9006DF4E6 /* CGBitmapContext.h */,
+				6412696109F974D9006DF4E6 /* CGColorSpace.h */,
+				6412696209F974D9006DF4E6 /* CGContext.h */,
+				6412696309F974D9006DF4E6 /* CGDataConsumer.h */,
+				6412696409F974D9006DF4E6 /* CGDataProvider.h */,
+				6412696509F974D9006DF4E6 /* CGDirectDisplay.h */,
+				6412696609F974D9006DF4E6 /* CGDirectPalette.h */,
+				6412696709F974D9006DF4E6 /* CGError.h */,
+				6412696809F974D9006DF4E6 /* CGFont.h */,
+				6412696909F974D9006DF4E6 /* CGGeometry.h */,
+				6412696A09F974D9006DF4E6 /* CGImage.h */,
+				6412696B09F974D9006DF4E6 /* CGPattern.h */,
+				6412696C09F974D9006DF4E6 /* CGPDFContext.h */,
+				6412696D09F974D9006DF4E6 /* CGPDFDocument.h */,
+				6412696E09F974D9006DF4E6 /* CGRemoteOperation.h */,
+				6412696F09F974D9006DF4E6 /* CGWindowLevel.h */,
+				6412697009F974D9006DF4E6 /* CMAcceleration.h */,
+				6412697109F974D9006DF4E6 /* CMApplication.h */,
+				6412697209F974D9006DF4E6 /* CMCalibrator.h */,
+				6412697309F974D9006DF4E6 /* CMComponent.h */,
+				6412697409F974D9006DF4E6 /* CMConversions.h */,
+				6412697509F974D9006DF4E6 /* CMDeviceIntegration.h */,
+				6412697609F974D9006DF4E6 /* CMICCProfile.h */,
+				6412697709F974D9006DF4E6 /* CMMComponent.h */,
+				6412697809F974D9006DF4E6 /* CMPRComponent.h */,
+				6412697909F974D9006DF4E6 /* CMScriptingPlugin.h */,
+				6412697A09F974D9006DF4E6 /* CMTypes.h */,
+				6412697B09F974D9006DF4E6 /* CodeFragments.h */,
+				6412697C09F974D9006DF4E6 /* CodeFragments.r */,
+				6412697D09F974D9006DF4E6 /* CodeFragmentTypes.r */,
+				6412697E09F974D9006DF4E6 /* Collections.h */,
+				6412697F09F974D9006DF4E6 /* Collections.r */,
+				6412698009F974D9006DF4E6 /* ColorPicker.h */,
+				6412698109F974D9006DF4E6 /* ColorPickerComponents.h */,
+				6412698209F974D9006DF4E6 /* CommResources.h */,
+				6412698309F974D9006DF4E6 /* CommResources.r */,
+				6412698409F974D9006DF4E6 /* Components.h */,
+				6412698509F974D9006DF4E6 /* Components.k.h */,
+				6412698609F974D9006DF4E6 /* Components.r */,
+				6412698709F974D9006DF4E6 /* ConditionalMacros.h */,
+				6412698809F974D9006DF4E6 /* ConditionalMacros.r */,
+				6412698909F974D9006DF4E6 /* Connections.h */,
+				6412698A09F974D9006DF4E6 /* ConnectionTools.h */,
+				6412698B09F974D9006DF4E6 /* ControlDefinitions.h */,
+				6412698C09F974D9006DF4E6 /* ControlDefinitions.r */,
+				6412698D09F974D9006DF4E6 /* Controls.h */,
+				6412698E09F974D9006DF4E6 /* Controls.r */,
+				6412698F09F974D9006DF4E6 /* ControlStrip.h */,
+				6412699009F974D9006DF4E6 /* CoreServices.h */,
+				6412699109F974D9006DF4E6 /* CoreServices.r */,
+				6412699209F974D9006DF4E6 /* CRMSerialDevices.h */,
+				6412699309F974D9006DF4E6 /* CryptoMessageSyntax.h */,
+				6412699409F974D9006DF4E6 /* CTBUtilities.h */,
+				6412699509F974D9006DF4E6 /* CursorDevices.h */,
+				6412699609F974D9006DF4E6 /* DatabaseAccess.h */,
+				6412699709F974D9006DF4E6 /* DatabaseAccess.r */,
+				6412699809F974D9006DF4E6 /* DateTimeUtils.h */,
+				6412699909F974D9006DF4E6 /* Debugging.h */,
+				6412699A09F974D9006DF4E6 /* DeskBus.h */,
+				6412699B09F974D9006DF4E6 /* DesktopPrinting.h */,
+				6412699C09F974D9006DF4E6 /* DesktopPrinting.r */,
+				6412699D09F974D9006DF4E6 /* DeviceControl.h */,
+				6412699E09F974D9006DF4E6 /* DeviceControl.k.h */,
+				6412699F09F974D9006DF4E6 /* Devices.h */,
+				641269A009F974D9006DF4E6 /* Devices.r */,
+				641269A109F974D9006DF4E6 /* Dialogs.h */,
+				641269A209F974D9006DF4E6 /* Dialogs.r */,
+				641269A309F974D9006DF4E6 /* Dictionary.h */,
+				641269A409F974D9006DF4E6 /* DiskInit.h */,
+				641269A509F974D9006DF4E6 /* Disks.h */,
+				641269A609F974D9006DF4E6 /* Displays.h */,
+				641269A709F974D9006DF4E6 /* Displays.r */,
+				641269A809F974D9006DF4E6 /* Drag.h */,
+				641269A909F974D9006DF4E6 /* DrawSprocket.h */,
+				641269AA09F974D9006DF4E6 /* DriverFamilyMatching.h */,
+				641269AB09F974D9006DF4E6 /* DriverGestalt.h */,
+				641269AC09F974D9006DF4E6 /* DriverServices.h */,
+				641269AD09F974D9006DF4E6 /* DriverSupport.h */,
+				641269AE09F974D9006DF4E6 /* DriverSynchronization.h */,
+				641269AF09F974D9006DF4E6 /* Editions.h */,
+				641269B009F974D9006DF4E6 /* Endian.h */,
+				641269B109F974D9006DF4E6 /* ENET.h */,
+				641269B209F974D9006DF4E6 /* EPPC.h */,
+				641269B309F974D9006DF4E6 /* EPPC.r */,
+				641269B409F974D9006DF4E6 /* Errors.h */,
+				641269B509F974D9006DF4E6 /* Events.h */,
+				641269B609F974D9006DF4E6 /* Files.h */,
+				641269B709F974D9006DF4E6 /* FileSigning.h */,
+				641269B809F974D9006DF4E6 /* FileTransfers.h */,
+				641269B909F974D9006DF4E6 /* FileTransferTools.h */,
+				641269BA09F974D9006DF4E6 /* FileTypesAndCreators.h */,
+				641269BB09F974D9006DF4E6 /* FileTypesAndCreators.r */,
+				641269BC09F974D9006DF4E6 /* FindByContent.h */,
+				641269BD09F974D9006DF4E6 /* Finder.h */,
+				641269BE09F974D9006DF4E6 /* Finder.r */,
+				641269BF09F974D9006DF4E6 /* FinderRegistry.h */,
+				641269C009F974D9006DF4E6 /* FinderRegistry.r */,
+				641269C109F974D9006DF4E6 /* FixMath.h */,
+				641269C209F974D9006DF4E6 /* Folders.h */,
+				641269C309F974D9006DF4E6 /* Folders.r */,
+				641269C409F974D9006DF4E6 /* Fonts.h */,
+				641269C509F974D9006DF4E6 /* Fonts.r */,
+				641269C609F974D9006DF4E6 /* FontSync.h */,
+				641269C709F974D9006DF4E6 /* fp.h */,
+				641269C809F974D9006DF4E6 /* FSM.h */,
+				641269C909F974D9006DF4E6 /* Gestalt.h */,
+				641269CA09F974D9006DF4E6 /* Gestalt.r */,
+				641269CB09F974D9006DF4E6 /* GoggleSprocket.h */,
+				641269CC09F974D9006DF4E6 /* GXEnvironment.h */,
+				641269CD09F974D9006DF4E6 /* GXErrors.h */,
+				641269CE09F974D9006DF4E6 /* GXFonts.h */,
+				641269CF09F974D9006DF4E6 /* GXGraphics.h */,
+				641269D009F974D9006DF4E6 /* GXLayout.h */,
+				641269D109F974D9006DF4E6 /* GXMath.h */,
+				641269D209F974D9006DF4E6 /* GXMessages.h */,
+				641269D309F974D9006DF4E6 /* GXPrinterDrivers.h */,
+				641269D409F974D9006DF4E6 /* GXPrinting.h */,
+				641269D509F974D9006DF4E6 /* GXTypes.h */,
+				641269D609F974D9006DF4E6 /* HFSVolumes.h */,
+				641269D709F974D9006DF4E6 /* HID.h */,
+				641269D809F974D9006DF4E6 /* HTMLRendering.h */,
+				641269D909F974D9006DF4E6 /* HyperXCmd.h */,
+				641269DA09F974D9006DF4E6 /* IAExtractor.h */,
+				641269DB09F974D9006DF4E6 /* IAExtractor.r */,
+				641269DC09F974D9006DF4E6 /* IBCarbonRuntime.h */,
+				641269DD09F974D9006DF4E6 /* ICAApplication.h */,
+				641269DE09F974D9006DF4E6 /* ICACamera.h */,
+				641269DF09F974D9006DF4E6 /* ICADevice.h */,
+				641269E009F974D9006DF4E6 /* Icons.h */,
+				641269E109F974D9006DF4E6 /* Icons.r */,
+				641269E209F974D9006DF4E6 /* ImageCodec.h */,
+				641269E309F974D9006DF4E6 /* ImageCodec.k.h */,
+				641269E409F974D9006DF4E6 /* ImageCodec.r */,
+				641269E509F974D9006DF4E6 /* ImageCompression.h */,
+				641269E609F974D9006DF4E6 /* ImageCompression.k.h */,
+				641269E709F974D9006DF4E6 /* ImageCompression.r */,
+				641269E809F974D9006DF4E6 /* InputSprocket.h */,
+				641269E909F974D9006DF4E6 /* InputSprocket.r */,
+				641269EA09F974D9006DF4E6 /* InternetConfig.h */,
+				641269EB09F974D9006DF4E6 /* Interrupts.h */,
+				641269EC09F974D9006DF4E6 /* IntlResources.h */,
+				641269ED09F974D9006DF4E6 /* IntlResources.r */,
+				641269EE09F974D9006DF4E6 /* IsochronousDataHandler.h */,
+				641269EF09F974D9006DF4E6 /* IsochronousDataHandler.k.h */,
+				641269F009F974D9006DF4E6 /* IsochronousDataHandler.r */,
+				641269F109F974D9006DF4E6 /* JManager.h */,
+				641269F209F974D9006DF4E6 /* Kernel.h */,
+				641269F309F974D9006DF4E6 /* Keyboards.h */,
+				641269F409F974D9006DF4E6 /* Keychain.h */,
+				641269F509F974D9006DF4E6 /* KeychainCore.h */,
+				641269F609F974D9006DF4E6 /* KeychainHI.h */,
+				641269F709F974D9006DF4E6 /* LanguageAnalysis.h */,
+				641269F809F974D9006DF4E6 /* LaunchServices.h */,
+				641269F909F974D9006DF4E6 /* Lists.h */,
+				641269FA09F974D9006DF4E6 /* LocationManager.h */,
+				641269FB09F974D9006DF4E6 /* LocationManager.k.h */,
+				641269FC09F974D9006DF4E6 /* LocationManager.r */,
+				641269FD09F974D9006DF4E6 /* LowMem.h */,
+				641269FE09F974D9006DF4E6 /* MacApplication.h */,
+				641269FF09F974D9006DF4E6 /* MacErrors.h */,
+				64126A0009F974D9006DF4E6 /* MacHelp.h */,
+				64126A0109F974D9006DF4E6 /* MachineExceptions.h */,
+				64126A0209F974D9006DF4E6 /* MacLocales.h */,
+				64126A0309F974D9006DF4E6 /* MacMemory.h */,
+				64126A0409F974D9006DF4E6 /* MacTCP.h */,
+				64126A0509F974D9006DF4E6 /* MacTextEditor.h */,
+				64126A0609F974D9006DF4E6 /* MacTypes.h */,
+				64126A0709F974D9006DF4E6 /* MacTypes.r */,
+				64126A0809F974D9006DF4E6 /* MacWindows.h */,
+				64126A0909F974D9006DF4E6 /* MacWindows.r */,
+				64126A0A09F974D9006DF4E6 /* Math64.h */,
+				64126A0B09F974D9006DF4E6 /* MediaHandlers.h */,
+				64126A0C09F974D9006DF4E6 /* MediaHandlers.k.h */,
+				64126A0D09F974D9006DF4E6 /* Memory.h */,
+				64126A0E09F974D9006DF4E6 /* Menus.h */,
+				64126A0F09F974D9006DF4E6 /* Menus.r */,
+				64126A1009F974D9006DF4E6 /* MIDI.h */,
+				64126A1109F974D9006DF4E6 /* MixedMode.h */,
+				64126A1209F974D9006DF4E6 /* MixedMode.r */,
+				64126A1309F974D9006DF4E6 /* Movies.h */,
+				64126A1409F974D9006DF4E6 /* Movies.k.h */,
+				64126A1509F974D9006DF4E6 /* MoviesFormat.h */,
+				64126A1609F974D9006DF4E6 /* Multiprocessing.h */,
+				64126A1709F974D9006DF4E6 /* MultiprocessingInfo.h */,
+				64126A1809F974D9006DF4E6 /* NameRegistry.h */,
+				64126A1909F974D9006DF4E6 /* Navigation.h */,
+				64126A1A09F974D9006DF4E6 /* NetSprocket.h */,
+				64126A1B09F974D9006DF4E6 /* NetworkSetup.h */,
+				64126A1C09F974D9006DF4E6 /* NetworkSetup.r */,
+				64126A1D09F974D9006DF4E6 /* Notification.h */,
+				64126A1E09F974D9006DF4E6 /* NSL.h */,
+				64126A1F09F974D9006DF4E6 /* NSLCore.h */,
+				64126A2009F974D9006DF4E6 /* NumberFormatting.h */,
+				64126A2109F974D9006DF4E6 /* OpenTptAppleTalk.h */,
+				64126A2209F974D9006DF4E6 /* OpenTptClient.h */,
+				64126A2309F974D9006DF4E6 /* OpenTptCommon.h */,
+				64126A2409F974D9006DF4E6 /* OpenTptConfig.h */,
+				64126A2509F974D9006DF4E6 /* OpenTptDevLinks.h */,
+				64126A2609F974D9006DF4E6 /* OpenTptGlobalNew.h */,
+				64126A2709F974D9006DF4E6 /* OpenTptInternet.h */,
+				64126A2809F974D9006DF4E6 /* OpenTptISDN.h */,
+				64126A2909F974D9006DF4E6 /* OpenTptLinks.h */,
+				64126A2A09F974D9006DF4E6 /* OpenTptModule.h */,
+				64126A2B09F974D9006DF4E6 /* OpenTptPCISupport.h */,
+				64126A2C09F974D9006DF4E6 /* OpenTptSerial.h */,
+				64126A2D09F974D9006DF4E6 /* OpenTptXTI.h */,
+				64126A2E09F974D9006DF4E6 /* OpenTransport.h */,
+				64126A2F09F974D9006DF4E6 /* OpenTransport.r */,
+				64126A3009F974D9006DF4E6 /* OpenTransportKernel.h */,
+				64126A3109F974D9006DF4E6 /* OpenTransportKernel.r */,
+				64126A3209F974D9006DF4E6 /* OpenTransportProtocol.h */,
+				64126A3309F974D9006DF4E6 /* OpenTransportProtocol.r */,
+				64126A3409F974D9006DF4E6 /* OpenTransportProviders.h */,
+				64126A3509F974D9006DF4E6 /* OpenTransportProviders.r */,
+				64126A3609F974D9006DF4E6 /* OpenTransportUNIX.h */,
+				64126A3709F974D9006DF4E6 /* OSA.h */,
+				64126A3809F974D9006DF4E6 /* OSA.k.h */,
+				64126A3909F974D9006DF4E6 /* OSAComp.h */,
+				64126A3A09F974D9006DF4E6 /* OSAGeneric.h */,
+				64126A3B09F974D9006DF4E6 /* OSUtils.h */,
+				64126A3C09F974D9006DF4E6 /* OSUtils.r */,
+				64126A3D09F974D9006DF4E6 /* OTConfig.r */,
+				64126A3E09F974D9006DF4E6 /* Packages.h */,
+				64126A3F09F974D9006DF4E6 /* Palettes.h */,
+				64126A4009F974D9006DF4E6 /* Palettes.r */,
+				64126A4109F974D9006DF4E6 /* Patches.h */,
+				64126A4209F974D9006DF4E6 /* PCCard.h */,
+				64126A4309F974D9006DF4E6 /* PCCardAdapterPlugin.h */,
+				64126A4409F974D9006DF4E6 /* PCCardEnablerPlugin.h */,
+				64126A4509F974D9006DF4E6 /* PCCardEnablerPlugin.r */,
+				64126A4609F974D9006DF4E6 /* PCCardTuples.h */,
+				64126A4709F974D9006DF4E6 /* PCI.h */,
+				64126A4809F974D9006DF4E6 /* PEFBinaryFormat.h */,
+				64126A4909F974D9006DF4E6 /* Pict.r */,
+				64126A4A09F974D9006DF4E6 /* PictUtils.h */,
+				64126A4B09F974D9006DF4E6 /* PictUtils.r */,
+				64126A4C09F974D9006DF4E6 /* PLStringFuncs.h */,
+				64126A4D09F974D9006DF4E6 /* PMApplication.h */,
+				64126A4E09F974D9006DF4E6 /* PMCore.h */,
+				64126A4F09F974D9006DF4E6 /* PMDefinitions.h */,
+				64126A5009F974D9006DF4E6 /* Power.h */,
+				64126A5109F974D9006DF4E6 /* PPCToolbox.h */,
+				64126A5209F974D9006DF4E6 /* PPCToolbox.r */,
+				64126A5309F974D9006DF4E6 /* Printing.h */,
+				64126A5409F974D9006DF4E6 /* Processes.h */,
+				64126A5509F974D9006DF4E6 /* Processes.r */,
+				64126A5609F974D9006DF4E6 /* QD3D.h */,
+				64126A5709F974D9006DF4E6 /* QD3DAcceleration.h */,
+				64126A5809F974D9006DF4E6 /* QD3DCamera.h */,
+				64126A5909F974D9006DF4E6 /* QD3DController.h */,
+				64126A5A09F974D9006DF4E6 /* QD3DCustomElements.h */,
+				64126A5B09F974D9006DF4E6 /* QD3DDrawContext.h */,
+				64126A5C09F974D9006DF4E6 /* QD3DErrors.h */,
+				64126A5D09F974D9006DF4E6 /* QD3DExtension.h */,
+				64126A5E09F974D9006DF4E6 /* QD3DGeometry.h */,
+				64126A5F09F974D9006DF4E6 /* QD3DGroup.h */,
+				64126A6009F974D9006DF4E6 /* QD3DIO.h */,
+				64126A6109F974D9006DF4E6 /* QD3DLight.h */,
+				64126A6209F974D9006DF4E6 /* QD3DMath.h */,
+				64126A6309F974D9006DF4E6 /* QD3DPick.h */,
+				64126A6409F974D9006DF4E6 /* QD3DRenderer.h */,
+				64126A6509F974D9006DF4E6 /* QD3DSet.h */,
+				64126A6609F974D9006DF4E6 /* QD3DShader.h */,
+				64126A6709F974D9006DF4E6 /* QD3DStorage.h */,
+				64126A6809F974D9006DF4E6 /* QD3DString.h */,
+				64126A6909F974D9006DF4E6 /* QD3DStyle.h */,
+				64126A6A09F974D9006DF4E6 /* QD3DTransform.h */,
+				64126A6B09F974D9006DF4E6 /* QD3DView.h */,
+				64126A6C09F974D9006DF4E6 /* QD3DViewer.h */,
+				64126A6D09F974D9006DF4E6 /* QD3DWinViewer.h */,
+				64126A6E09F974D9006DF4E6 /* QDOffscreen.h */,
+				64126A6F09F974D9006DF4E6 /* QTML.h */,
+				64126A7009F974D9006DF4E6 /* QTSMovie.h */,
+				64126A7109F974D9006DF4E6 /* QTSMovie.k.h */,
+				64126A7209F974D9006DF4E6 /* QTSMovie.r */,
+				64126A7309F974D9006DF4E6 /* QTStreamingComponents.h */,
+				64126A7409F974D9006DF4E6 /* QTStreamingComponents.k.h */,
+				64126A7509F974D9006DF4E6 /* QTStreamingComponents.r */,
+				64126A7609F974D9006DF4E6 /* Quickdraw.h */,
+				64126A7709F974D9006DF4E6 /* Quickdraw.r */,
+				64126A7809F974D9006DF4E6 /* QuickdrawText.h */,
+				64126A7909F974D9006DF4E6 /* QuickTime.h */,
+				64126A7A09F974D9006DF4E6 /* QuickTime.r */,
+				64126A7B09F974D9006DF4E6 /* QuickTimeComponents.h */,
+				64126A7C09F974D9006DF4E6 /* QuickTimeComponents.k.h */,
+				64126A7D09F974D9006DF4E6 /* QuickTimeComponents.r */,
+				64126A7E09F974D9006DF4E6 /* QuickTimeMusic.h */,
+				64126A7F09F974D9006DF4E6 /* QuickTimeMusic.k.h */,
+				64126A8009F974D9006DF4E6 /* QuickTimeStreaming.h */,
+				64126A8109F974D9006DF4E6 /* QuickTimeVR.h */,
+				64126A8209F974D9006DF4E6 /* QuickTimeVRFormat.h */,
+				64126A8309F974D9006DF4E6 /* RAVE.h */,
+				64126A8409F974D9006DF4E6 /* RAVESystem.h */,
+				64126A8509F974D9006DF4E6 /* Resources.h */,
+				64126A8609F974D9006DF4E6 /* Retrace.h */,
+				64126A8709F974D9006DF4E6 /* ROMDefs.h */,
+				64126A8809F974D9006DF4E6 /* ScalerStreamTypes.h */,
+				64126A8909F974D9006DF4E6 /* ScalerTypes.h */,
+				64126A8A09F974D9006DF4E6 /* Scrap.h */,
+				64126A8B09F974D9006DF4E6 /* Script.h */,
+				64126A8C09F974D9006DF4E6 /* Script.r */,
+				64126A8D09F974D9006DF4E6 /* SCSI.h */,
+				64126A8E09F974D9006DF4E6 /* SegLoad.h */,
+				64126A8F09F974D9006DF4E6 /* Serial.h */,
+				64126A9009F974D9006DF4E6 /* SFNTLayoutTypes.h */,
+				64126A9109F974D9006DF4E6 /* SFNTTypes.h */,
+				64126A9209F974D9006DF4E6 /* ShutDown.h */,
+				64126A9309F974D9006DF4E6 /* Slots.h */,
+				64126A9409F974D9006DF4E6 /* Slots.r */,
+				64126A9509F974D9006DF4E6 /* SocketServices.h */,
+				64126A9609F974D9006DF4E6 /* Sound.h */,
+				64126A9709F974D9006DF4E6 /* Sound.k.h */,
+				64126A9809F974D9006DF4E6 /* Sound.r */,
+				64126A9909F974D9006DF4E6 /* SoundComponents.h */,
+				64126A9A09F974D9006DF4E6 /* SoundComponents.r */,
+				64126A9B09F974D9006DF4E6 /* SoundInput.h */,
+				64126A9C09F974D9006DF4E6 /* SoundInput.r */,
+				64126A9D09F974D9006DF4E6 /* SoundSprocket.h */,
+				64126A9E09F974D9006DF4E6 /* Speech.h */,
+				64126A9F09F974D9006DF4E6 /* SpeechRecognition.h */,
+				64126AA009F974D9006DF4E6 /* SpeechSynthesis.h */,
+				64126AA109F974D9006DF4E6 /* StandardFile.h */,
+				64126AA209F974D9006DF4E6 /* Start.h */,
+				64126AA309F974D9006DF4E6 /* StringCompare.h */,
+				64126AA409F974D9006DF4E6 /* Strings.h */,
+				64126AA509F974D9006DF4E6 /* SysTypes.r */,
+				64126AA609F974D9006DF4E6 /* Telephones.h */,
+				64126AA709F974D9006DF4E6 /* Terminals.h */,
+				64126AA809F974D9006DF4E6 /* TerminalTools.h */,
+				64126AA909F974D9006DF4E6 /* TextCommon.h */,
+				64126AAA09F974D9006DF4E6 /* TextCommon.r */,
+				64126AAB09F974D9006DF4E6 /* TextEdit.h */,
+				64126AAC09F974D9006DF4E6 /* TextEncodingConverter.h */,
+				64126AAD09F974D9006DF4E6 /* TextEncodingPlugin.h */,
+				64126AAE09F974D9006DF4E6 /* TextServices.h */,
+				64126AAF09F974D9006DF4E6 /* TextUtils.h */,
+				64126AB009F974D9006DF4E6 /* Threads.h */,
+				64126AB109F974D9006DF4E6 /* Timer.h */,
+				64126AB209F974D9006DF4E6 /* ToolUtils.h */,
+				64126AB309F974D9006DF4E6 /* Translation.h */,
+				64126AB409F974D9006DF4E6 /* TranslationExtensions.h */,
+				64126AB509F974D9006DF4E6 /* TranslationExtensions.r */,
+				64126AB609F974D9006DF4E6 /* Traps.h */,
+				64126AB709F974D9006DF4E6 /* TSMTE.h */,
+				64126AB809F974D9006DF4E6 /* Types.h */,
+				64126AB909F974D9006DF4E6 /* Types.r */,
+				64126ABA09F974D9006DF4E6 /* TypeSelect.h */,
+				64126ABB09F974D9006DF4E6 /* Unicode.h */,
+				64126ABC09F974D9006DF4E6 /* UnicodeConverter.h */,
+				64126ABD09F974D9006DF4E6 /* UnicodeConverter.r */,
+				64126ABE09F974D9006DF4E6 /* UnicodeUtilities.h */,
+				64126ABF09F974D9006DF4E6 /* UnicodeUtilities.r */,
+				64126AC009F974D9006DF4E6 /* URLAccess.h */,
+				64126AC109F974D9006DF4E6 /* USB.h */,
+				64126AC209F974D9006DF4E6 /* UTCUtils.h */,
+				64126AC309F974D9006DF4E6 /* vBasicOps.h */,
+				64126AC409F974D9006DF4E6 /* vBigNum.h */,
+				64126AC509F974D9006DF4E6 /* vBLAS.h */,
+				64126AC609F974D9006DF4E6 /* vDSP.h */,
+				64126AC709F974D9006DF4E6 /* vectorOps.h */,
+				64126AC809F974D9006DF4E6 /* vfp.h */,
+				64126AC909F974D9006DF4E6 /* Video.h */,
+				64126ACA09F974D9006DF4E6 /* Video.r */,
+				64126ACB09F974D9006DF4E6 /* VideoServices.h */,
+				64126ACC09F974D9006DF4E6 /* Windows.h */,
+				64126ACD09F974D9006DF4E6 /* Windows.r */,
+				64126ACE09F974D9006DF4E6 /* WorldScript.h */,
+				64126ACF09F974D9006DF4E6 /* ZoomedVideo.h */,
+			);
+			name = "Mac OS common";
+			path = /Developer/Headers/FlatCarbon;
+			sourceTree = "<absolute>";
+		};
+		64126AD309F9751C006DF4E6 /* Photoshop common */ = {
+			isa = PBXGroup;
+			children = (
+				2AF20A8B12065CC6001E5E3F /* adm */,
+				64126B2C09F9751D006DF4E6 /* photoshop */,
+				64126B4909F9751D006DF4E6 /* pica_sp */,
+				64126B6209F9751D006DF4E6 /* resources */,
+			);
+			name = "Photoshop common";
+			path = ../../../ext/adobe_photoshop_cs5_sdk_mac/pluginsdk/photoshopapi;
+			sourceTree = SOURCE_ROOT;
+		};
+		64126B2C09F9751D006DF4E6 /* photoshop */ = {
+			isa = PBXGroup;
+			children = (
+				64CC2EB3111CDDB200423B46 /* JSScriptingSuite.h */,
+				646B5C9E10D3159B001A7C6E /* PSIntTypes.h */,
+				64CF8EE60AA3A73400120C5A /* ASZStringSuite.h */,
+				64CF8EE70AA3A73400120C5A /* ASTypes.h */,
+				64CF8EE80AA3A73400120C5A /* ASPragma.h */,
+				64CF8EE90AA3A73400120C5A /* ASConfig.h */,
+				64126B2D09F9751D006DF4E6 /* ASPreInclude.h */,
+				64126B2E09F9751D006DF4E6 /* PIAbout.h */,
+				64126B2F09F9751D006DF4E6 /* PIAcquire.h */,
+				64126B3009F9751D006DF4E6 /* PIActions.h */,
+				64126B3109F9751D006DF4E6 /* PIActionsPlugin.h */,
+				64126B3209F9751D006DF4E6 /* PIAliasSuite.h */,
+				64126B3309F9751D006DF4E6 /* PIBufferSuite.h */,
+				64126B3409F9751D006DF4E6 /* PIChannelPortOperations.h */,
+				64126B3509F9751D006DF4E6 /* PIChannelPortsSuite.h */,
+				64126B3609F9751D006DF4E6 /* PIColorSpaceSuite.h */,
+				64126B3709F9751D006DF4E6 /* PIErrorSuite.h */,
+				64126B3809F9751D006DF4E6 /* PIExport.h */,
+				64126B3909F9751D006DF4E6 /* PIFilter.h */,
+				64126B3A09F9751D006DF4E6 /* PIFormat.h */,
+				64126B3B09F9751D006DF4E6 /* PIGeneral.h */,
+				64126B3C09F9751D006DF4E6 /* PIGetFileListSuite.h */,
+				64126B3D09F9751D006DF4E6 /* PIGetPathSuite.h */,
+				64126B3E09F9751D006DF4E6 /* PIHandleSuite.h */,
+				64126B3F09F9751D006DF4E6 /* PIPicker.h */,
+				64126B4009F9751D006DF4E6 /* PIProgressSuite.h */,
+				64126B4109F9751D006DF4E6 /* PIProperties.h */,
+				64126B4209F9751D006DF4E6 /* PIResDefines.h */,
+				64126B4309F9751D006DF4E6 /* PISelection.h */,
+				64126B4409F9751D006DF4E6 /* PIStringTerminology.h */,
+				64126B4509F9751D006DF4E6 /* PITerminology.h */,
+				64126B4609F9751D006DF4E6 /* PITypes.h */,
+				64126B4709F9751D006DF4E6 /* PIUIHooksSuite.h */,
+				64126B4809F9751D006DF4E6 /* PSErrorDefines.h */,
+			);
+			path = photoshop;
+			sourceTree = "<group>";
+		};
+		64126B4909F9751D006DF4E6 /* pica_sp */ = {
+			isa = PBXGroup;
+			children = (
+				64126B4A09F9751D006DF4E6 /* SPAccess.h */,
+				64126B4B09F9751D006DF4E6 /* SPAdapts.h */,
+				64126B4C09F9751D006DF4E6 /* SPBasic.h */,
+				64126B4D09F9751D006DF4E6 /* SPBckDbg.h */,
+				64126B4E09F9751D006DF4E6 /* SPBlocks.h */,
+				64126B4F09F9751D006DF4E6 /* SPCaches.h */,
+				64126B5009F9751D006DF4E6 /* SPCOM.h */,
+				64126B5109F9751D006DF4E6 /* SPConfig.h */,
+				64126B5309F9751D006DF4E6 /* SPErrorCodes.h */,
+				64126B5409F9751D006DF4E6 /* SPErrors.h */,
+				64126B5509F9751D006DF4E6 /* SPFiles.h */,
+				64126B5609F9751D006DF4E6 /* SPHost.h */,
+				64126B5709F9751D006DF4E6 /* SPInterf.h */,
+				64126B5809F9751D006DF4E6 /* SPMData.h */,
+				64126B5909F9751D006DF4E6 /* SPObject.h */,
+				64126B5A09F9751D006DF4E6 /* SPPiPL.h */,
+				64126B5B09F9751D006DF4E6 /* SPPlugs.h */,
+				64126B5C09F9751D006DF4E6 /* SPProps.h */,
+				64126B5D09F9751D006DF4E6 /* SPRuntme.h */,
+				64126B5E09F9751D006DF4E6 /* SPStrngs.h */,
+				64126B5F09F9751D006DF4E6 /* SPSTSPrp.h */,
+				64126B6009F9751D006DF4E6 /* SPSuites.h */,
+				64126B6109F9751D006DF4E6 /* SPTypes.h */,
+			);
+			path = pica_sp;
+			sourceTree = "<group>";
+		};
+		64126B6209F9751D006DF4E6 /* resources */ = {
+			isa = PBXGroup;
+			children = (
+				64126B6309F9751D006DF4E6 /* PIGeneral.r */,
+				64126B6409F9751D006DF4E6 /* PIMI.r */,
+				64126B6509F9751D006DF4E6 /* PIPL.r */,
+			);
+			path = resources;
+			sourceTree = "<group>";
+		};
+		64126B7009F97565006DF4E6 /* SDK common */ = {
+			isa = PBXGroup;
+			children = (
+				64126B7109F97565006DF4E6 /* includes */,
+				64126B9609F97565006DF4E6 /* resources */,
+				64126B9D09F97565006DF4E6 /* sources */,
+			);
+			name = "SDK common";
+			path = ../../../ext/adobe_photoshop_cs5_sdk_mac/pluginsdk/samplecode/common;
+			sourceTree = SOURCE_ROOT;
+		};
+		64126B7109F97565006DF4E6 /* includes */ = {
+			isa = PBXGroup;
+			children = (
+				2AF20A8412065C91001E5E3F /* FilterBigDocument.h */,
+				64126B7409F97565006DF4E6 /* DialogUtilities.h */,
+				64126B7B09F97565006DF4E6 /* MachOMacrezXcode.h */,
+				64126B7F09F97565006DF4E6 /* PIDefines.h */,
+				64126B8109F97565006DF4E6 /* PIMachODebug.h */,
+				64126B8209F97565006DF4E6 /* PIMachORelease.h */,
+				64126B8509F97565006DF4E6 /* PIRezMachO.h */,
+				64126B8709F97565006DF4E6 /* PIUActions.h */,
+				64126B8909F97565006DF4E6 /* PIUFile.h */,
+				64126B8B09F97565006DF4E6 /* PIUI.h */,
+				64126B8E09F97565006DF4E6 /* PIUSuites.h */,
+				64126B8F09F97565006DF4E6 /* PIUtilities.h */,
+			);
+			path = includes;
+			sourceTree = "<group>";
+		};
+		64126B9609F97565006DF4E6 /* resources */ = {
+			isa = PBXGroup;
+			children = (
+				E2880D630B0EECF5001C1C00 /* Info.plist */,
+				64126B9A09F97565006DF4E6 /* PIUtilities.r */,
+			);
+			path = resources;
+			sourceTree = "<group>";
+		};
+		64126B9D09F97565006DF4E6 /* sources */ = {
+			isa = PBXGroup;
+			children = (
+				2AF20A8212065C87001E5E3F /* FilterBigDocument.cpp */,
+				64126C2509F979E1006DF4E6 /* PIMacUI.cpp */,
+				64126C2A09F979EA006DF4E6 /* PIUSuites.cpp */,
+				64126C2F09F979F7006DF4E6 /* DialogUtilitiesMac.cpp */,
+				64126C3409F97A19006DF4E6 /* PIUtilities.cpp */,
+			);
+			path = sources;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		8D01CCC60486CAD60068D4B7 /* OpenColorIO PS */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "OpenColorIO PS" */;
+			buildPhases = (
+				8D01CCC90486CAD60068D4B7 /* Resources */,
+				8D01CCCB0486CAD60068D4B7 /* Sources */,
+				8D01CCCD0486CAD60068D4B7 /* Frameworks */,
+				64126BFC09F97704006DF4E6 /* Rez */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				2A644DBF1E31FACE00AAEF84 /* PBXTargetDependency */,
+				2A644DC11E31FACE00AAEF84 /* PBXTargetDependency */,
+				2A644DC31E31FACE00AAEF84 /* PBXTargetDependency */,
+				2A644DC51E31FACE00AAEF84 /* PBXTargetDependency */,
+			);
+			name = "OpenColorIO PS";
+			productInstallPath = "$(HOME)/Library/Bundles";
+			productName = SimpleFormat;
+			productReference = 8D01CCD20486CAD60068D4B7 /* OpenColorIO PS.plugin */;
+			productType = "com.apple.product-type.bundle";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		089C1669FE841209C02AAC07 /* Project object */ = {
+			isa = PBXProject;
+			buildConfigurationList = 4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "OpenColorIO_PS" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
+			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
+			mainGroup = 089C166AFE841209C02AAC07 /* SimpleFormat */;
+			projectDirPath = "";
+			projectReferences = (
+				{
+					ProductGroup = 2A644DA91E31FAA500AAEF84 /* Products */;
+					ProjectRef = 2A644DA81E31FAA500AAEF84 /* lcms.xcodeproj */;
+				},
+				{
+					ProductGroup = 2A644DA31E31FA7800AAEF84 /* Products */;
+					ProjectRef = 2A644DA21E31FA7800AAEF84 /* OpenColorIO.xcodeproj */;
+				},
+				{
+					ProductGroup = 2A644DAC1E31FAA500AAEF84 /* Products */;
+					ProjectRef = 2A644DAB1E31FAA500AAEF84 /* tinyxml.xcodeproj */;
+				},
+				{
+					ProductGroup = 2A644DAF1E31FAA500AAEF84 /* Products */;
+					ProjectRef = 2A644DAE1E31FAA500AAEF84 /* yaml.xcodeproj */;
+				},
+			);
+			projectRoot = "";
+			targets = (
+				8D01CCC60486CAD60068D4B7 /* OpenColorIO PS */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXReferenceProxy section */
+		2A644DA71E31FA7800AAEF84 /* libOpenColorIO.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libOpenColorIO.a;
+			remoteRef = 2A644DA61E31FA7800AAEF84 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2A644DB31E31FAA500AAEF84 /* liblcms.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = liblcms.a;
+			remoteRef = 2A644DB21E31FAA500AAEF84 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2A644DB61E31FAA500AAEF84 /* libtinyxml.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libtinyxml.a;
+			remoteRef = 2A644DB51E31FAA500AAEF84 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+		2A644DB91E31FAA500AAEF84 /* libyaml.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libyaml.a;
+			remoteRef = 2A644DB81E31FAA500AAEF84 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
+/* End PBXReferenceProxy section */
+
+/* Begin PBXResourcesBuildPhase section */
+		8D01CCC90486CAD60068D4B7 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A644C9D1E316E6C00AAEF84 /* OpenColorIO_PS_Dialog.xib in Resources */,
+				2A7523971E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser.xib in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXRezBuildPhase section */
+		64126BFC09F97704006DF4E6 /* Rez */ = {
+			isa = PBXRezBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A7F211C1E2F4E57003428D7 /* OpenColorIO_PS.r in Rez */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXRezBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		8D01CCCB0486CAD60068D4B7 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				64126C2B09F979EA006DF4E6 /* PIUSuites.cpp in Sources */,
+				2AF20A8312065C87001E5E3F /* FilterBigDocument.cpp in Sources */,
+				2AF20AE712065E0E001E5E3F /* PIUtilities.cpp in Sources */,
+				2AF20AEA12065E19001E5E3F /* DialogUtilitiesMac.cpp in Sources */,
+				2A7F211B1E2F4E57003428D7 /* OpenColorIO_PS.cpp in Sources */,
+				2A644CB41E31731000AAEF84 /* OpenColorIO_PS_Dialog_Controller.mm in Sources */,
+				2A644CBB1E31787500AAEF84 /* OpenColorIO_PS_Dialog_Cocoa.mm in Sources */,
+				2A4150441E33FD6900E3954B /* OpenColorIO_PS_Context.cpp in Sources */,
+				2A7523751E3ECDEA00BB5897 /* ocioicc.cpp in Sources */,
+				2A7523961E3ED22600BB5897 /* OpenColorIO_AE_MonitorProfileChooser_Controller.m in Sources */,
+				2A7529E21E3FB64000BB5897 /* OpenColorIO_AE_Dialogs_Cocoa.mm in Sources */,
+				2A7529E71E3FB66000BB5897 /* OpenColorIO_AE_Menu.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		2A644DBF1E31FACE00AAEF84 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = lcms;
+			targetProxy = 2A644DBE1E31FACE00AAEF84 /* PBXContainerItemProxy */;
+		};
+		2A644DC11E31FACE00AAEF84 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = yaml;
+			targetProxy = 2A644DC01E31FACE00AAEF84 /* PBXContainerItemProxy */;
+		};
+		2A644DC31E31FACE00AAEF84 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = tinyxml;
+			targetProxy = 2A644DC21E31FACE00AAEF84 /* PBXContainerItemProxy */;
+		};
+		2A644DC51E31FACE00AAEF84 /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			name = OpenColorIO;
+			targetProxy = 2A644DC41E31FACE00AAEF84 /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin XCBuildConfiguration section */
+		2A01738D112F17A8005CDE51 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				AE_SDK = "\"../../../../kits/Adobe After Effects CS3 SDK/Examples/Headers\"";
+				ARCHS = "$(ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_64_BIT_PRE_XCODE_3_1 = x86_64;
+				COPY_PHASE_STRIP = YES;
+				GCC_ENABLE_FIX_AND_CONTINUE = NO;
+				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 3;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					__PI__,
+					PS_CS4_SDK,
+					NDEBUG,
+				);
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_PKGINFO_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					../../../export,
+					../../../src/core,
+					../../../ext/tinyxml,
+					"../../../ext/yaml-cpp/include",
+					"../../../ext/lcms2-2.1/include",
+					../../../src/aftereffects/xcode,
+				);
+				ONLY_ACTIVE_ARCH = NO;
+				PLUGIN_TYPE = 8BIF;
+				PREBINDING = NO;
+				REZ_PREFIX_FILE = "$(SRCROOT)/../../../ext/adobe_photoshop_cs5_sdk_mac/pluginsdk/samplecode/common/includes/MachOMacrezXcode.h";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+				WRAPPER_EXTENSION = plugin;
+				ZERO_LINK = NO;
+			};
+			name = Release;
+		};
+		2A01738E112F17A8005CDE51 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = ../mac/OpenColorIO_PS_Info.plist;
+				PRODUCT_NAME = "OpenColorIO PS";
+				WRAPPER_EXTENSION = plugin;
+			};
+			name = Release;
+		};
+		4FADC23408B4156C00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = ../mac/OpenColorIO_PS_Info.plist;
+				PRODUCT_NAME = "OpenColorIO PS";
+				WRAPPER_EXTENSION = plugin;
+			};
+			name = Debug;
+		};
+		4FADC23808B4156C00ABE55E /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				AE_SDK = "\"../../../../kits/Adobe After Effects CS3 SDK/Examples/Headers\"";
+				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
+				COPY_PHASE_STRIP = NO;
+				GCC_ENABLE_FIX_AND_CONTINUE = YES;
+				GCC_MODEL_TUNING = G5;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					__PI__,
+					PS_CS4_SDK,
+				);
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				GENERATE_PKGINFO_FILE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					../../../export,
+					../../../src/core,
+					../../../ext/tinyxml,
+					"../../../ext/yaml-cpp/include",
+					"../../../ext/lcms2-2.1/include",
+					../../../src/aftereffects/xcode,
+				);
+				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_64)";
+				PLUGIN_TYPE = 8BIF;
+				PREBINDING = NO;
+				REZ_PREFIX_FILE = "$(SRCROOT)/../../../ext/adobe_photoshop_cs5_sdk_mac/pluginsdk/samplecode/common/includes/MachOMacrezXcode.h";
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
+				STRIP_INSTALLED_PRODUCT = NO;
+				WRAPPER_EXTENSION = plugin;
+				ZERO_LINK = NO;
+			};
+			name = Debug;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		4FADC23308B4156C00ABE55E /* Build configuration list for PBXNativeTarget "OpenColorIO PS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC23408B4156C00ABE55E /* Debug */,
+				2A01738E112F17A8005CDE51 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+		4FADC23708B4156C00ABE55E /* Build configuration list for PBXProject "OpenColorIO_PS" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				4FADC23808B4156C00ABE55E /* Debug */,
+				2A01738D112F17A8005CDE51 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 089C1669FE841209C02AAC07 /* Project object */;
+}
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/CMakeLists.txt opencolorio-1.1.0~dfsg0/src/pyglue/CMakeLists.txt
--- opencolorio-1.0.9~dfsg0/src/pyglue/CMakeLists.txt	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/CMakeLists.txt	2018-01-05 01:38:27.000000000 +0000
@@ -13,13 +13,24 @@
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-strict-aliasing -Wno-missing-field-initializers")
 endif()
 
-if(NOT WIN32)
-    find_package(PythonLibs)
-    if(NOT PYTHONLIBS_FOUND)
-        message(FATAL "Python libraries were not found, exiting.")
-    endif()
-    SET(PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS})
+if(WIN32)
+    # Mute a design issue where the Exception public class inherits 
+    # from a STL Exception. STL classes are never supposed to
+    # be exported among different dynamic libraries.
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4275")
+endif()
+
+# Process all warnings as errors
+# Unfortunately Windows still has a warning
+if(UNIX)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif()
+
+find_package(PythonLibs)
+if(NOT PYTHONLIBS_FOUND)
+    message(FATAL "Python libraries were not found, exiting.")
 endif()
+SET(PYTHON_INCLUDES ${PYTHON_INCLUDE_DIRS})
 
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/src/pyglue/PyDoc.h
                   COMMAND ${PYTHON} ${CMAKE_SOURCE_DIR}/src/pyglue/createPyDocH.py ${CMAKE_BINARY_DIR}/src/pyglue/PyDoc.h
@@ -29,20 +40,22 @@
 
 add_library(PyOpenColorIO MODULE ${pyglue_src_files} ${CMAKE_BINARY_DIR}/src/pyglue/PyDoc.h)
 
+add_definitions(-DPYOCIO_NAME=PyOpenColorIO)
+
 if(OCIO_USE_BOOST_PTR)
     include_directories(
-        ${PYTHON_INCLUDE}
-        ${Boost_INCLUDE_DIR}
         ${CMAKE_SOURCE_DIR}/export/
         ${CMAKE_BINARY_DIR}/export/
         ${CMAKE_CURRENT_BINARY_DIR}
+        ${PYTHON_INCLUDE}
+        ${Boost_INCLUDE_DIR}
     )
 else()
     include_directories(
-        ${PYTHON_INCLUDE}
         ${CMAKE_SOURCE_DIR}/export/
         ${CMAKE_BINARY_DIR}/export/
         ${CMAKE_CURRENT_BINARY_DIR}
+        ${PYTHON_INCLUDE}
     )
 endif()
 
@@ -53,24 +66,20 @@
     )
 endif()
 
+target_link_OCIO(PyOpenColorIO)
+
 if(WIN32)
-    if(OCIO_PYGLUE_LINK)
-    target_link_libraries(PyOpenColorIO OpenColorIO
-        debug ${PYTHON_LIB}/python26_d.lib
-        optimized ${PYTHON_LIB}/python26.lib)
-    else()
-    target_link_libraries(PyOpenColorIO OpenColorIO)
-    endif(OCIO_PYGLUE_LINK)
-else()
-    if(OCIO_PYGLUE_LINK)
-        message(STATUS "Linking python bindings against: ${PYTHON_LIBRARY}")
-        message(STATUS "Python library dirs: ${PYTHON_LIBRARY_DIRS}")
-        link_directories(${PYTHON_LIBRARY})
-        target_link_libraries(PyOpenColorIO OpenColorIO
-            ${PYTHON_LIBRARIES})
-    else()
-        target_link_libraries(PyOpenColorIO OpenColorIO)
-    endif(OCIO_PYGLUE_LINK)
+    # Python extension on Windows is pyd
+    set_target_properties(PyOpenColorIO PROPERTIES SUFFIX ".pyd")
+endif()
+
+if(OCIO_PYGLUE_LINK OR WIN32)
+    # Windows always need the python library, 
+    #  refer to https://docs.python.org/3/extending/windows.html#a-cookbook-approach
+    message(STATUS "Linking python bindings against: ${PYTHON_LIBRARY}")
+    message(STATUS "Python library dirs: ${PYTHON_LIBRARY_DIRS}")
+    link_directories(${PYTHON_LIBRARY})
+    target_link_libraries(PyOpenColorIO ${PYTHON_LIBRARIES})
 endif()
 
 # PyOpenColorIO so serves dual roles:
@@ -95,14 +104,14 @@
 endif()
 
 if(APPLE)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -undefined dynamic_lookup")
+    set_target_properties(PyOpenColorIO PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
 endif()
 
 add_subdirectory(tests)
 
 message("PYTHON_VARIANT_PATH: ${PYTHON_VARIANT_PATH}")
 
-install(TARGETS PyOpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/${PYTHON_VARIANT_PATH})
+install(TARGETS PyOpenColorIO EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_EXEC_PREFIX}/${PYTHON_VARIANT_PATH})
 
 install(FILES ${CMAKE_SOURCE_DIR}/export/PyOpenColorIO/PyOpenColorIO.h
     DESTINATION ${CMAKE_INSTALL_PREFIX}/include/PyOpenColorIO/)
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/DocStrings/Look.py opencolorio-1.1.0~dfsg0/src/pyglue/DocStrings/Look.py
--- opencolorio-1.0.9~dfsg0/src/pyglue/DocStrings/Look.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/DocStrings/Look.py	2018-01-05 01:38:27.000000000 +0000
@@ -27,6 +27,12 @@
     def setProcessSpace(self, csname):
         pass
         
+    def getDescription(self):
+        pass
+        
+    def setDescription(self, desc):
+        pass
+        
     def getTransform(self):
         pass
         
@@ -38,4 +44,4 @@
     
     def setInverseTransform(self, transform):
         pass
-    
\ No newline at end of file
+    
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyAllocationTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyAllocationTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyAllocationTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyAllocationTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -84,7 +84,7 @@
     
     PyTypeObject PyOCIO_AllocationTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.AllocationTransform",                 //tp_name
+        OCIO_PYTHON_NAMESPACE(AllocationTransform), //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
@@ -131,10 +131,33 @@
         ///////////////////////////////////////////////////////////////////////
         ///
         
-        int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * /*args*/, PyObject * /*kwds*/)
+        int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds)
         {
             OCIO_PYTRY_ENTER()
-            return BuildPyTransformObject<AllocationTransformRcPtr>(self, AllocationTransform::Create());
+            AllocationTransformRcPtr ptr = AllocationTransform::Create();
+            int ret = BuildPyTransformObject<AllocationTransformRcPtr>(self, ptr);
+            char* allocation = NULL;
+            PyObject* pyvars = 0;
+            char* direction = NULL;
+            static const char *kwlist[] = { "allocation", "vars", "direction", NULL };
+            if(!PyArg_ParseTupleAndKeywords(args, kwds, "|sOs",
+                const_cast<char **>(kwlist),
+                &allocation, &pyvars, &direction)) return -1;
+            if(allocation) ptr->setAllocation(AllocationFromString(allocation));
+            if (pyvars)
+            {
+                std::vector<float> vars;
+                if(!FillFloatVectorFromPySequence(pyvars, vars) ||
+                    (vars.size() < 2 || vars.size() > 3))
+                {
+                    PyErr_SetString(PyExc_TypeError,
+                        "vars must be a float array, size 2 or 3");
+                    return 0;
+                }
+                ptr->setVars(static_cast<int>(vars.size()), &vars[0]);
+            }
+            if(direction) ptr->setDirection(TransformDirectionFromString(direction));
+            return ret;
             OCIO_PYTRY_EXIT(-1)
         }
         
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyBaker.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyBaker.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyBaker.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyBaker.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -154,7 +154,7 @@
     
     PyTypeObject PyOCIO_BakerType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Baker",                               //tp_name
+        OCIO_PYTHON_NAMESPACE(Baker),               //tp_name
         sizeof(PyOCIO_Baker),                       //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Baker_delete,            //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyCDLTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyCDLTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyCDLTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyCDLTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -120,7 +120,7 @@
     
     PyTypeObject PyOCIO_CDLTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.CDLTransform",                        //tp_name
+        OCIO_PYTHON_NAMESPACE(CDLTransform),        //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
@@ -167,10 +167,65 @@
         ///////////////////////////////////////////////////////////////////////
         ///
         
-        int PyOCIO_CDLTransform_init(PyOCIO_Transform *self, PyObject* /*args*/, PyObject* /*kwds*/)
+        int PyOCIO_CDLTransform_init(PyOCIO_Transform *self, PyObject* args, PyObject* kwds)
         {
             OCIO_PYTRY_ENTER()
-            return BuildPyTransformObject<CDLTransformRcPtr>(self, CDLTransform::Create());
+            CDLTransformRcPtr ptr = CDLTransform::Create();
+            int ret = BuildPyTransformObject<CDLTransformRcPtr>(self, ptr);
+            PyObject* pyslope = NULL;
+            PyObject* pyoffset = NULL;
+            PyObject* pypower = NULL;
+            float sat = -1.0; // -1.0 is an illegal value for saturation
+            char* direction = NULL;
+            char* id = NULL;
+            char* description = NULL;
+            static const char *kwlist[] = { "slope", "offset",
+                "power", "sat", "direction", "id", "description", NULL };
+            if(!PyArg_ParseTupleAndKeywords(args, kwds, "|OOOfsss",
+                const_cast<char **>(kwlist),
+                &pyslope, &pyoffset, &pypower, &sat, &direction, &id,
+                &description)) return -1;
+            if (pyslope)
+            {
+                std::vector<float> slope;
+                if(!FillFloatVectorFromPySequence(pyslope, slope) ||
+                    (slope.size() != 3))
+                {
+                    PyErr_SetString(PyExc_TypeError,
+                        "slope must be a float array, size 3");
+                    return 0;
+                }
+                ptr->setSlope(&slope[0]);
+            }
+            if (pyoffset)
+            {
+                std::vector<float> offset;
+                if(!FillFloatVectorFromPySequence(pyoffset, offset) ||
+                    (offset.size() != 3))
+                {
+                    PyErr_SetString(PyExc_TypeError,
+                        "offset must be a float array, size 3");
+                    return 0;
+                }
+                ptr->setOffset(&offset[0]);
+            }
+            if (pypower)
+            {
+                std::vector<float> power;
+                if(!FillFloatVectorFromPySequence(pypower, power) ||
+                    (power.size() != 3))
+                {
+                    PyErr_SetString(PyExc_TypeError,
+                        "power must be a float array, size 3");
+                    return 0;
+                }
+                ptr->setPower(&power[0]);
+            }
+            if(sat >= 0.0f) ptr->setSat(sat);
+            if(direction) ptr->setDirection(TransformDirectionFromString(direction));
+            if(id) ptr->setID(id);
+            if(id) ptr->setDescription(description);
+            return ret;
             OCIO_PYTRY_EXIT(-1)
         }
         
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyColorSpace.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyColorSpace.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyColorSpace.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyColorSpace.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -28,6 +28,7 @@
 
 #include <Python.h>
 #include <OpenColorIO/OpenColorIO.h>
+#include <sstream>
 
 #include "PyUtil.h"
 #include "PyDoc.h"
@@ -77,6 +78,7 @@
         
         int PyOCIO_ColorSpace_init(PyOCIO_ColorSpace * self, PyObject * args, PyObject * kwds);
         void PyOCIO_ColorSpace_delete(PyOCIO_ColorSpace * self, PyObject * args);
+        PyObject * PyOCIO_ColorSpace_str(PyObject * self);
         PyObject * PyOCIO_ColorSpace_isEditable(PyObject * self);
         PyObject * PyOCIO_ColorSpace_createEditableCopy(PyObject * self);
         PyObject * PyOCIO_ColorSpace_getName(PyObject * self);
@@ -151,7 +153,7 @@
     
     PyTypeObject PyOCIO_ColorSpaceType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size 
-        "OCIO.ColorSpace",                          //tp_name
+        OCIO_PYTHON_NAMESPACE(ColorSpace),          //tp_name
         sizeof(PyOCIO_ColorSpace),                  //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_ColorSpace_delete,       //tp_dealloc
@@ -165,7 +167,7 @@
         0,                                          //tp_as_mapping
         0,                                          //tp_hash 
         0,                                          //tp_call
-        0,                                          //tp_str
+        PyOCIO_ColorSpace_str,                      //tp_str
         0,                                          //tp_getattro
         0,                                          //tp_setattro
         0,                                          //tp_as_buffer
@@ -267,6 +269,16 @@
             DeletePyObject<PyOCIO_ColorSpace>(self);
         }
         
+        PyObject * PyOCIO_ColorSpace_str(PyObject * self)
+        {
+            OCIO_PYTRY_ENTER()
+            ConstColorSpaceRcPtr colorSpace = GetConstColorSpace(self, true);
+            std::ostringstream out;
+            out << *colorSpace;
+            return PyString_FromString(out.str().c_str());
+            OCIO_PYTRY_EXIT(NULL)
+        }
+
         PyObject * PyOCIO_ColorSpace_isEditable(PyObject * self)
         {
             return PyBool_FromLong(IsPyColorSpaceEditable(self));
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyColorSpaceTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyColorSpaceTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyColorSpaceTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyColorSpaceTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -77,7 +77,7 @@
     
     PyTypeObject PyOCIO_ColorSpaceTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.ColorSpaceTransform",                 //tp_name
+        OCIO_PYTHON_NAMESPACE(ColorSpaceTransform), //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyConfig.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyConfig.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyConfig.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyConfig.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -81,6 +81,7 @@
         PyObject * PyOCIO_Config_CreateFromStream(PyObject * cls, PyObject * args);
         int PyOCIO_Config_init(PyOCIO_Config * self, PyObject * args, PyObject * kwds);
         void PyOCIO_Config_delete(PyOCIO_Config * self, PyObject * args);
+        PyObject * PyOCIO_Config_repr(PyObject * self);
         PyObject * PyOCIO_Config_isEditable(PyObject * self);
         PyObject * PyOCIO_Config_createEditableCopy(PyObject * self);
         PyObject * PyOCIO_Config_sanityCheck(PyObject * self);
@@ -275,7 +276,7 @@
     
     PyTypeObject PyOCIO_ConfigType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //obsize
-        "OCIO.Config",                              //tp_name
+        OCIO_PYTHON_NAMESPACE(Config),              //tp_name
         sizeof(PyOCIO_Config),                      //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Config_delete,           //tp_dealloc
@@ -283,7 +284,7 @@
         0,                                          //tp_getattr
         0,                                          //tp_setattr
         0,                                          //tp_compare
-        0,                                          //tp_repr
+        PyOCIO_Config_repr,                         //tp_repr
         0,                                          //tp_as_number
         0,                                          //tp_as_sequence
         0,                                          //tp_as_mapping
@@ -361,6 +362,16 @@
             DeletePyObject<PyOCIO_Config>(self);
         }
         
+        PyObject * PyOCIO_Config_repr(PyObject * self)
+        {
+            OCIO_PYTRY_ENTER()
+            ConstConfigRcPtr config = GetConstConfig(self, true);
+            std::ostringstream out;
+            out << *config;
+            return PyString_FromString(out.str().c_str());
+            OCIO_PYTRY_EXIT(NULL)
+        }
+
         PyObject * PyOCIO_Config_isEditable(PyObject * self)
         {
             return PyBool_FromLong(IsPyConfigEditable(self));
@@ -475,7 +486,8 @@
             if (!PyArg_ParseTuple(args, "s:getEnvironmentVarDefault",
                 &name)) return NULL;
             ConstConfigRcPtr config = GetConstConfig(self, true);
-            return PyString_FromString(config->getEnvironmentVarDefault(name));
+            std::string var = config->getEnvironmentVarDefault(name);
+            return PyString_FromString(var.c_str());
             OCIO_PYTRY_EXIT(NULL)
         }
         
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyContext.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyContext.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyContext.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyContext.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -28,6 +28,7 @@
 
 #include <Python.h>
 #include <OpenColorIO/OpenColorIO.h>
+#include <sstream>
 
 #include "PyUtil.h"
 #include "PyDoc.h"
@@ -77,6 +78,7 @@
         
         int PyOCIO_Context_init(PyOCIO_Context * self, PyObject * args, PyObject * kwds);
         void PyOCIO_Context_delete(PyOCIO_Context * self, PyObject * args);
+        PyObject * PyOCIO_Context_str(PyObject * self);
         PyObject * PyOCIO_Context_isEditable(PyObject * self);
         PyObject * PyOCIO_Context_createEditableCopy(PyObject * self);
         PyObject * PyOCIO_Context_getCacheID(PyObject * self);
@@ -143,7 +145,7 @@
     
     PyTypeObject PyOCIO_ContextType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Context",                             //tp_name
+        OCIO_PYTHON_NAMESPACE(Context),             //tp_name
         sizeof(PyOCIO_Context),                     //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Context_delete,          //tp_dealloc
@@ -157,7 +159,7 @@
         0,                                          //tp_as_mapping
         0,                                          //tp_hash 
         0,                                          //tp_call
-        0,                                          //tp_str
+        PyOCIO_Context_str,                         //tp_str
         0,                                          //tp_getattro
         0,                                          //tp_setattro
         0,                                          //tp_as_buffer
@@ -202,6 +204,16 @@
             DeletePyObject<PyOCIO_Context>(self);
         }
         
+        PyObject * PyOCIO_Context_str(PyObject * self)
+        {
+            OCIO_PYTRY_ENTER()
+            ConstContextRcPtr context = GetConstContext(self, true);
+            std::ostringstream out;
+            out << *context;
+            return PyString_FromString(out.str().c_str());
+            OCIO_PYTRY_EXIT(NULL)
+        }
+
         PyObject * PyOCIO_Context_isEditable(PyObject * self)
         {
             return PyBool_FromLong(IsPyContextEditable(self));
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyDisplayTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyDisplayTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyDisplayTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyDisplayTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -118,7 +118,7 @@
     
     PyTypeObject PyOCIO_DisplayTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.DisplayTransform",                    //tp_name
+        OCIO_PYTHON_NAMESPACE(DisplayTransform),    //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
@@ -165,10 +165,25 @@
         ///////////////////////////////////////////////////////////////////////
         ///
         
-        int PyOCIO_DisplayTransform_init(PyOCIO_Transform * self, PyObject * /*args*/, PyObject * /*kwds*/)
+        int PyOCIO_DisplayTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds)
         {
             OCIO_PYTRY_ENTER()
-            return BuildPyTransformObject<DisplayTransformRcPtr>(self, DisplayTransform::Create());
+            DisplayTransformRcPtr ptr = DisplayTransform::Create();
+            int ret = BuildPyTransformObject<DisplayTransformRcPtr>(self, ptr);
+            char* inputColorSpaceName = NULL;
+            char* display = NULL;
+            char* view = NULL;
+            char* direction = NULL;
+            static const char *kwlist[] = { "inputColorSpaceName",
+                "display", "view", "direction", NULL };
+            if(!PyArg_ParseTupleAndKeywords(args, kwds, "|ssss",
+                const_cast<char **>(kwlist),
+                &inputColorSpaceName, &display, &view, &direction)) return -1;
+            if(inputColorSpaceName) ptr->setInputColorSpaceName(inputColorSpaceName);
+            if(display) ptr->setDisplay(display);
+            if(view) ptr->setView(view);
+            if(direction) ptr->setDirection(TransformDirectionFromString(direction));
+            return ret;
             OCIO_PYTRY_EXIT(-1)
         }
         
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyExponentTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyExponentTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyExponentTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyExponentTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -71,7 +71,7 @@
     
     PyTypeObject PyOCIO_ExponentTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.ExponentTransform",                   //tp_name
+        OCIO_PYTHON_NAMESPACE(ExponentTransform),   //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyFileTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyFileTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyFileTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyFileTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -92,7 +92,7 @@
     
     PyTypeObject PyOCIO_FileTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.FileTransform",                       //tp_name
+        OCIO_PYTHON_NAMESPACE(FileTransform),       //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyGpuShaderDesc.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyGpuShaderDesc.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyGpuShaderDesc.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyGpuShaderDesc.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -91,7 +91,7 @@
     
     PyTypeObject PyOCIO_GpuShaderDescType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.GpuShaderDesc",                       //tp_name
+        OCIO_PYTHON_NAMESPACE(GpuShaderDesc),       //tp_name
         sizeof(PyOCIO_GpuShaderDesc),               //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_GpuShaderDesc_delete,    //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyGroupTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyGroupTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyGroupTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyGroupTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -87,7 +87,7 @@
     
     PyTypeObject PyOCIO_GroupTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.GroupTransform",                    //tp_name
+        OCIO_PYTHON_NAMESPACE(GroupTransform),      //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyLogTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyLogTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyLogTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyLogTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -71,7 +71,7 @@
     
     PyTypeObject PyOCIO_LogTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.LogTransform",                        //tp_name
+        OCIO_PYTHON_NAMESPACE(LogTransform),        //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyLook.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyLook.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyLook.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyLook.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -28,6 +28,7 @@
 
 #include <Python.h>
 #include <OpenColorIO/OpenColorIO.h>
+#include <sstream>
 
 #include "PyUtil.h"
 #include "PyDoc.h"
@@ -77,12 +78,15 @@
         
         int PyOCIO_Look_init(PyOCIO_Look * self, PyObject * args, PyObject * kwds);
         void PyOCIO_Look_delete(PyOCIO_Look * self, PyObject * args);
+        PyObject * PyOCIO_Look_str(PyObject * self);
         PyObject * PyOCIO_Look_isEditable(PyObject * self);
         PyObject * PyOCIO_Look_createEditableCopy(PyObject * self);
         PyObject * PyOCIO_Look_getName(PyObject * self);
         PyObject * PyOCIO_Look_setName(PyObject * self, PyObject * args);
         PyObject * PyOCIO_Look_getProcessSpace(PyObject * self);
         PyObject * PyOCIO_Look_setProcessSpace(PyObject * self, PyObject * args);
+        PyObject * PyOCIO_Look_getDescription(PyObject * self);
+        PyObject * PyOCIO_Look_setDescription(PyObject * self, PyObject * args);
         PyObject * PyOCIO_Look_getTransform(PyObject * self);
         PyObject * PyOCIO_Look_setTransform(PyObject * self, PyObject * args);
         PyObject * PyOCIO_Look_getInverseTransform(PyObject * self);
@@ -104,6 +108,10 @@
             (PyCFunction) PyOCIO_Look_getProcessSpace, METH_NOARGS, LOOK_GETPROCESSSPACE__DOC__ },
             { "setProcessSpace",
             PyOCIO_Look_setProcessSpace, METH_VARARGS, LOOK_SETPROCESSSPACE__DOC__ },
+            { "getDescription",
+            (PyCFunction) PyOCIO_Look_getDescription, METH_NOARGS, LOOK_GETDESCRIPTION__DOC__ },
+            { "setDescription",
+            PyOCIO_Look_setDescription, METH_VARARGS, LOOK_SETDESCRIPTION__DOC__ },
             { "getTransform",
             (PyCFunction) PyOCIO_Look_getTransform, METH_NOARGS, LOOK_GETTRANSFORM__DOC__ },
             { "setTransform",
@@ -122,7 +130,7 @@
     
     PyTypeObject PyOCIO_LookType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Look",                                //tp_name
+        OCIO_PYTHON_NAMESPACE(Look),                //tp_name
         sizeof(PyOCIO_Look),                        //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Look_delete,             //tp_dealloc
@@ -136,7 +144,7 @@
         0,                                          //tp_as_mapping
         0,                                          //tp_hash 
         0,                                          //tp_call
-        0,                                          //tp_str
+        PyOCIO_Look_str,                            //tp_str
         0,                                          //tp_getattro
         0,                                          //tp_setattro
         0,                                          //tp_as_buffer
@@ -176,11 +184,12 @@
             /*int ret =*/ BuildPyObject<PyOCIO_Look, ConstLookRcPtr, LookRcPtr>(self, ptr);
             char* name = NULL;
             char* processSpace = NULL;
+            char* description = NULL;
             PyObject* pytransform = NULL;
-            const char* kwlist[] = { "name", "processSpace", "transform", NULL };
-            if(!PyArg_ParseTupleAndKeywords(args, kwds, "|ssO",
+            const char* kwlist[] = { "name", "processSpace", "transform", "description", NULL };
+            if(!PyArg_ParseTupleAndKeywords(args, kwds, "|ssOs",
                 const_cast<char **>(kwlist),
-                &name, &processSpace, &pytransform)) return -1;
+                &name, &processSpace, &pytransform, &description)) return -1;
             if(name) ptr->setName(name);
             if(processSpace) ptr->setProcessSpace(processSpace);
             if(pytransform)
@@ -188,6 +197,7 @@
                 ConstTransformRcPtr transform = GetConstTransform(pytransform, true);
                 ptr->setTransform(transform);
             }
+            if(description) ptr->setDescription(description);
             return 0;
             OCIO_PYTRY_EXIT(-1)
         }
@@ -197,6 +207,16 @@
             DeletePyObject<PyOCIO_Look>(self);
         }
         
+        PyObject * PyOCIO_Look_str(PyObject * self)
+        {
+            OCIO_PYTRY_ENTER()
+            ConstLookRcPtr look = GetConstLook(self, true);
+            std::ostringstream out;
+            out << *look;
+            return PyString_FromString(out.str().c_str());
+            OCIO_PYTRY_EXIT(NULL)
+        }
+
         PyObject * PyOCIO_Look_isEditable(PyObject * self)
         {
             return PyBool_FromLong(IsPyLookEditable(self));
@@ -250,6 +270,25 @@
             Py_RETURN_NONE;
             OCIO_PYTRY_EXIT(NULL)
         }
+        
+        PyObject * PyOCIO_Look_getDescription(PyObject * self)
+        {
+            OCIO_PYTRY_ENTER()
+            ConstLookRcPtr look = GetConstLook(self, true);
+            return PyString_FromString(look->getDescription());
+            OCIO_PYTRY_EXIT(NULL)
+        }
+        
+        PyObject * PyOCIO_Look_setDescription(PyObject * self, PyObject * args)
+        {
+            OCIO_PYTRY_ENTER()
+            char* description = 0;
+            if (!PyArg_ParseTuple(args, "s:setDescription", &description)) return NULL;
+            LookRcPtr look = GetEditableLook(self);
+            look->setDescription(description);
+            Py_RETURN_NONE;
+            OCIO_PYTRY_EXIT(NULL)
+        }
         
         PyObject * PyOCIO_Look_getTransform(PyObject * self)
         {
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyLookTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyLookTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyLookTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyLookTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -81,7 +81,7 @@
     
     PyTypeObject PyOCIO_LookTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.LookTransform",                       //tp_name
+        OCIO_PYTHON_NAMESPACE(LookTransform),       //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyMain.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyMain.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyMain.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyMain.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -150,24 +150,26 @@
 }
 OCIO_NAMESPACE_EXIT
 
-extern "C"
 MOD_INIT(PyOpenColorIO)
 {
     PyObject * m;
-    MOD_DEF(m, "PyOpenColorIO", OCIO::OPENCOLORIO__DOC__, PyOCIO_methods);
-    
+    MOD_DEF(m, OCIO_STRINGIFY(PYOCIO_NAME), OCIO::OPENCOLORIO__DOC__, PyOCIO_methods);
+
+    if (m == NULL)
+        return MOD_ERROR_VAL;
+
     PyModule_AddStringConstant(m, "version", OCIO::GetVersion());
     PyModule_AddIntConstant(m, "hexversion", OCIO::GetVersionHex());
     
     // Create Exceptions, and add to the module
-    char Exception[] = "PyOpenColorIO.Exception";
-    char ExceptionMissingFile[] = "PyOpenColorIO.ExceptionMissingFile";
+    char Exception[] = OCIO_PYTHON_NAMESPACE(Exception);
+    char ExceptionMissingFile[] = OCIO_PYTHON_NAMESPACE(ExceptionMissingFile);
     
 #if PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 7
     OCIO::SetExceptionPyType(PyErr_NewExceptionWithDoc(Exception,
-        (char*)OCIO::EXCEPTION__DOC__, OCIO::GetExceptionPyType(), NULL));
+        const_cast<char*>(OCIO::EXCEPTION__DOC__), OCIO::GetExceptionPyType(), NULL));
     OCIO::SetExceptionMissingFilePyType(PyErr_NewExceptionWithDoc(ExceptionMissingFile,
-        (char*)OCIO::EXCEPTIONMISSINGFILE__DOC__, OCIO::GetExceptionMissingFilePyType(), NULL));
+        const_cast<char*>(OCIO::EXCEPTIONMISSINGFILE__DOC__), OCIO::GetExceptionMissingFilePyType(), NULL));
 #else
     OCIO::SetExceptionPyType(PyErr_NewException(Exception,
         OCIO::GetExceptionPyType(), NULL));
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyMatrixTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyMatrixTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyMatrixTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyMatrixTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -100,7 +100,7 @@
     
     PyTypeObject PyOCIO_MatrixTransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)
-        "OCIO.MatrixTransform",                     //tp_name
+        OCIO_PYTHON_NAMESPACE(MatrixTransform),     //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         0,                                          //tp_dealloc
@@ -147,10 +147,44 @@
         ///////////////////////////////////////////////////////////////////////
         ///
         
-        int PyOCIO_MatrixTransform_init(PyOCIO_Transform * self, PyObject * /*args*/, PyObject * /*kwds*/)
+        int PyOCIO_MatrixTransform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds)
         {
             OCIO_PYTRY_ENTER()
-            return BuildPyTransformObject<MatrixTransformRcPtr>(self, MatrixTransform::Create());
+            MatrixTransformRcPtr ptr = MatrixTransform::Create();
+            int ret = BuildPyTransformObject<MatrixTransformRcPtr>(self, ptr);
+            PyObject* pymatrix = 0;
+            PyObject* pyoffset = 0;
+            char* direction = NULL;
+            static const char *kwlist[] = { "matrix", "offset", "direction", NULL };
+            if(!PyArg_ParseTupleAndKeywords(args, kwds, "|OOs",
+                const_cast<char **>(kwlist),
+                &pymatrix, &pyoffset, &direction)) return -1;
+            if (pymatrix)
+            {
+                std::vector<float> matrix;
+                if(!FillFloatVectorFromPySequence(pymatrix, matrix) ||
+                    (matrix.size() != 16))
+                {
+                    PyErr_SetString(PyExc_TypeError,
+                        "matrix must be a float array, size 16");
+                    return 0;
+                }
+                ptr->setMatrix(&matrix[0]);
+            }
+            if (pyoffset)
+            {
+                std::vector<float> offset;
+                if(!FillFloatVectorFromPySequence(pyoffset, offset) ||
+                    (offset.size() != 4))
+                {
+                    PyErr_SetString(PyExc_TypeError,
+                        "offset must be a float array, size 4");
+                    return 0;
+                }
+                ptr->setOffset(&offset[0]);
+            }
+            if(direction) ptr->setDirection(TransformDirectionFromString(direction));
+            return ret;
             OCIO_PYTRY_EXIT(-1)
         }
         
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyProcessor.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyProcessor.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyProcessor.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyProcessor.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -110,7 +110,7 @@
     
     PyTypeObject PyOCIO_ProcessorType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Processor",                           //tp_name
+        OCIO_PYTHON_NAMESPACE(Processor),           //tp_name
         sizeof(PyOCIO_Processor),                   //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_Processor_delete,        //tp_dealloc
@@ -273,7 +273,7 @@
                 PyErr_SetString(PyExc_TypeError, os.str().c_str());
                 return 0;
             }
-            PackedImageDesc img(&data[0], data.size()/3, 1, 3);
+            PackedImageDesc img(&data[0], long(data.size()/3), 1, 3);
             processor->apply(img);
             return CreatePyListFromFloatVector(data);
             OCIO_PYTRY_EXIT(NULL)
@@ -301,7 +301,7 @@
                 PyErr_SetString(PyExc_TypeError, os.str().c_str());
                 return 0;
             }
-            PackedImageDesc img(&data[0], data.size()/4, 1, 4);
+            PackedImageDesc img(&data[0], long(data.size()/4), 1, 4);
             processor->apply(img);
             return CreatePyListFromFloatVector(data);
             OCIO_PYTRY_EXIT(NULL)
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyProcessorMetadata.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyProcessorMetadata.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyProcessorMetadata.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyProcessorMetadata.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -85,7 +85,7 @@
     
     PyTypeObject PyOCIO_ProcessorMetadataType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.ProcessorMetadata",                   //tp_name
+        OCIO_PYTHON_NAMESPACE(ProcessorMetadata),   //tp_name
         sizeof(PyOCIO_ProcessorMetadata),           //tp_basicsize
         0,                                          //tp_itemsize
         (destructor)PyOCIO_ProcessorMetadata_delete,//tp_dealloc
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyTransform.cpp opencolorio-1.1.0~dfsg0/src/pyglue/PyTransform.cpp
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyTransform.cpp	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyTransform.cpp	2018-01-05 01:38:27.000000000 +0000
@@ -184,6 +184,7 @@
         
         int PyOCIO_Transform_init(PyOCIO_Transform * self, PyObject * args, PyObject * kwds);
         void PyOCIO_Transform_delete(PyOCIO_Transform * self, PyObject * args);
+        PyObject * PyOCIO_Transform_str(PyObject * self);
         PyObject * PyOCIO_Transform_isEditable(PyObject * self);
         PyObject * PyOCIO_Transform_createEditableCopy(PyObject * self);
         PyObject * PyOCIO_Transform_getDirection(PyObject * self);
@@ -211,7 +212,7 @@
     
     PyTypeObject PyOCIO_TransformType = {
         PyVarObject_HEAD_INIT(NULL, 0)              //ob_size
-        "OCIO.Transform",                           //tp_name
+        OCIO_PYTHON_NAMESPACE(Transform),           //tp_name
         sizeof(PyOCIO_Transform),                   //tp_basicsize
         0,                                          //tp_itemsize
         (destructor) PyOCIO_Transform_delete,       //tp_dealloc
@@ -225,7 +226,7 @@
         0,                                          //tp_as_mapping
         0,                                          //tp_hash 
         0,                                          //tp_call
-        0,                                          //tp_str
+        PyOCIO_Transform_str,                       //tp_str
         0,                                          //tp_getattro
         0,                                          //tp_setattro
         0,                                          //tp_as_buffer
@@ -273,6 +274,16 @@
             DeletePyObject<PyOCIO_Transform>(self);
         }
         
+        PyObject * PyOCIO_Transform_str(PyObject * self)
+        {
+            OCIO_PYTRY_ENTER()
+            ConstTransformRcPtr transform = GetConstTransform(self, true);
+            std::ostringstream out;
+            out << *transform;
+            return PyString_FromString(out.str().c_str());
+            OCIO_PYTRY_EXIT(NULL)
+        }
+
         PyObject * PyOCIO_Transform_isEditable(PyObject * self)
         {
             return PyBool_FromLong(IsPyTransformEditable(self));
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/PyUtil.h opencolorio-1.1.0~dfsg0/src/pyglue/PyUtil.h
--- opencolorio-1.0.9~dfsg0/src/pyglue/PyUtil.h	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/PyUtil.h	2018-01-05 01:38:27.000000000 +0000
@@ -37,6 +37,9 @@
 
 #define OCIO_PYTRY_ENTER() try {
 #define OCIO_PYTRY_EXIT(ret) } catch(...) { OCIO_NAMESPACE::Python_Handle_Exception(); return ret; }
+#define OCIO_STRINGIFY(str) OCIO_STRINGIFY_IMPL(str)
+#define OCIO_STRINGIFY_IMPL(str) #str
+#define OCIO_PYTHON_NAMESPACE(obj) OCIO_STRINGIFY(PYOCIO_NAME) "." #obj
 
 // Some utilities macros for python 2.5 to 3.3 compatibility
 #if PY_MAJOR_VERSION >= 3
@@ -50,10 +53,16 @@
 #define PyNumber_Int        PyNumber_Long
 #endif
 
+#ifdef WIN32
+    #define EXPORT_SYMBOL _declspec(dllexport)
+#else
+    #define EXPORT_SYMBOL
+#endif
+
 #if PY_MAJOR_VERSION >= 3
   #define MOD_ERROR_VAL NULL
   #define MOD_SUCCESS_VAL(val) val
-  #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+  #define MOD_INIT(name) PyMODINIT_FUNC EXPORT_SYMBOL PyInit_##name(void)
   #define MOD_DEF(ob, name, doc, methods) \
           static struct PyModuleDef moduledef = { \
             PyModuleDef_HEAD_INIT, name, doc, -1, methods, NULL, NULL, NULL, NULL}; \
@@ -61,7 +70,7 @@
 #else
   #define MOD_ERROR_VAL
   #define MOD_SUCCESS_VAL(val)
-  #define MOD_INIT(name) PyMODINIT_FUNC init##name(void)
+  #define MOD_INIT(name) PyMODINIT_FUNC EXPORT_SYMBOL init##name(void)
   #define MOD_DEF(ob, name, doc, methods) \
           ob = Py_InitModule3(name, methods, doc);
 #endif
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/tests/Baker.py opencolorio-1.1.0~dfsg0/src/pyglue/tests/Baker.py
--- opencolorio-1.0.9~dfsg0/src/pyglue/tests/Baker.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/tests/Baker.py	2018-01-05 01:38:27.000000000 +0000
@@ -26,6 +26,7 @@
     
     EXPECTED_LUT = """CSPLUTV100
 3D
+
 BEGIN METADATA
 this is some metadata!
 END METADATA
@@ -79,6 +80,6 @@
         self.assertEqual(2, bakee.getCubeSize())
         output = bakee.bake()
         self.assertEqual(self.EXPECTED_LUT, output)
-        self.assertEqual(5, bakee.getNumFormats())
+        self.assertEqual(6, bakee.getNumFormats())
         self.assertEqual("cinespace", bakee.getFormatNameByIndex(2))
         self.assertEqual("3dl", bakee.getFormatExtensionByIndex(1))
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/tests/ConfigTest.py opencolorio-1.1.0~dfsg0/src/pyglue/tests/ConfigTest.py
--- opencolorio-1.0.9~dfsg0/src/pyglue/tests/ConfigTest.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/tests/ConfigTest.py	2018-01-05 01:38:27.000000000 +0000
@@ -3,6 +3,9 @@
 sys.path.append(os.path.join(sys.argv[1], "src", "pyglue"))
 import PyOpenColorIO as OCIO
 
+import platform
+osname = platform.system()
+
 class ConfigTest(unittest.TestCase):
 
     SIMPLE_PROFILE = """ocio_profile_version: 1
@@ -66,7 +69,15 @@
         - !<CDLTransform> {slope: [0.9, 1, 1], offset: [0.1, 0.3, 0.4], power: [1.1, 1.1, 1.1], sat: 0.9}
 """
     
-    GLSLResult = """
+    def setUp(self):
+
+        osx_hack = ''
+        if osname=="Darwin":
+            osx_hack = """
+// OSX segfault work-around: Force a no-op sampling of the 3d lut.
+texture3D(lut3d, 0.96875 * out_pixel.rgb + 0.015625).rgb;"""
+
+        self.GLSLResult = """
 // Generated by OpenColorIO
 
 vec4 pytestocio(in vec4 inPixel, 
@@ -77,9 +88,9 @@
 out_pixel = pow(max(out_pixel, vec4(0, 0, 0, 0)), vec4(0.909091, 0.909091, 0.909091, 1));
 out_pixel = out_pixel * mat4(1.11111, -2, -3, -4, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1);
 out_pixel = vec4(4.68889, -2.3, -0.4, -0) + out_pixel;
-out_pixel = pow(max(out_pixel, vec4(0, 0, 0, 0)), vec4(0.454545, 0.454545, 0.454545, 1));
-// OSX segfault work-around: Force a no-op sampling of the 3d lut.
-texture3D(lut3d, 0.96875 * out_pixel.rgb + 0.015625).rgb;
+out_pixel = pow(max(out_pixel, vec4(0, 0, 0, 0)), vec4(0.454545, 0.454545, 0.454545, 1));""" \
+ + osx_hack + \
+"""
 return out_pixel;
 }
 
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/tests/LookTest.py opencolorio-1.1.0~dfsg0/src/pyglue/tests/LookTest.py
--- opencolorio-1.0.9~dfsg0/src/pyglue/tests/LookTest.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/tests/LookTest.py	2018-01-05 01:38:27.000000000 +0000
@@ -11,6 +11,8 @@
         self.assertEqual("coollook", lk.getName())
         lk.setProcessSpace("somespace")
         self.assertEqual("somespace", lk.getProcessSpace())
+        lk.setDescription("this is a test")
+        self.assertEqual("this is a test", lk.getDescription())
         et = OCIO.ExponentTransform()
         et.setValue([0.1, 0.2, 0.3, 0.4])
         lk.setTransform(et)
diff -Nru opencolorio-1.0.9~dfsg0/src/pyglue/tests/TransformsTest.py opencolorio-1.1.0~dfsg0/src/pyglue/tests/TransformsTest.py
--- opencolorio-1.0.9~dfsg0/src/pyglue/tests/TransformsTest.py	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/src/pyglue/tests/TransformsTest.py	2018-01-05 01:38:27.000000000 +0000
@@ -4,9 +4,9 @@
 import PyOpenColorIO as OCIO
 
 class TransformsTest(unittest.TestCase):
-    
+
     def test_interface(self):
-        
+
         ### AllocationTransform ###
         at = OCIO.AllocationTransform()
         self.assertEqual(OCIO.Constants.ALLOCATION_UNIFORM, at.getAllocation())
@@ -17,12 +17,32 @@
         self.assertEqual(3, at.getNumVars())
         newvars = at.getVars()
         self.assertAlmostEqual(0.2, newvars[1], delta=1e-8)
-        
+
+        at2 = OCIO.AllocationTransform(OCIO.Constants.ALLOCATION_LG2,
+                                       [0.1, 0.2, 0.3],
+                                       OCIO.Constants.TRANSFORM_DIR_INVERSE)
+        self.assertEqual(OCIO.Constants.ALLOCATION_LG2, at2.getAllocation())
+        self.assertEqual(3, at2.getNumVars())
+        newvars2 = at2.getVars()
+        for i in range(0, 3):
+            self.assertAlmostEqual(float(i+1)/10.0, newvars2[i], delta=1e-7)
+        self.assertEqual(OCIO.Constants.TRANSFORM_DIR_INVERSE, at2.getDirection())
+
+        at3 = OCIO.AllocationTransform(allocation=OCIO.Constants.ALLOCATION_LG2,
+                                       vars=[0.1, 0.2, 0.3],
+                                       direction=OCIO.Constants.TRANSFORM_DIR_INVERSE)
+        self.assertEqual(OCIO.Constants.ALLOCATION_LG2, at3.getAllocation())
+        self.assertEqual(3, at3.getNumVars())
+        newvars3 = at3.getVars()
+        for i in range(0, 3):
+            self.assertAlmostEqual(float(i+1)/10.0, newvars3[i], delta=1e-7)
+        self.assertEqual(OCIO.Constants.TRANSFORM_DIR_INVERSE, at3.getDirection())
+
         ### Base Transform method tests ###
         self.assertEqual(OCIO.Constants.TRANSFORM_DIR_FORWARD, at.getDirection())
         at.setDirection(OCIO.Constants.TRANSFORM_DIR_UNKNOWN)
         self.assertEqual(OCIO.Constants.TRANSFORM_DIR_UNKNOWN, at.getDirection())
-        
+
         ### CDLTransform ###
         cdl = OCIO.CDLTransform()
         CC = "<ColorCorrection id=\"foo\">"
@@ -76,14 +96,58 @@
         self.assertEqual("foobar123", cdl.getID())
         cdl.setDescription("bar")
         self.assertEqual("bar", cdl.getDescription())
-        
+
+        cdl2 = OCIO.CDLTransform([0.1, 0.2, 0.3],
+                                 [1.1, 1.2, 1.3],
+                                 [2.1, 2.2, 2.3],
+                                 0.5,
+                                 OCIO.Constants.TRANSFORM_DIR_INVERSE,
+                                 'foobar123', 'bar')
+        slope2 = cdl2.getSlope()
+        offset2 = cdl2.getOffset()
+        power2 = cdl2.getPower()
+        luma2 = cdl2.getSatLumaCoefs()
+        for i in range(0, 3):
+            self.assertAlmostEqual(float(i+1)/10.0, slope2[i], delta=1e-7)
+            self.assertAlmostEqual(float(i+1)/10.0+1, offset2[i], delta=1e-7)
+            self.assertAlmostEqual(float(i+1)/10.0+2, power2[i], delta=1e-7)
+        self.assertAlmostEqual(0.5, cdl2.getSat(), delta=1e-8)
+        self.assertAlmostEqual(0.2126, luma2[0], delta=1e-8)
+        self.assertAlmostEqual(0.7152, luma2[1], delta=1e-8)
+        self.assertAlmostEqual(0.0722, luma2[2], delta=1e-8)
+        self.assertEqual(OCIO.Constants.TRANSFORM_DIR_INVERSE, cdl2.getDirection())
+        self.assertEqual('foobar123', cdl2.getID())
+        self.assertEqual('bar', cdl2.getDescription())
+
+        cdl3 = OCIO.CDLTransform(slope=[0.1, 0.2, 0.3],
+                                 offset=[1.1, 1.2, 1.3],
+                                 power=[2.1, 2.2, 2.3],
+                                 sat=0.5,
+                                 direction=OCIO.Constants.TRANSFORM_DIR_INVERSE,
+                                 id='foobar123', description='bar')
+        slope3 = cdl2.getSlope()
+        offset3 = cdl2.getOffset()
+        power3 = cdl2.getPower()
+        luma3 = cdl2.getSatLumaCoefs()
+        for i in range(0, 3):
+            self.assertAlmostEqual(float(i+1)/10.0, slope3[i], delta=1e-7)
+            self.assertAlmostEqual(float(i+1)/10.0+1, offset3[i], delta=1e-7)
+            self.assertAlmostEqual(float(i+1)/10.0+2, power3[i], delta=1e-7)
+        self.assertAlmostEqual(0.5, cdl3.getSat(), delta=1e-8)
+        self.assertAlmostEqual(0.2126, luma3[0], delta=1e-8)
+        self.assertAlmostEqual(0.7152, luma3[1], delta=1e-8)
+        self.assertAlmostEqual(0.0722, luma3[2], delta=1e-8)
+        self.assertEqual(OCIO.Constants.TRANSFORM_DIR_INVERSE, cdl3.getDirection())
+        self.assertEqual('foobar123', cdl3.getID())
+        self.assertEqual('bar', cdl3.getDescription())
+
         ### ColorSpaceTransform ###
         ct = OCIO.ColorSpaceTransform()
         ct.setSrc("foo")
         self.assertEqual("foo", ct.getSrc())
         ct.setDst("bar")
         self.assertEqual("bar", ct.getDst())
-        
+
         ### DisplayTransform ###
         dt = OCIO.DisplayTransform()
         dt.setInputColorSpaceName("lin18")
@@ -106,13 +170,28 @@
         self.assertEqual("darkgrade", dt.getLooksOverride())
         dt.setLooksOverrideEnabled(True)
         self.assertEqual(True, dt.getLooksOverrideEnabled())
-        
+
+        dt2 = OCIO.DisplayTransform("lin18", "sRGB", "foobar",
+                                    OCIO.Constants.TRANSFORM_DIR_INVERSE)
+        self.assertEqual("lin18", dt2.getInputColorSpaceName())
+        self.assertEqual("sRGB", dt2.getDisplay())
+        self.assertEqual("foobar", dt2.getView())
+        self.assertEqual(OCIO.Constants.TRANSFORM_DIR_INVERSE, dt2.getDirection())
+
+        dt3 = OCIO.DisplayTransform(inputColorSpaceName="lin18",
+                                    display="sRGB", view="foobar",
+                                    direction=OCIO.Constants.TRANSFORM_DIR_INVERSE)
+        self.assertEqual("lin18", dt3.getInputColorSpaceName())
+        self.assertEqual("sRGB", dt3.getDisplay())
+        self.assertEqual("foobar", dt3.getView())
+        self.assertEqual(OCIO.Constants.TRANSFORM_DIR_INVERSE, dt3.getDirection())
+
         ### ExponentTransform ###
         et = OCIO.ExponentTransform()
         et.setValue([0.1, 0.2, 0.3, 0.4])
         evals = et.getValue()
         self.assertAlmostEqual(0.3, evals[2], delta=1e-7)
-        
+
         ### FileTransform ###
         ft = OCIO.FileTransform()
         ft.setSrc("foo")
@@ -121,10 +200,10 @@
         self.assertEqual("foobar", ft.getCCCId())
         ft.setInterpolation(OCIO.Constants.INTERP_NEAREST)
         self.assertEqual(OCIO.Constants.INTERP_NEAREST, ft.getInterpolation())
-        self.assertEqual(16, ft.getNumFormats())
+        self.assertEqual(17, ft.getNumFormats())
         self.assertEqual("flame", ft.getFormatNameByIndex(0))
         self.assertEqual("3dl", ft.getFormatExtensionByIndex(0))
-        
+
         ### GroupTransform ###
         gt = OCIO.GroupTransform()
         gt.push_back(et)
@@ -135,12 +214,12 @@
         self.assertEqual(OCIO.Constants.TRANSFORM_DIR_FORWARD, foo.getDirection())
         gt.clear()
         self.assertEqual(0, gt.size())
-        
+
         ### LogTransform ###
         lt = OCIO.LogTransform()
         lt.setBase(10.0)
         self.assertEqual(10.0, lt.getBase())
-        
+
         ### LookTransform ###
         lkt = OCIO.LookTransform()
         lkt.setSrc("foo")
@@ -149,7 +228,7 @@
         self.assertEqual("bar", lkt.getDst())
         lkt.setLooks("bar;foo")
         self.assertEqual("bar;foo", lkt.getLooks())
-        
+
         ### MatrixTransform ###
         mt = OCIO.MatrixTransform()
         mmt = mt.createEditableCopy()
@@ -185,7 +264,33 @@
         self.assertAlmostEqual(0.9, m44_2[0], delta=1e-7)
         m44_2, offset_2 = mt.View([1, 1, 1, 0], [0.2126, 0.7152, 0.0722])
         self.assertAlmostEqual(0.0722, m44_2[2], delta=1e-7)
-        
+
+        mt4 = OCIO.MatrixTransform([0.1, 0.2, 0.3, 0.4,
+                                    0.5, 0.6, 0.7, 0.8,
+                                    0.9, 1.0, 1.1, 1.2,
+                                    1.3, 1.4, 1.5, 1.6],
+                                   [0.1, 0.2, 0.3, 0.4],
+                                   OCIO.Constants.TRANSFORM_DIR_INVERSE)
+        m44_4, offset_4 = mt4.getValue()
+        for i in range(0, 16):
+            self.assertAlmostEqual(float(i+1)/10.0, m44_4[i], delta=1e-7)
+        for i in range(0, 4):
+            self.assertAlmostEqual(float(i+1)/10.0, offset_4[i], delta=1e-7)
+        self.assertEqual(mt4.getDirection(), OCIO.Constants.TRANSFORM_DIR_INVERSE)
+
+        mt5 = OCIO.MatrixTransform(matrix=[0.1, 0.2, 0.3, 0.4,
+                                           0.5, 0.6, 0.7, 0.8,
+                                           0.9, 1.0, 1.1, 1.2,
+                                           1.3, 1.4, 1.5, 1.6],
+                                   offset=[0.1, 0.2, 0.3, 0.4],
+                                   direction=OCIO.Constants.TRANSFORM_DIR_INVERSE)
+        m44_5, offset_5 = mt5.getValue()
+        for i in range(0, 16):
+            self.assertAlmostEqual(float(i+1)/10.0, m44_5[i], delta=1e-7)
+        for i in range(0, 4):
+            self.assertAlmostEqual(float(i+1)/10.0, offset_5[i], delta=1e-7)
+        self.assertEqual(mt5.getDirection(), OCIO.Constants.TRANSFORM_DIR_INVERSE)
+
         ### TruelightTransform ###
         """
         tt = OCIO.TruelightTransform()
@@ -210,4 +315,3 @@
         tt.setCubeInput("log")
         self.assertEqual("log", tt.getCubeInput())
         """
-
diff -Nru opencolorio-1.0.9~dfsg0/.travis.yml opencolorio-1.1.0~dfsg0/.travis.yml
--- opencolorio-1.0.9~dfsg0/.travis.yml	2013-10-08 22:59:34.000000000 +0000
+++ opencolorio-1.1.0~dfsg0/.travis.yml	2018-01-05 01:38:27.000000000 +0000
@@ -1,15 +1,32 @@
 # travis-ci.org build file
+# https://docs.travis-ci.com/user/languages/cpp
 
-# As CMake is not officially supported we use erlang VMs
-language: erlang
+matrix:
+  include:
+    - os: linux
+      language: cpp
+      compiler: clang
+    - os: linux
+      language: cpp
+      compiler: gcc
+    - os: osx
+      language: cpp
+      compiler: clang
+    - os: osx
+      language: cpp
+      compiler: gcc
+    - os: osx
+      language: cpp
+      compiler: clang
+      osx_image: xcode9.1
 
-# Settings to try
 env:
-  - OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes"
+  - OPTIONS="-DCMAKE_BUILD_TYPE=Release -DOCIO_BUILD_TESTS=yes -DOCIO_BUILD_DOCS=yes"
 
-# Make sure CMake is installed
+# Install missing packages
 install:
- - sudo apt-get install cmake
+  - if [[ $TRAVIS_OS_NAME = linux ]]; then sudo apt-get update -qq; fi
+  - if [[ $TRAVIS_OS_NAME = linux ]]; then sudo apt-get install -qq texlive-full; fi
 
 # Run the Build script
 script:
@@ -17,7 +34,13 @@
  - cd _build
  - cmake .. -DCMAKE_INSTALL_PREFIX=../_install $OPTIONS
  - cmake --build . --target install
-
-# Run Tests
-after_script:
  - ctest --output-on-failure .
+ - if [[ $TRAVIS_OS_NAME = linux ]]; then cmake --build . --target pdf; fi
+
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $GITHUB_TOKEN
+  on:
+    tags: true
+  local_dir: ./docs/build-html