AcademySoftwareFoundation · kdt3rd · Jul 23, 2019 · Jul 22, 2019 · Jul 22, 2019 · Jul 22, 2019
diff --git a/IlmBase/Half/half.h b/IlmBase/Half/half.h
@@ -96,9 +96,12 @@ class half
     // Constructors
     //-------------
 
-    half ();			// no initialization
+    half () = default;			// no initialization
     half (float f);
-
+    // rule of 5
+    ~half () = default;
+    half (const half &) = default;
+    half (half &&) noexcept = default;
 
     //--------------------
     // Conversion to float
@@ -118,7 +121,8 @@ class half
     // Assignment
     //-----------
 
-    half &		operator = (half  h);
+    half &		operator = (const half  &h) = default;
+    half &		operator = (half  &&h) noexcept = default;
     half &		operator = (float f);
 
     half &		operator += (half  h);
@@ -417,17 +421,6 @@ HALF_EXPORT void        printBits   (char  c[35], float f);
 //---------------------------------------------------------------------------
 
 
-//--------------------
-// Simple constructors
-//--------------------
-
-inline
-half::half ()
-{
-    // no initialization
-}
-
-
 //----------------------------
 // Half-from-float constructor
 //----------------------------
@@ -575,14 +568,6 @@ half::operator - () const
 }
 
 
-inline half &
-half::operator = (half h)
-{
-    _h = h._h;
-    return *this;
-}
-
-
 inline half &
 half::operator = (float f)
 {

diff --git a/IlmBase/Half/halfFunction.h b/IlmBase/Half/halfFunction.h
@@ -148,7 +148,6 @@ halfFunction<T>::halfFunction (Function f,
 {
 #ifndef ILMBASE_HAVE_LARGE_STACK
     _lut = new T[1<<16];
-    memset (_lut, 0 , (1<<16) * sizeof(T));
 #endif
 
     for (int i = 0; i < (1 << 16); i++)

diff --git a/IlmBase/HalfTest/main.cpp b/IlmBase/HalfTest/main.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testSize.h>
 #include <testArithmetic.h>
 #include <testError.h>

diff --git a/IlmBase/HalfTest/testArithmetic.cpp b/IlmBase/HalfTest/testArithmetic.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testArithmetic.h>
 #include "half.h"
 #include <iostream>

diff --git a/IlmBase/HalfTest/testBitPatterns.cpp b/IlmBase/HalfTest/testBitPatterns.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testBitPatterns.h>
 #include "half.h"
 #include <float.h>

diff --git a/IlmBase/HalfTest/testClassification.cpp b/IlmBase/HalfTest/testClassification.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testClassification.h>
 #include "half.h"
 #include <iostream>

diff --git a/IlmBase/HalfTest/testError.cpp b/IlmBase/HalfTest/testError.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testError.h>
 #include "half.h"
 #include <iostream>

diff --git a/IlmBase/HalfTest/testFunction.cpp b/IlmBase/HalfTest/testFunction.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testFunction.h>
 #include "halfFunction.h"
 #include <iostream>

diff --git a/IlmBase/HalfTest/testLimits.cpp b/IlmBase/HalfTest/testLimits.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testLimits.h>
 #include "halfLimits.h"
 #include <iostream>

diff --git a/IlmBase/HalfTest/testSize.cpp b/IlmBase/HalfTest/testSize.cpp
@@ -3,6 +3,10 @@
 // Copyright Contributors to the OpenEXR Project.
 //
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include <testSize.h>
 #include "half.h"
 #include <iostream>

diff --git a/IlmBase/IexTest/main.cpp b/IlmBase/IexTest/main.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testBaseExc.h>
 

diff --git a/IlmBase/IexTest/testBaseExc.cpp b/IlmBase/IexTest/testBaseExc.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testBaseExc.h>
 #include <Iex.h>

diff --git a/IlmBase/IlmThread/IlmThreadSemaphorePosix.cpp b/IlmBase/IlmThread/IlmThreadSemaphorePosix.cpp
@@ -60,8 +60,12 @@ Semaphore::Semaphore (unsigned int value)
 
 Semaphore::~Semaphore ()
 {
+#ifdef NDEBUG
+    ::sem_destroy (&_semaphore);
+#else
     int error = ::sem_destroy (&_semaphore);
     assert (error == 0);
+#endif
 }
 
 

diff --git a/IlmBase/Imath/ImathFrustum.h b/IlmBase/Imath/ImathFrustum.h
@@ -278,7 +278,8 @@ void Frustum<T>::modifyNearAndFar(T n, T f)
         Line3<T> upperRight( Vec3<T>(0,0,0), Vec3<T>(_right,_top,-_nearPlane) );
         Plane3<T> nearPlane( Vec3<T>(0,0,-1), n );
 
-        Vec3<T> ll,ur;
+        Vec3<T> ll = Vec3<T> (0, 0, 0);
+        Vec3<T> ur = Vec3<T> (0, 0, 0);
         nearPlane.intersect(lowerLeft,ll);
         nearPlane.intersect(upperRight,ur);
 

diff --git a/IlmBase/ImathTest/main.cpp b/IlmBase/ImathTest/main.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testVec.h>
 #include <testRoots.h>

diff --git a/IlmBase/ImathTest/testBox.cpp b/IlmBase/ImathTest/testBox.cpp
@@ -32,6 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testBoxAlgo.h>
 #include "ImathBoxAlgo.h"

diff --git a/IlmBase/ImathTest/testBoxAlgo.cpp b/IlmBase/ImathTest/testBoxAlgo.cpp
@@ -32,6 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testBoxAlgo.h>
 #include "ImathBoxAlgo.h"

diff --git a/IlmBase/ImathTest/testColor.cpp b/IlmBase/ImathTest/testColor.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testColor.h>
 #include "ImathColor.h"

diff --git a/IlmBase/ImathTest/testExtractEuler.cpp b/IlmBase/ImathTest/testExtractEuler.cpp
@@ -32,6 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testExtractEuler.h>
 #include "ImathMatrixAlgo.h"

diff --git a/IlmBase/ImathTest/testExtractSHRT.cpp b/IlmBase/ImathTest/testExtractSHRT.cpp
@@ -32,6 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testExtractSHRT.h>
 #include "ImathMatrixAlgo.h"
@@ -67,10 +70,14 @@ testMatrix (const M33f M)
     // angle back to a matrix, N.
     //
 
-    V2f s, t;
-    float h, r;
+    V2f s(0.f), t(0.f);
+    float h, r= 0.f;
 
-    extractSHRT (M, s, h, r, t, true);
+    if (!extractSHRT (M, s, h, r, t, true))
+    {
+        cout << "Unable to extractSHRT" << std::endl;
+        assert(false);
+    }
 
     M33f N;
 
@@ -443,4 +450,3 @@ testExtractSHRT ()
 	cerr << "  Caught exception: " << e.what () << endl;
     }
 }
-
diff --git a/IlmBase/ImathTest/testFrustum.cpp b/IlmBase/ImathTest/testFrustum.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testFrustum.h>
 #include "ImathFrustum.h"
@@ -225,7 +227,7 @@ testFrustum ()
 	(void)badFrustum.projectionMatrix();
 	assert (!"near == far didn't throw an exception");
     }
