Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ cc_library(
"src/lib/OpenEXRCore/float_vector.c",
"src/lib/OpenEXRCore/internal_attr.h",
"src/lib/OpenEXRCore/internal_b44.c",
"src/lib/OpenEXRCore/internal_b44_table.c",
"src/lib/OpenEXRCore/internal_b44_math.c",
"src/lib/OpenEXRCore/internal_bytes.h",
"src/lib/OpenEXRCore/internal_channel_list.h",
"src/lib/OpenEXRCore/internal_coding.h",
Expand Down
108 changes: 0 additions & 108 deletions src/lib/OpenEXR/b44ExpLogTable.cpp

This file was deleted.

2 changes: 1 addition & 1 deletion src/lib/OpenEXRCore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ openexr_define_library(OpenEXRCore
internal_zip.c
internal_pxr24.c
internal_b44.c
internal_b44_table.c
internal_b44_math.c
internal_piz.c
internal_ht.cpp
internal_ht_common.cpp
Expand Down
22 changes: 4 additions & 18 deletions src/lib/OpenEXRCore/internal_b44.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,8 @@

/**************************************/

extern const uint16_t* exrcore_expTable;
extern const uint16_t* exrcore_logTable;

static inline void
convertFromLinear (uint16_t s[16])
{
for (int i = 0; i < 16; ++i)
s[i] = exrcore_expTable[s[i]];
}

static inline void
convertToLinear (uint16_t s[16])
{
for (int i = 0; i < 16; ++i)
s[i] = exrcore_logTable[s[i]];
}
extern void b44_convertFromLinear_16 (uint16_t s[16]);
extern void b44_convertToLinear_16 (uint16_t s[16]);

/**************************************/

Expand Down Expand Up @@ -477,7 +463,7 @@ compress_b44_impl (exr_encode_pipeline_t* encode, int flat_field)
// results to the output buffer.
//

if (curc->p_linear) convertFromLinear (s);
if (curc->p_linear) b44_convertFromLinear_16 (s);

wcount = pack (s, out, flat_field, !(curc->p_linear));
out += wcount;
Expand Down Expand Up @@ -578,7 +564,7 @@ uncompress_b44_impl (
bIn += 14;
}

if (curc->p_linear) convertToLinear (s);
if (curc->p_linear) b44_convertToLinear_16 (s);

priv_from_native16 (s, 16);

Expand Down
Loading
Loading