mirror of
https://github.com/storytold/vectorcraft.git
synced 2026-11-16 22:34:43 +00:00
Merge remote-tracking branch 'origin/fix/restore-codec-cutover-ci' into work7669
This commit is contained in:
@@ -260,7 +260,7 @@ fn reduction(bytes: &[u8], allowance: u64) -> Option<Reduction> {
|
||||
let to = fitted_dims(w, h, allowance)?;
|
||||
// A PNG that isn't interlaced or animated (and upright in pre-pixel EXIF) is read a row at a time when the reader's buffers fit the allowance.
|
||||
let row_scratch = if format == image::ImageFormat::Png {
|
||||
let streamed = craft_image_codecs::PngDecodeRows::new_streaming(bytes, &craft_image_codecs::Limits::default())
|
||||
let streamed = craft_image_codecs::PngDecodeRows::new_streaming(bytes, &png_streaming_limits(allowance))
|
||||
.ok()
|
||||
.filter(|dec| dec.streamable())
|
||||
.and_then(|dec| png_row_scratch(&dec.header()));
|
||||
@@ -276,6 +276,13 @@ fn reduction(bytes: &[u8], allowance: u64) -> Option<Reduction> {
|
||||
(rows || d.total_bytes() <= allowance).then_some(Reduction { size: (w, h), to, rows, scratch })
|
||||
}
|
||||
|
||||
/// Streaming retains rows, not the declared full image. Preserve the renderer's source-pixel
|
||||
/// allowance even when RGBA16's declared samples exceed the shared whole-image default budget.
|
||||
/// Row scratch and the reduced pixmap are admitted separately before decoding starts.
|
||||
fn png_streaming_limits(source_pixels: u64) -> craft_image_codecs::Limits {
|
||||
craft_image_codecs::Limits { max_width: u32::MAX, max_height: u32::MAX, max_pixels: source_pixels, max_alloc: source_pixels.saturating_mul(8) }
|
||||
}
|
||||
|
||||
/// How many rows of an image decoded whole [`reduced_pixmap`] converts to RGBA at a time.
|
||||
const BAND: u32 = 16;
|
||||
|
||||
@@ -372,7 +379,7 @@ fn reduced_pixmap(bytes: &[u8], r: &Reduction) -> Result<vello_cpu::Pixmap, Unde
|
||||
|
||||
/// `bytes` read and shrunk as [`reduced_pixmap`] says.
|
||||
fn shrunk(bytes: &[u8], r: &Reduction) -> Option<vello_cpu::Pixmap> {
|
||||
shrunk_with_png_limits(bytes, r, &craft_image_codecs::Limits::default())
|
||||
shrunk_with_png_limits(bytes, r, &png_streaming_limits(allowance()))
|
||||
}
|
||||
|
||||
fn shrunk_with_png_limits(bytes: &[u8], r: &Reduction, png_limits: &craft_image_codecs::Limits) -> Option<vello_cpu::Pixmap> {
|
||||
@@ -671,6 +678,31 @@ mod tests {
|
||||
assert_eq!(room_for(MAX_DECODE_ALLOC, MAX_DECODE_ALLOC), Ok(()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn streaming_header_accepts_rgba16_above_whole_image_default() {
|
||||
// Header-only fixture: opening the stream checks declared size without allocating or
|
||||
// decoding the 1.2 GB canvas. Padding meets the decoder's compressed-size plausibility
|
||||
// bound; no rows are requested from this deliberately incomplete image.
|
||||
let (w, h) = (10_000u32, 15_000u32);
|
||||
let mut bytes = b"\x89PNG\r\n\x1a\n".to_vec();
|
||||
let ihdr = [&b"IHDR"[..], &w.to_be_bytes(), &h.to_be_bytes(), &[16, 6, 0, 0, 0]].concat();
|
||||
let mut idat = b"IDAT\x78\x9c".to_vec();
|
||||
idat.resize(1_200_000, 0);
|
||||
for chunk in [&ihdr[..], &idat, b"IEND"] {
|
||||
bytes.extend((chunk.len() as u32 - 4).to_be_bytes());
|
||||
bytes.extend(chunk);
|
||||
let mut crc = flate2::Crc::new();
|
||||
crc.update(chunk);
|
||||
bytes.extend(crc.sum().to_be_bytes());
|
||||
}
|
||||
let default = craft_image_codecs::Limits { max_alloc: 1 << 30, max_pixels: 150_000_000, ..Default::default() };
|
||||
assert!(craft_image_codecs::PngDecodeRows::new_streaming(&bytes, &default).is_err());
|
||||
let rows = craft_image_codecs::PngDecodeRows::new_streaming(&bytes, &png_streaming_limits(150_000_000)).unwrap();
|
||||
assert_eq!((rows.header().width, rows.header().height), (w, h));
|
||||
assert!(rows.streamable());
|
||||
assert!(craft_image_codecs::PngDecodeRows::new_streaming(&bytes, &png_streaming_limits(149_999_999)).is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn streaming_reduction_does_not_retain_text_after_pixels() {
|
||||
let mut bytes = Vec::new();
|
||||
|
||||
@@ -326,6 +326,25 @@ mod tests {
|
||||
assert!(decode_alpha(b"not an image").is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn decode_alpha_expands_gray_and_rgb_png_transparency_keys() {
|
||||
// Original synthetic 2x1 PNGs: first pixel matches tRNS; second is opaque.
|
||||
// Generated from PNG chunks and zlib scanlines, without an external image asset.
|
||||
let gray: &[u8] = &[
|
||||
137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 2, 0, 0, 0, 1, 8, 0, 0, 0, 0, 209, 73, 32, 86, 0, 0, 0, 2, 116,
|
||||
82, 78, 83, 0, 0, 118, 147, 205, 56, 0, 0, 0, 11, 73, 68, 65, 84, 120, 156, 99, 96, 168, 7, 0, 0, 130, 0, 128, 32, 18, 25, 54, 0, 0, 0,
|
||||
0, 73, 69, 78, 68, 174, 66, 96, 130,
|
||||
];
|
||||
let rgb: &[u8] = &[
|
||||
137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82, 0, 0, 0, 2, 0, 0, 0, 1, 8, 2, 0, 0, 0, 123, 64, 232, 221, 0, 0, 0, 6, 116,
|
||||
82, 78, 83, 0, 255, 0, 0, 0, 0, 164, 194, 192, 29, 0, 0, 0, 15, 73, 68, 65, 84, 120, 156, 99, 248, 207, 192, 192, 240, 159, 1, 0, 7, 255,
|
||||
1, 255, 1, 127, 137, 167, 0, 0, 0, 0, 73, 69, 78, 68, 174, 66, 96, 130,
|
||||
];
|
||||
for bytes in [gray, rgb] {
|
||||
assert_eq!(decode_alpha(bytes).unwrap(), Some((2, 1, vec![0, 255])));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn decode_alpha_preserves_cmyk_and_lab_tiff_extra_samples() {
|
||||
use craft_image_codecs::{ChannelLayout, Format, Image};
|
||||
|
||||
Reference in New Issue
Block a user