Merge pull request #3898 from FredApps/fix/786-psd-fixed-adjustments

psd: share fixed-binary adjustment readers
This commit is contained in:
FredApps authored and GitHub committed 2026-11-18 22:05:40 +07:00
commit 7edb6b154a
3 files changed
+123 -31

No files matched your search

+21 -31
View File
@@ -199,11 +199,14 @@ impl Psd {
l.fill = d.color("Clr ");
}
b"nvrt" => l.adjustment = Some(Adjustment::Invert),
b"brit" => {
let brightness = r.i16()? as f64;
let contrast = r.i16()? as f64;
if l.adjustment.is_none() {
l.adjustment = Some(Adjustment::BrightnessContrast { brightness, contrast, legacy: true });
b"brit" | b"hue2" | b"hue " | b"levl" | b"expA" => {
if let Some(adjustment) = craft_psd::adjust::Adjustment::from_block(key, b) {
let adjustment = adjustment.map_err(|e| error(&e))?;
// Photoshop can write brit beside CgEd: retain Effect's first-only
// brit policy while other complete typed blocks replace prior values.
if key != b"brit" || l.adjustment.is_none() {
l.adjustment = Some(from_shared_adjustment(adjustment));
}
}
}
b"CgEd" => {
@@ -215,32 +218,6 @@ impl Psd {
legacy: d.bool("useLegacy").unwrap_or(false),
});
}
b"hue2" | b"hue " => {
let _ver = r.u16()?;
let colorize = r.u8()? != 0;
r.skip(1)?;
let ch = (r.i16()? as f64, r.i16()? as f64, r.i16()? as f64);
let m = (r.i16()? as f64, r.i16()? as f64, r.i16()? as f64);
let (hue, saturation, lightness) = if colorize { ch } else { m };
l.adjustment = Some(Adjustment::HueSaturation { hue, saturation, lightness, colorize });
}
b"levl" => {
let _ver = r.u16()?;
let (ib, iw, ob, ow, g) = (r.i16()?, r.i16()?, r.i16()?, r.i16()?, r.i16()?);
l.adjustment =
Some(Adjustment::Levels { in_black: ib as f64, in_white: iw as f64, gamma: g as f64 / 100.0, out_black: ob as f64, out_white: ow as f64 });
}
b"expA" => {
let _ver = r.u16()?;
let mut finite = |default: f64| -> Result<f64> {
let v = f64::from(r.f32()?);
Ok(if v.is_finite() { v } else { default })
};
let exposure = finite(0.0)?;
let offset = finite(0.0)?;
let gamma = finite(1.0)?;
l.adjustment = Some(Adjustment::Exposure { exposure, offset, gamma });
}
b"curv" | b"blnc" | b"post" | b"thrs" | b"selc" | b"mixr" | b"phfl" | b"vibA" | b"blwh" | b"grdm" | b"clrL" if l.adjustment.is_none() => {
l.adjustment = Some(Adjustment::Other(String::from_utf8_lossy(key).into_owned()));
}
@@ -521,3 +498,16 @@ fn error(e: &craft_psd::PsdError) -> Error {
fn mac_roman_string(b: &[u8]) -> String {
b.iter().map(|&b| if b < 0x80 { b as char } else { super::read::mac_roman(b) }).collect()
}
/// App representation only; binary field framing belongs to craft-psd.
fn from_shared_adjustment(value: craft_psd::adjust::Adjustment) -> Adjustment {
use craft_psd::adjust::Adjustment as Shared;
match value {
Shared::Invert => Adjustment::Invert,
Shared::BrightnessContrast { brightness, contrast, legacy } => Adjustment::BrightnessContrast { brightness, contrast, legacy },
Shared::HueSaturation { hue, saturation, lightness, colorize } => Adjustment::HueSaturation { hue, saturation, lightness, colorize },
Shared::Levels { in_black, in_white, gamma, out_black, out_white } => Adjustment::Levels { in_black, in_white, gamma, out_black, out_white },
Shared::Exposure { exposure, offset, gamma } => Adjustment::Exposure { exposure, offset, gamma },
Shared::Other(key) => Adjustment::Other(String::from_utf8_lossy(&key).into_owned()),
}
}
+1
View File
@@ -2,6 +2,7 @@ use super::write::*;
use super::*;
use crate::pixels::srgb_encode;
mod fixed_adjustments;
mod integration;
mod opt;
mod shared_corpus;
+101
View File
@@ -0,0 +1,101 @@
use super::*;
type Block = ([u8; 4], Vec<u8>);
fn i16s(prefix: &[u8], values: &[i16]) -> Vec<u8> {
let mut bytes = prefix.to_vec();
bytes.extend(values.iter().flat_map(|v| v.to_be_bytes()));
bytes
}
fn exposure(values: [f32; 3]) -> Vec<u8> {
let mut bytes = vec![0xff, 0xfe]; // Versions are intentionally not rejected.
bytes.extend(values.iter().flat_map(|v| v.to_be_bytes()));
bytes
}
fn parse_adjustment(blocks: Vec<Block>) -> Option<Adjustment> {
let mut doc = WDoc::new(1, 1);
doc.layers = vec![WLayer::empty("adjustment", blocks)];
Psd::parse(write(&doc)).unwrap().layers.remove(0).adjustment
}
fn cases() -> Vec<(Block, Adjustment)> {
let mut cases = vec![
((*b"brit", i16s(&[], &[i16::MIN, i16::MAX])), Adjustment::BrightnessContrast { brightness: -32768.0, contrast: 32767.0, legacy: true }),
(
(*b"levl", i16s(&[0xff, 0xfe], &[i16::MIN, i16::MAX, -12, 300, -250])),
Adjustment::Levels { in_black: -32768.0, in_white: 32767.0, gamma: -2.5, out_black: -12.0, out_white: 300.0 },
),
((*b"expA", exposure([-1.5, 2.25, 0.125])), Adjustment::Exposure { exposure: -1.5, offset: 2.25, gamma: 0.125 }),
];
for key in [*b"hue2", *b"hue "] {
for flag in [0, 1, 255] {
let values = if flag == 0 { [100.0, -200.0, 300.0] } else { [-32768.0, 32767.0, -4.0] };
cases.push((
(key, i16s(&[0xff, 0xfe, flag, 0xa5], &[i16::MIN, i16::MAX, -4, 100, -200, 300])),
Adjustment::HueSaturation { hue: values[0], saturation: values[1], lightness: values[2], colorize: flag != 0 },
));
}
}
cases
}
#[test]
fn fixed_adjustments_preserve_fields_truncation_and_trailing_bytes() {
for ((key, bytes), expected) in cases() {
for end in 0..bytes.len() {
assert_eq!(parse_adjustment(vec![(key, bytes[..end].to_vec())]), None, "{key:?} prefix {end}");
assert_eq!(parse_adjustment(vec![(*b"nvrt", vec![]), (key, bytes[..end].to_vec())]), Some(Adjustment::Invert));
}
for tail in [vec![], vec![0xff], vec![0; 20]] {
let mut data = bytes.clone();
data.extend(tail);
assert_eq!(parse_adjustment(vec![(key, data)]), Some(expected.clone()), "{key:?}");
}
let after_invert = if key == *b"brit" { Adjustment::Invert } else { expected };
assert_eq!(parse_adjustment(vec![(*b"nvrt", vec![]), (key, bytes)]), Some(after_invert));
}
}
#[test]
fn exposure_nonfinite_values_use_each_fields_original_default() {
for value in [f32::NAN, f32::INFINITY, f32::NEG_INFINITY] {
for axis in 0..3 {
let mut values = [-1.5, 2.25, 0.125];
values[axis] = value;
let mut expected = [-1.5, 2.25, 0.125];
expected[axis] = [0.0, 0.0, 1.0][axis];
assert_eq!(
parse_adjustment(vec![(*b"expA", exposure(values))]),
Some(Adjustment::Exposure { exposure: expected[0], offset: expected[1], gamma: expected[2] })
);
}
}
let Some(Adjustment::Exposure { exposure: e, offset, gamma }) = parse_adjustment(vec![(*b"expA", exposure([-0.0; 3]))]) else {
panic!("exposure missing");
};
assert!(e.is_sign_negative() && offset.is_sign_negative() && gamma.is_sign_negative());
}
#[test]
fn fixed_adjustments_keep_brit_descriptor_and_other_block_precedence() {
let brit = (*b"brit", i16s(&[], &[10, 20]));
let mut cged = 16u32.to_be_bytes().to_vec();
crate::descriptor::write_descriptor(
&mut cged,
&Descriptor::new("brightnessContrast").with("Brgh", DValue::Double(30.0)).with("Cntr", DValue::Double(-40.0)).with("useLegacy", DValue::Bool(false)),
);
let modern = Adjustment::BrightnessContrast { brightness: 30.0, contrast: -40.0, legacy: false };
for blocks in [vec![brit.clone(), (*b"CgEd", cged.clone())], vec![(*b"CgEd", cged), brit.clone()]] {
assert_eq!(parse_adjustment(blocks), Some(modern.clone()));
}
assert_eq!(parse_adjustment(vec![(*b"curv", vec![]), brit.clone()]), Some(Adjustment::Other("curv".into())));
assert_eq!(
parse_adjustment(vec![brit.clone(), (*b"curv", vec![]), (*b"brit", i16s(&[], &[50, 60]))]),
Some(Adjustment::BrightnessContrast { brightness: 10.0, contrast: 20.0, legacy: true })
);
for ((key, data), expected) in cases().into_iter().filter(|((key, _), _)| key != b"brit") {
assert_eq!(parse_adjustment(vec![(*b"curv", vec![]), brit.clone(), (key, data), (*b"curv", vec![]), brit.clone()]), Some(expected));
}
}