Merge upstream main to resolve PR #6601 documentation conflicts

This commit is contained in:
yoriswind
2026-11-18 02:41:17 -08:00
638 changed files with 58595 additions and 3760 deletions
+4 -3
View File
@@ -190,12 +190,13 @@ pub fn quantize_locked(rgba: &[u8], width: u32, height: u32, o: &PaletteOptions,
/// [`quantize`] to the fixed `palette`: each pixel takes its nearest entry, with `o`'s dither,
/// transparency and matte; `o.reduction` sets only the distance weights, and `o.colors` is not
/// used. Only the first 255 colors of `palette` are used, leaving room for the transparent entry.
/// Entries no pixel uses are left out.
/// used. Only the first 256 colors of `palette` are used, or the first 255 when a pixel becomes
/// transparent, leaving room for the transparent entry. Entries no pixel uses are left out.
pub fn quantize_to(rgba: &[u8], width: u32, height: u32, o: &PaletteOptions, palette: &[[u8; 3]]) -> Indexed {
let px = rgba.as_chunks::<4>().0;
let colors = opaque_colors(px, o, false);
let mut palette: Vec<[u8; 3]> = palette.iter().take(255).copied().collect();
let has_clear = o.transparency && px.iter().any(|p| p[3] < 128);
let mut palette: Vec<[u8; 3]> = palette.iter().take(256 - usize::from(has_clear)).copied().collect();
if palette.is_empty() {
palette.push(o.matte.unwrap_or([255; 3]));
}
+9 -2
View File
@@ -102,11 +102,18 @@ fn a_given_palette_keeps_the_entries_pixels_use() {
assert_eq!(ix.transparent, Some(0));
assert_eq!(ix.palette[1..], [[255, 0, 0], [0, 0, 255]], "unused entries left out, the order kept");
assert_eq!(ix.indices, [1, 2, 0, 1]);
// At most 255 of the given colors are used, leaving room for the transparent entry.
// With no transparent pixel all 256 of the given colors can be used; with one, the first 255
// leave room for the transparent entry.
let many: Vec<[u8; 3]> = (0..300u32).map(|i| [(i % 256) as u8, (i / 256) as u8, 0]).collect();
let all = image(256, 2, |x, y| [x as u8, y as u8, 0]);
let ix = quantize_to(&all, 256, 2, &o, &many);
assert!(ix.palette.len() <= 255 && ix.palette.iter().all(|c| many[..255].contains(c)), "{}", ix.palette.len());
assert!(ix.palette.len() == 256 && ix.palette.iter().all(|c| many[..256].contains(c)), "{}", ix.palette.len());
assert!(ix.palette.contains(&many[255]), "the 256th color is used");
let mut clear = all.clone();
clear[3] = 0;
let ix = quantize_to(&clear, 256, 2, &o, &many);
assert_eq!(ix.transparent, Some(0));
assert!(ix.palette.len() <= 256 && ix.palette[1..].iter().all(|c| many[..255].contains(c)), "{}", ix.palette.len());
}
#[test]