-    catch (IEX_NAMESPACE::DivzeroExc)
+    catch (IEX_NAMESPACE::DivzeroExc &)
     {
         caught = true;
     }
@@ -239,7 +241,7 @@ testFrustum ()
 	(void)badFrustum.projectionMatrix();
 	assert (!"left == right didn't throw an exception");
     }
-    catch (IEX_NAMESPACE::DivzeroExc)
+    catch (IEX_NAMESPACE::DivzeroExc &)
     {
         caught = true;
     }
@@ -253,7 +255,7 @@ testFrustum ()
 	(void)badFrustum.projectionMatrix();
 	assert (!"top == bottom didn't throw an exception");
     }
-    catch (IEX_NAMESPACE::DivzeroExc)
+    catch (IEX_NAMESPACE::DivzeroExc &)
     {
         caught = true;
     }

diff --git a/IlmBase/ImathTest/testFrustumTest.cpp b/IlmBase/ImathTest/testFrustumTest.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testFrustumTest.h>
 #include "ImathFrustum.h"

diff --git a/IlmBase/ImathTest/testFun.cpp b/IlmBase/ImathTest/testFun.cpp
@@ -32,6 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testFun.h>
 #include "ImathFun.h"

diff --git a/IlmBase/ImathTest/testInvert.cpp b/IlmBase/ImathTest/testInvert.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testInvert.h>
 #include "ImathMatrix.h"

diff --git a/IlmBase/ImathTest/testJacobiEigenSolver.cpp b/IlmBase/ImathTest/testJacobiEigenSolver.cpp
@@ -32,6 +32,10 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
+
 #include "ImathMatrix.h"
 #include "ImathMatrixAlgo.h"
 #include <iostream>
@@ -309,5 +313,3 @@ testJacobiEigenSolver()
 
     cout << "************      ALL PASS          ************" << endl;
 }
-
-
diff --git a/IlmBase/ImathTest/testLineAlgo.cpp b/IlmBase/ImathTest/testLineAlgo.cpp
@@ -32,6 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testLineAlgo.h>
 #include "ImathLineAlgo.h"

diff --git a/IlmBase/ImathTest/testMatrix.cpp b/IlmBase/ImathTest/testMatrix.cpp
@@ -32,7 +32,9 @@
 //
 ///////////////////////////////////////////////////////////////////////////
 
-
+#ifdef NDEBUG
+#    undef NDEBUG
+#endif
 
 #include <testMatrix.h>
 #include "ImathMatrix.h"