From 64428eed1be5e395847e414148713cff74acdc45 Mon Sep 17 00:00:00 2001 From: Peter Hillman Date: Fri, 29 Nov 2019 10:12:48 +1300 Subject: [PATCH] fix testB44ExpLogTable and testDwaLookups, and Makefile.am Signed-off-by: Peter Hillman --- OpenEXR/IlmImfTest/Makefile.am | 2 +- OpenEXR/IlmImfTest/testB44ExpLogTable.cpp | 3 +-- OpenEXR/IlmImfTest/testDwaLookups.cpp | 9 +++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/OpenEXR/IlmImfTest/Makefile.am b/OpenEXR/IlmImfTest/Makefile.am index 8f9a21f5bd..f16e553406 100644 --- 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 index 0114b1bfb9..40c99f10c1 100644 --- 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 index 3ab2e92e85..dd489393ee 100644 --- a/OpenEXR/IlmImfTest/testDwaLookups.cpp +++ b/OpenEXR/IlmImfTest/testDwaLookups.cpp @@ -26,6 +26,7 @@ #include #include #include +#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]); } //