Merge branch 'master' into v1_v2_merge.

Preliminary approach leading up to v2 becoming the master branch Conflicts: .gitignore IlmBase/Half/halfFunction.h IlmBase/IexMath/IexMathFpu.cpp IlmBase/configure.ac IlmBase/vc/Makefile.am OpenEXR/IlmImfExamples/Makefile.am OpenEXR/OpenEXR.pc.in OpenEXR_Viewers/exrdisplay/Makefile.am PyIlmBase/PyImath/PyImath.cpp PyIlmBase/PyImath/PyImathBasicTypes.cpp PyIlmBase/PyImath/PyImathColor.h PyIlmBase/PyImath/imathmodule.cpp PyIlmBase/PyImathNumpy/Makefile.am README
AcademySoftwareFoundation · Jul 31, 2012 · 651bd4c · 651bd4c
2 parents d847d1e + ea25822
commit 651bd4c
Show file tree

Hide file tree

Showing 53 changed files with 661 additions and 803 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,12 +10,14 @@ ltmain.sh
 missing
 .deps
 *.o
+*.lo
 *.deps
 *.libs
-*.lo
+*.Plo
+*.Po
 *.la
-*.in
-Makefile
+*.so
+*.dylib
 .DS_Store
 *.project
 *.cproject
diff --git a/IlmBase/ChangeLog b/IlmBase/ChangeLog
@@ -13,6 +13,18 @@ Version 1.1.0.beta.1
 	  (Nicholas Yue)
 
 Version 1.0.3
+        * Added support for enabling/disabling large stack optimisations, used in
+          halfFunction.h.
+          (Piotr Stanczyk)
+	* Added ImathNoise.(h/cpp) files. Initializes Perlin noise to match the
+	  Renderman implmenetation.
+	  (Pixar Contribution)
+	* Fixed a number of missing includes to comply with stricter 
+	  enforcement by gnu compilers.
+	  (Piotr Stanczyk)
+	* Depracated compiler flag: -Wno-long-double since it is no longer
+	  supported under OS X.
+	  (Piotr Stanczyk)
 	* A minor API change to Imath::Frustum has been made:  the functions
 	  'near' and 'far' have been renamed to 'nearPlane' and 'farPlane' due
 	  to conflicts with certain windows headers.  The former alternate
@@ -30,9 +42,10 @@ Version 1.0.3
 	  directory, and several minor visual studio compile fixes have
 	  been applied.
 	  (Nick Rasmussen)
-        * Updated the so verison to 7
+	* Updated the so verison to 7.
+	  (Piotr Stanczyk)
+	* Depracated the MacCode_Warrior and Shake submodules.
 	  (Piotr Stanczyk)
-
 
 Version 1.0.2
 	* Added support for targetting builds on 64bit Windows and minimising 

diff --git a/IlmBase/Half/halfFunction.h b/IlmBase/Half/halfFunction.h
@@ -83,13 +83,15 @@
 #ifndef _HALF_FUNCTION_H_
 #define _HALF_FUNCTION_H_
 
-#ifndef IMF_HAVE_LARGE_STACK  
+#include "half.h"
+
+#include <IlmBaseConfig.h>
+#ifndef ILMBASE_HAVE_LARGE_STACK  
 #include <string.h>     // need this for memset
+#else 
 #endif
-#include <float.h>
 
-#include "half.h"
-#include "IlmBaseConfig.h"
+#include <float.h>
 
 
 template <class T>
@@ -110,20 +112,19 @@ class halfFunction
 		  T negInfValue  = 0,
 		  T nanValue     = 0);
 
-#ifndef IMF_HAVE_LARGE_STACK
+#ifndef ILMBASE_HAVE_LARGE_STACK
     ~halfFunction () { delete [] _lut; }    
 #endif
 
-
     //-----------
     // Evaluation
     //-----------
 
     T		operator () (half x) const;
 
   private:
-    
-#ifdef IMF_HAVE_LARGE_STACK
+
+#ifdef ILMBASE_HAVE_LARGE_STACK
     T		_lut[1 << 16];
 #else
     T *         _lut;
