From 729c157a8916bfc01832c4ee2b184d933329f74f Mon Sep 17 00:00:00 2001 From: Ben Hagen Date: Tue, 27 May 2014 00:55:44 +0200 Subject: [PATCH 1/6] Use TARGET_FILE in ctlrender unittest. Fixes #45. --- unittest/ctlrender/CMakeLists.txt | 2 +- unittest/ctlrender/test.sh | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/unittest/ctlrender/CMakeLists.txt b/unittest/ctlrender/CMakeLists.txt index bdd3d70d..5f02aad1 100644 --- a/unittest/ctlrender/CMakeLists.txt +++ b/unittest/ctlrender/CMakeLists.txt @@ -3,7 +3,7 @@ add_test( NAME ctlrender WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ./test.sh + COMMAND ./test.sh $ ) #add_dependencies(check ctlrender) diff --git a/unittest/ctlrender/test.sh b/unittest/ctlrender/test.sh index 446e01e0..b125b815 100755 --- a/unittest/ctlrender/test.sh +++ b/unittest/ctlrender/test.sh @@ -1,4 +1,5 @@ #! /bin/bash +CTLRENDER=$1 mkdir output @@ -7,10 +8,10 @@ for J in tiff8 tiff16 tiff32 dpx8 dpx10 dpx12 dpx16; do name=`echo $I | sed -e 's/\..*//'` ext=`echo $J | sed -e 's/[0-9]//g'` echo ${I} '->' ${J} - ctlrender -ctl unity.ctl -format ${J} -force ${I} output/${name}_${J}.${ext} + $CTLRENDER -ctl unity.ctl -format ${J} -force ${I} output/${name}_${J}.${ext} done echo ${J} unity test - ctlrender -ctl unity.ctl -format ${J} -force bars_photoshop_32_be_planar.tif output/bars_tiff32_${J}.${ext} - ctlrender -ctl unity.ctl -format tiff32 -force output/bars_tiff32_${J}.${ext} output/bars_tiff32_${J}_tiff32.tiff + $CTLRENDER -ctl unity.ctl -format ${J} -force bars_photoshop_32_be_planar.tif output/bars_tiff32_${J}.${ext} + $CTLRENDER -ctl unity.ctl -format tiff32 -force output/bars_tiff32_${J}.${ext} output/bars_tiff32_${J}_tiff32.tiff done From 243b7fda6abeb7302c0ee2b1a7676cd130721ecc Mon Sep 17 00:00:00 2001 From: Alex Forsythe Date: Thu, 24 Apr 2014 11:58:15 -0700 Subject: [PATCH 2/6] Updates README with new brew install URL * closes #43 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f5d8eea2..e88e2df4 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ below. * OS X (Install homebrew if not already installed) - $ ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)" + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" $ brew install cmake __IlmBase__ From 8a2bbab2cecf9b19add5912d93bfcad0a5ad8cef Mon Sep 17 00:00:00 2001 From: Alex Forsythe Date: Tue, 27 May 2014 09:05:06 -0700 Subject: [PATCH 3/6] Updates README with homebrew installation instructions --- README.md | 72 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index e88e2df4..79d9d52b 100644 --- a/README.md +++ b/README.md @@ -66,10 +66,15 @@ below. $ yum install cmake -* OS X (Install homebrew if not already installed) +* OS X + + * Install homebrew if not already installed - $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" - $ brew install cmake + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" + + * Install cmake + + $ brew install cmake __IlmBase__ @@ -84,10 +89,15 @@ downloaded from http://www.openexr.com or use one of the commands below. $ yum install ilmbase-devel -* OS X (Install homebrew if not already installed) +* OS X - $ ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)" - $ brew install ilmBase + * Install homebrew if not already installed + + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" + + * Install ilmBase + + $ brew install ilmBase ### Suggested ### @@ -108,10 +118,15 @@ commands below. $ yum install OpenEXR-devel -* OS X (Install homebrew if not already installed) +* OS X + + * Install homebrew if not already installed - $ ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)" - $ brew install openexr + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" + + * Install OpenEXR + + $ brew install openexr __ACES Container__ @@ -119,18 +134,43 @@ ctlrender is able to write files compliant with SMPTE S2065-4. This functionality requires the aces_container library, the latest version of which can be downloaded from https://github.com/ampas/aces_container +* OS X + + * Install homebrew if not already installed + + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" + + * Install ACES Container + + $ brew install aces_container + ## Installation ## -from the root source directory: +* OS X + + * Install homebrew if not already installed + + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" + + * Install CTL + + Homebrew will install all dependancies (cmake, ilmbase, opener, aces_container) automatically by default. No need to install each manually. + + $ brew install ctl + + +* Redhat, Ubuntu + + from the root source directory: - $ mkdir build && cd build - $ cmake .. - $ make - $ sudo make install + $ mkdir build && cd build + $ cmake .. + $ make + $ sudo make install -to run the optional unit tests: + to run the optional unit tests: - $ sudo make check + $ sudo make check ## License ## From 32d0d59b875203f6d85d91ea481412f3866ed013 Mon Sep 17 00:00:00 2001 From: Alex Forsythe Date: Tue, 27 May 2014 14:16:26 -0700 Subject: [PATCH 4/6] updates README.md * updates README.md to document libTiff dependency * closes #48 --- README.md | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79d9d52b..091f9624 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,29 @@ commands below. * Install OpenEXR - $ brew install openexr + $ brew install openexr + +__TIFF__ + +If you want to use CTL together with the TIFF image file format, you should download libTiff. libTiff can be downloaded from http://www.remotesensing.org/libtiff/ or using one of the commands below. + +* Ubuntu + + $ sudo apt-get install libtiff4 + +* Redhat + + $ yum install libtiff4 + +* OS X + + * Install homebrew if not already installed + + $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" + + * Install OpenEXR + + $ brew install libtiff __ACES Container__ @@ -154,7 +176,7 @@ can be downloaded from https://github.com/ampas/aces_container * Install CTL - Homebrew will install all dependancies (cmake, ilmbase, opener, aces_container) automatically by default. No need to install each manually. + Homebrew will install all dependancies (cmake, ilmbase, opener, aces_container, libtiff) automatically by default. No need to install each manually. $ brew install ctl From f52585849559ea7d113a572a8d4e4ea8f1a3e7dd Mon Sep 17 00:00:00 2001 From: Alexander Forsythe Date: Tue, 27 May 2014 14:49:36 -0700 Subject: [PATCH 5/6] Updates README.md * Fixes copy/paste bomb --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 091f9624..767141f7 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,7 @@ If you want to use CTL together with the TIFF image file format, you should down $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)" - * Install OpenEXR + * Install TIFF $ brew install libtiff @@ -242,4 +242,4 @@ WITHOUT LIMITING THE GENERALITY OF THE FOREGOING, THE ACADEMY SPECIFICALLY DISCLAIMS ANY REPRESENTATIONS OR WARRANTIES WHATSOEVER RELATED TO PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS IN THE ACADEMY COLOR ENCODING SYSTEM, OR APPLICATIONS THEREOF, HELD BY PARTIES OTHER THAN A.M.P.A.S.,WHETHER DISCLOSED OR -UNDISCLOSED. \ No newline at end of file +UNDISCLOSED. From 57b48a273438159698a72d1e94a580b49337d234 Mon Sep 17 00:00:00 2001 From: mfe Date: Fri, 21 Feb 2014 13:46:11 +0100 Subject: [PATCH 6/6] Fix code source mode Even when filename and moduleName were empty, a findModule was done and throws an exception preventing moduleSource to be use instead. Signed-off-by: mfe --- lib/IlmCtl/CtlInterpreter.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/IlmCtl/CtlInterpreter.cpp b/lib/IlmCtl/CtlInterpreter.cpp index 93d251bd..f22058e7 100755 --- a/lib/IlmCtl/CtlInterpreter.cpp +++ b/lib/IlmCtl/CtlInterpreter.cpp @@ -249,7 +249,7 @@ Interpreter::findModule (const string& moduleName) } THROW (ArgExc, "Cannot find CTL module \"" << moduleName << "\"."); - return ""; + return ""; // return to prevent a warning with some compilers. } @@ -269,7 +269,7 @@ Interpreter::findModule (const string& moduleName) } THROW (ArgExc, "Cannot find CTL module \"" << moduleName << "\"."); - return ""; + return ""; // return to prevent a warning with some compilers. } void @@ -435,7 +435,12 @@ Interpreter::loadModuleRecursive (const string &moduleName, const string &fileNa return; } - string realFileName = fileName.empty() ? findModule (moduleName) : fileName; + string realFileName; + if(fileName.empty() && !moduleName.empty()) + realFileName = findModule (moduleName); + else + realFileName = fileName; + _loadModule(moduleName, realFileName, moduleSource); }