merge branch 'dev' into ctlrender_help

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/mxcl/homebrew/go)"
-        $ 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,29 +118,81 @@ 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/Homebrew/homebrew/go/install)"
+            
+    * 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
 
-        $ ruby -e "$(curl -fsSL https://raw.github.com/mxcl/homebrew/go)"
-        $ brew install openexr
+* OS X
+
+    * Install homebrew if not already installed
+
+            $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
+            
+    * Install TIFF
+
+            $ brew install libtiff                        
 
 __ACES Container__
 
 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, libtiff) 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 ##
 
@@ -180,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.
+UNDISCLOSED.

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);
 }

unittest/ctlrender/CMakeLists.txt

@@ -3,7 +3,7 @@
 add_test(
     NAME ctlrender
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    COMMAND ./test.sh
+    COMMAND ./test.sh $<TARGET_FILE:ctlrender>
 )
 
 #add_dependencies(check ctlrender)

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