@@ -145,7 +146,7 @@ halfFunction<T>::halfFunction (Function f,
 			       T negInfValue,
 			       T nanValue)
 {
-#ifndef IMF_HAVE_LARGE_STACK
+#ifndef ILMBASE_HAVE_LARGE_STACK
     _lut = new T[1<<16];
     memset (_lut, 0 , (1<<16) * sizeof(T));
 #endif

diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
@@ -14,7 +14,9 @@
 //
 //------------------------------------------------------------------------
 
-#include <IexMathFpu.h>
+#include "IexMathFpu.h"
+
+#include <stdint.h>
 #include <IlmBaseConfig.h>
 #include <stdio.h>
 
@@ -34,9 +36,11 @@
 #include <iostream>
 #include <stdint.h>
 
+
 IEX_INTERNAL_NAMESPACE_SOURCE_ENTER
 
 
+
 namespace FpuControl
 {
 

diff --git a/IlmBase/Imath/ImathMatrix.h b/IlmBase/Imath/ImathMatrix.h
@@ -50,6 +50,7 @@
 #include "ImathShear.h"
 #include <ImathNamespace.h>
 
+#include <cstring>
 #include <iostream>
 #include <iomanip>
 #include <string.h>

diff --git a/IlmBase/config/IlmBaseConfig.h.in b/IlmBase/config/IlmBaseConfig.h.in
@@ -38,6 +38,14 @@
 #undef ILMTHREAD_NAMESPACE
 
 
+//
+// Define and set to 1 if the target system has support for large
+// stack sizes.
+//
+
+#undef ILMBASE_HAVE_LARGE_STACK
+
+
 //
 // Version string for runtime access
 //

diff --git a/IlmBase/configure.ac b/IlmBase/configure.ac
@@ -56,33 +56,9 @@ if test "${multithread}" != no ; then
     AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
 fi
 
-
-dnl --enable-large-stack
-case "$host" in
-*linux*)
-  AC_ARG_ENABLE(large-stack,
-    AC_HELP_STRING([--enable-large-stack],
-             [enable optimizations for systems that support
-             large stack sizes [[default=yes]]]),
-    [large_stack="${enableval}"],
-    [large_stack=yes])
-  ;;
-*)
-  AC_ARG_ENABLE(large-stack,
-    AC_HELP_STRING([--enable-large-stack],
-             [enable optimizations for systems that support
-             large stack sizes [[default=no]]]),
-    [large_stack="${enableval}"],
-    [large_stack=no])
-  ;;
-esac
-
-if test "x${large_stack}" != xno ; then
-    AC_DEFINE(ILMBASE_HAVE_LARGE_STACK)
-fi
-
-
+dnl
 dnl Checks for header files.
+dnl
 AC_HEADER_STDC
 AC_CHECK_HEADERS(limits.h unistd.h ucontext.h)
 
@@ -108,6 +84,29 @@ AC_DEFINE(HAVE_COMPLETE_IOMANIP) complete_iomanip=yes)
 AC_MSG_RESULT($complete_iomanip)
 AC_LANG_RESTORE
 
+dnl --enable-large-stack
+case "$host" in
+*linux*)
+  AC_ARG_ENABLE(large-stack,
+		AC_HELP_STRING([--enable-large-stack],
+			       [enable optimizations for systems that support
+			       large stack sizes [[default=yes]]]),
+		[large_stack="${enableval}"],
+		[large_stack=yes])
+  ;;
+*)
+  AC_ARG_ENABLE(large-stack,
+		AC_HELP_STRING([--enable-large-stack],
+			       [enable optimizations for systems that support
+			       large stack sizes [[default=no]]]),
+		[large_stack="${enableval}"],
+		[large_stack=no])
+  ;;
+esac
+
+if test "x${large_stack}" != xno ; then
+    AC_DEFINE(ILMBASE_HAVE_LARGE_STACK)
+fi
 
 dnl Define the version string
 AC_DEFINE_UNQUOTED(ILMBASE_VERSION_STRING, "${VERSION}")
