livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrected calcDataSizeJ2C change so it compiles on macOS and Linux

master
Hecklezz 2025-10-12 02:05:02 +10:00
parent 14ae64f297
commit 24e526a111
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llimage/llimagej2c.cpp
View File

@ -302,15 +302,15 @@ S32 LLImageJ2C::calcDataSizeJ2C(S32 w, S32 h, S32 comp, S32 discard_level, F32 r
// --- Use 7.1.11 basis with fixes implied by LL PRs ---
(void)comp; // retained for parity with the viewer signature
const S32 hard_cap = 12; // sanity cap
const S64 base_layer_area = static_cast<S64>(MAX_BLOCK_SIZE) * static_cast<S64>(MAX_BLOCK_SIZE); // 64x64 blocks at discard 5
constexpr S32 hard_cap = 12; // sanity cap
constexpr S64 base_layer_area = static_cast<S64>(MAX_BLOCK_SIZE) * static_cast<S64>(MAX_BLOCK_SIZE); // 64x64 blocks at discard 5
constexpr S64 bits_per_tile = static_cast<S64>(max_components) * static_cast<S64>(precision);
const S32 discard_layers = std::max(5 - discard_level, 0);
const double rate64 = static_cast<double>(rate);
const S64 header_bytes = static_cast<S64>(calcHeaderSizeJ2C());
const S64 bits_per_tile = static_cast<S64>(max_components) * static_cast<S64>(precision);
// helper lambda: layer area to estimated bit budget
auto scaled_bits = [rate64, bits_per_tile](S64 layer_area) -> S64
auto scaled_bits = [rate64](S64 layer_area) -> S64
{
const S64 layer_bits = layer_area * bits_per_tile;
return static_cast<S64>(std::llround(static_cast<double>(layer_bits) * rate64));