mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-02 22:30:20 -06:00
1ee12eb90d
filter.cameraRaw deserialized its params verbatim, so an out-of-range noiseLuminance reached the denoise stage and became a guided-filter radius of round((1 + 3 * n/100) * pixelScale). A value of 1e9 turned six box-mean passes into unbounded work: the command never finished. noiseColor had the same defect through its blur sigma. raw_params now clamps the four noise fields to the documented 0..100, matching how the sibling lens commands clamp their ranges at the same boundary. The in-range path is untouched. Co-authored-by: Brandon Fenty <bfenty@users.noreply.github.com> Co-authored-by: Brandon Thomas <echelon@gmail.com>
39 lines
1.7 KiB
Rust
39 lines
1.7 KiB
Rust
//! #707: `filter.cameraRaw` must clamp the noise-reduction amounts to their
|
|
//! documented 0..100 range. Before the fix, `raw_params` deserialized the
|
|
//! params verbatim, so `noiseLuminance: 1e9` reached the guided filter as a
|
|
//! radius of ~3e9 and the command never finished.
|
|
|
|
use serde_json::json;
|
|
|
|
#[test]
|
|
fn camera_raw_clamps_noise_amounts() {
|
|
let p = photocraft_engine::lens_cmds::raw_params("filter.cameraRaw", &json!({"noiseLuminance": 1e9, "noiseColor": 1e9})).expect("params parse");
|
|
assert!((p.noise_luminance - 100.0).abs() < f32::EPSILON, "noiseLuminance 1e9 must clamp to 100, got {}", p.noise_luminance);
|
|
assert!((p.noise_color - 100.0).abs() < f32::EPSILON, "noiseColor 1e9 must clamp to 100, got {}", p.noise_color);
|
|
}
|
|
|
|
#[test]
|
|
fn camera_raw_clamps_negative_noise_and_details() {
|
|
let p = photocraft_engine::lens_cmds::raw_params(
|
|
"filter.cameraRaw",
|
|
&json!({
|
|
"noiseLuminance": -5.0,
|
|
"noiseColor": -5.0,
|
|
"noiseLuminanceDetail": 1e9,
|
|
"noiseColorDetail": -1.0
|
|
}),
|
|
)
|
|
.expect("params parse");
|
|
assert_eq!(p.noise_luminance, 0.0, "negative noiseLuminance must clamp to 0");
|
|
assert_eq!(p.noise_color, 0.0, "negative noiseColor must clamp to 0");
|
|
assert_eq!(p.noise_luminance_detail, 100.0, "detail must clamp to 100");
|
|
assert_eq!(p.noise_color_detail, 0.0, "negative detail must clamp to 0");
|
|
}
|
|
|
|
#[test]
|
|
fn camera_raw_keeps_in_range_noise_untouched() {
|
|
let p = photocraft_engine::lens_cmds::raw_params("filter.cameraRaw", &json!({"noiseLuminance": 25.0, "noiseColor": 40.0})).expect("params parse");
|
|
assert_eq!(p.noise_luminance, 25.0);
|
|
assert_eq!(p.noise_color, 40.0);
|
|
}
|