@@ -331,8 +330,7 @@ if test "$osx_arch"; then
   AC_MSG_RESULT([
 OS X architectures                           $osx_arch
 OS X SDK                                     $osx_sdk
-OS X two-way universal build (deprecated)    $build_osxuniversal
-OS X enable large stack optimizations        $large_stack])
+OS X two-way universal build (deprecated)    $build_osxuniversal])
 fi
 
 AC_MSG_RESULT([

diff --git a/IlmBase/vc/Makefile.am b/IlmBase/vc/Makefile.am
@@ -12,57 +12,34 @@ EXTRA_DIST = \
         createDLL/createDLL.cpp \
         vc7/IlmBase/IlmBase.sln \
         vc7/IlmBase/Half/Half.vcproj \
-        vc7/IlmBase/Half/Debug/.cvsignore \
-        vc7/IlmBase/Half/Release/.cvsignore \
         vc7/IlmBase/HalfTest/HalfTest.vcproj \
-        vc7/IlmBase/HalfTest/Debug/.cvsignore \
-        vc7/IlmBase/HalfTest/Release/.cvsignore \
         vc7/IlmBase/Iex/Iex.vcproj \
-        vc7/IlmBase/Iex/Debug/.cvsignore \
-        vc7/IlmBase/Iex/Release/.cvsignore \
         vc7/IlmBase/IexTest/IexTest.vcproj \
-        vc7/IlmBase/IexTest/Debug/.cvsignore \
-        vc7/IlmBase/IexTest/Release/.cvsignore \
         vc7/IlmBase/IlmThread/IlmThread.vcproj \
-        vc7/IlmBase/IlmThread/Debug/.cvsignore \
-        vc7/IlmBase/IlmThread/Release/.cvsignore \
         vc7/IlmBase/Imath/Imath.vcproj \
-        vc7/IlmBase/Imath/Debug/.cvsignore \
-        vc7/IlmBase/Imath/Release/.cvsignore \
         vc7/IlmBase/ImathTest/ImathTest.vcproj \
-        vc7/IlmBase/ImathTest/Debug/.cvsignore \
-        vc7/IlmBase/ImathTest/Release/.cvsignore \
         vc7/IlmBase/createDLL/createDLL.vcproj \
-        vc7/IlmBase/createDLL/Debug/.cvsignore \
-        vc7/IlmBase/createDLL/Release/.cvsignore \
-        vc7/IlmBase/debug/.cvsignore \
-        vc7/IlmBase/release/.cvsignore \
         vc8/IlmBase/IlmBase.sln \
         vc8/IlmBase/Half/Half.vcproj \
-        vc8/IlmBase/Half/Debug/.cvsignore \
-        vc8/IlmBase/Half/Release/.cvsignore \
         vc8/IlmBase/HalfTest/HalfTest.vcproj \
-        vc8/IlmBase/HalfTest/Debug/.cvsignore \
-        vc8/IlmBase/HalfTest/Release/.cvsignore \
         vc8/IlmBase/Iex/Iex.vcproj \
-        vc8/IlmBase/Iex/Debug/.cvsignore \
-        vc8/IlmBase/Iex/Release/.cvsignore \
         vc8/IlmBase/IexTest/IexTest.vcproj \
-        vc8/IlmBase/IexTest/Debug/.cvsignore \
-        vc8/IlmBase/IexTest/Release/.cvsignore \
         vc8/IlmBase/IlmThread/IlmThread.vcproj \
-        vc8/IlmBase/IlmThread/Debug/.cvsignore \
-        vc8/IlmBase/IlmThread/Release/.cvsignore \
         vc8/IlmBase/Imath/Imath.vcproj \
-        vc8/IlmBase/Imath/Debug/.cvsignore \
-        vc8/IlmBase/Imath/Release/.cvsignore \
         vc8/IlmBase/ImathTest/ImathTest.vcproj \
-        vc8/IlmBase/ImathTest/Debug/.cvsignore \
-        vc8/IlmBase/ImathTest/Release/.cvsignore \
         vc8/IlmBase/createDLL/createDLL.vcproj \
         vc8/IlmBase/createDLL/Debug/.cvsignore \
         vc8/IlmBase/createDLL/Release/.cvsignore \
         vc8/IlmBase/debug/.cvsignore \
         vc8/IlmBase/release/.cvsignore
+        vc9/IlmBase/IlmBase.sln \
+        vc9/IlmBase/Half/Half.vcproj \
+        vc9/IlmBase/HalfTest/HalfTest.vcproj \
+        vc9/IlmBase/Iex/Iex.vcproj \
+        vc9/IlmBase/IexTest/IexTest.vcproj \
+        vc9/IlmBase/IlmThread/IlmThread.vcproj \
+        vc9/IlmBase/Imath/Imath.vcproj \
+        vc9/IlmBase/ImathTest/ImathTest.vcproj \
+        vc9/IlmBase/createDLL/createDLL.vcproj
 
 
diff --git a/IlmBase/vc/vc9/IlmBase/Half/Debug/.cvsignore b/IlmBase/vc/vc9/IlmBase/Half/Debug/.cvsignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-h
+aclocal.m4
+OpenEXR.pc
+autom4te.cache
+ltmain.sh
+stamp-h.in
+depcomp
+.deps
+CVS
diff --git a/IlmBase/vc/vc9/IlmBase/Half/Release/.cvsignore b/IlmBase/vc/vc9/IlmBase/Half/Release/.cvsignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-h
+aclocal.m4
+OpenEXR.pc
+autom4te.cache
+ltmain.sh
+stamp-h.in
+depcomp
+.deps
+CVS
diff --git a/IlmBase/vc/vc9/IlmBase/HalfTest/.cvsignore b/IlmBase/vc/vc9/IlmBase/HalfTest/.cvsignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-h
+aclocal.m4
+OpenEXR.pc
+autom4te.cache
+ltmain.sh
+stamp-h.in
+depcomp
+.deps
+CVS
diff --git a/IlmBase/vc/vc9/IlmBase/HalfTest/Debug/.cvsignore b/IlmBase/vc/vc9/IlmBase/HalfTest/Debug/.cvsignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-h
+aclocal.m4
+OpenEXR.pc
+autom4te.cache
+ltmain.sh
+stamp-h.in
+depcomp
+.deps
+CVS
diff --git a/IlmBase/vc/vc9/IlmBase/HalfTest/Release/.cvsignore b/IlmBase/vc/vc9/IlmBase/HalfTest/Release/.cvsignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-h
+aclocal.m4
+OpenEXR.pc
+autom4te.cache
+ltmain.sh
+stamp-h.in
+depcomp
+.deps
+CVS
diff --git a/IlmBase/vc/vc9/IlmBase/Iex/Debug/.cvsignore b/IlmBase/vc/vc9/IlmBase/Iex/Debug/.cvsignore
@@ -0,0 +1,17 @@
+Makefile
+Makefile.in
+config.h.in
+config.h
+config.log
+config.status
+configure
+libtool
+stamp-h
+aclocal.m4
+OpenEXR.pc
+autom4te.cache
+ltmain.sh
+stamp-h.in
+depcomp
+.deps
+CVS