Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix testB44ExpLogTable and testDwaLookups, and Makefile.am #626

Merged
merged 3 commits into from
Jan 24, 2020
Merged

fix testB44ExpLogTable and testDwaLookups, and Makefile.am #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64428ee
fix testB44ExpLogTable and testDwaLookups, and Makefile.am
peterhillman Nov 28, 2019
3c3e1b0
Merge branch 'master' into headertestfixes
peterhillman Jan 24, 2020
61edac9
Merge branch 'master' into headertestfixes
cary-ilm Jan 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion OpenEXR/IlmImfTest/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)/\"

Expand Down
3 changes: 1 addition & 2 deletions OpenEXR/IlmImfTest/testB44ExpLogTable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 3 additions & 6 deletions OpenEXR/IlmImfTest/testDwaLookups.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#include <IlmThreadSemaphore.h>
#include <ImfIO.h>
#include <ImfXdr.h>
#include "dwaLookups.h"
#include "ImfNamespace.h"

//
Expand All @@ -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

Expand Down Expand Up @@ -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]);
}

//
Expand Down