fix testB44ExpLogTable and testDwaLookups, and Makefile.am

Signed-off-by: Peter Hillman <peterh@wetafx.co.nz>
AcademySoftwareFoundation · Jan 24, 2020 · 9750a1d · 9750a1d
1 parent bd6ab91
commit 9750a1d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/OpenEXR/IlmImfTest/Makefile.am b/OpenEXR/IlmImfTest/Makefile.am
@@ -60,7 +60,7 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h testAttributes.cpp testChannels.cpp \
 	             testRle.cpp testRle.h \
 	             testB44ExpLogTable.cpp testB44ExpLogTable.h \
 	             testDwaLookups.cpp testDwaLookups.h \
-		     bswap_32.h
+		     bswap_32.h random.cpp
 
 AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
 

diff --git a/OpenEXR/IlmImfTest/testB44ExpLogTable.cpp b/OpenEXR/IlmImfTest/testB44ExpLogTable.cpp
@@ -20,8 +20,7 @@ using namespace std;
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
 
-extern const unsigned short expTable[];
-extern const unsigned short logTable[];
+#include "b44ExpLogTable.h"
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EXIT
 

diff --git a/OpenEXR/IlmImfTest/testDwaLookups.cpp b/OpenEXR/IlmImfTest/testDwaLookups.cpp
@@ -26,6 +26,7 @@
 #include <IlmThreadSemaphore.h>
 #include <ImfIO.h>
 #include <ImfXdr.h>
+#include "dwaLookups.h"
 #include "ImfNamespace.h"
 
 //
@@ -38,11 +39,7 @@ using namespace OPENEXR_IMF_NAMESPACE;
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_ENTER
 
-extern const unsigned short dwaCompressorNoOp[];
-extern const unsigned short dwaCompressorToLinear[];
-extern const unsigned short dwaCompressorToNonlinear[];
-extern const unsigned short closestData[];
-extern const unsigned int closestDataOffset[];
+#include "dwaLookups.h"
 
 OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EXIT
 
@@ -373,7 +370,7 @@ testToNonlinear()
 
     printf("test dwaCompressorToNonlinear[]\n");
     for (int i=0; i<65536; ++i)
-        assert (toNonLinear[i] == OPENEXR_IMF_INTERNAL_NAMESPACE::dwaCompressorToNonLinear[i]);
+        assert (toNonlinear[i] == OPENEXR_IMF_INTERNAL_NAMESPACE::dwaCompressorToNonlinear[i]);
 }
 
 //