Skip to content

Adjust the clamping on the dwa compression #1986

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

Merged
cary-ilm merged 2 commits into from
Feb 18, 2025
Merged

Adjust the clamping on the dwa compression #1986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75f0fbe
Adjust the clamping on the dwa compression
kdt3rd Feb 13, 2025
07a1eef
improve tests for dwa compression level set
kdt3rd Feb 13, 2025
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
7 changes: 6 additions & 1 deletion src/lib/OpenEXRCore/part.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,12 @@ exr_set_dwa_compression_level (exr_context_t ctxt, int part_index, float level)
return EXR_UNLOCK_AND_RETURN (
ctxt->standard_error (ctxt, EXR_ERR_NOT_OPEN_WRITE));

if (level > 0.f && level <= 100.f)
// avoid bad math (fp exceptions or whatever) by clamping here
// there has always been a clamp to 0, but on the upper end, there
// is a limit too, where you only get black images anyway, so that
// is not particularly useful, not that any large value will
// really be crushing the image
if (level >= 0.f && level <= (65504.f*100000.f))
{
part->dwa_compression_level = level;
rv = EXR_ERR_SUCCESS;
Expand Down
8 changes: 7 additions & 1 deletion src/test/OpenEXRCoreTest/write.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,10 +435,16 @@ testWriteBaseHeader (const std::string& tempdir)
exr_set_dwa_compression_level (outf, 0, -2.f));
EXRCORE_TEST_RVAL_FAIL (
EXR_ERR_INVALID_ARGUMENT,
exr_set_dwa_compression_level (outf, 0, 420.f));
exr_set_dwa_compression_level (outf, 0, INFINITY));
EXRCORE_TEST_RVAL_FAIL (
EXR_ERR_INVALID_ARGUMENT,
exr_set_dwa_compression_level (outf, 0, NAN));
EXRCORE_TEST_RVAL (exr_set_dwa_compression_level (outf, 0, 42.f));
EXRCORE_TEST_RVAL (exr_get_dwa_compression_level (outf, 0, &dlev));
EXRCORE_TEST (dlev == 42.f);
EXRCORE_TEST_RVAL (exr_set_dwa_compression_level (outf, 0, 420.f));
EXRCORE_TEST_RVAL (exr_get_dwa_compression_level (outf, 0, &dlev));
EXRCORE_TEST (dlev == 420.f);

EXRCORE_TEST_RVAL (exr_finish (&outf));
remove (outfn.c_str ());
Expand Down
Loading