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 hang if gainmap image is larger than base image #294

Merged
merged 1 commit into from
Sep 30, 2024
Merged

fix hang if gainmap image is larger than base image #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions lib/src/jpegr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1406,10 +1406,11 @@ uhdr_error_info_t JpegR::applyGainMap(uhdr_raw_image_t* sdr_intent, uhdr_raw_ima
}

float map_scale_factor = (float)sdr_intent->w / gainmap_img->w;
int map_scale_factor_rnd = std::roundf(map_scale_factor);

dest->cg = sdr_intent->cg;
// Table will only be used when map scale factor is integer.
ShepardsIDW idwTable(static_cast<int>(map_scale_factor));
ShepardsIDW idwTable(map_scale_factor_rnd);
float display_boost = (std::min)(max_display_boost, gainmap_metadata->hdr_capacity_max);
GainLUT gainLUT(gainmap_metadata, display_boost);

Expand Down Expand Up @@ -1525,7 +1526,7 @@ uhdr_error_info_t JpegR::applyGainMap(uhdr_raw_image_t* sdr_intent, uhdr_raw_ima
for (int th = 0; th < threads - 1; th++) {
workers.push_back(std::thread(applyRecMap));
}
const int rowStep = threads == 1 ? sdr_intent->h : map_scale_factor;
const int rowStep = threads == 1 ? sdr_intent->h : map_scale_factor_rnd;
for (size_t rowStart = 0; rowStart < sdr_intent->h;) {
int rowEnd = (std::min)(rowStart + rowStep, (size_t)sdr_intent->h);
jobQueue.enqueueJob(rowStart, rowEnd);
Expand Down
Loading