diff --git a/crates/render/src/raster.rs b/crates/render/src/raster.rs index 1d27743be..f05a81129 100644 --- a/crates/render/src/raster.rs +++ b/crates/render/src/raster.rs @@ -2099,48 +2099,59 @@ mod tests { // Metadata-only: the test budget is 128 pixels and no image buffer is allocated. #[test] fn image_resampling_rejects_anisotropic_target_growth() { - assert_eq!(hayro::image_resampling_size(16, 1, 1, 16, 0.5, 32.0, 128), None); - assert_eq!(hayro::image_resampling_size(16, 1, 3, 48, 0.5, 32.0, 128), None); - assert_eq!(hayro::image_resampling_size(16, 1, 4, 64, 0.5, 32.0, 128), None); + assert_eq!(hayro::image_resampling_size(16, 1, 1, 16, 0.5, 32.0, 128, true), None); + assert_eq!(hayro::image_resampling_size(16, 1, 3, 48, 0.5, 32.0, 128, true), None); + assert_eq!(hayro::image_resampling_size(16, 1, 4, 64, 0.5, 32.0, 128, true), None); } #[test] fn image_resampling_bounds_intermediate_before_planning() { // Source and destination are each 128 pixels, but their crossed dimensions are 256. - assert_eq!(hayro::image_resampling_size(16, 8, 4, 512, 0.5, 2.0, 128), None); + assert_eq!(hayro::image_resampling_size(16, 8, 4, 512, 0.5, 2.0, 128, true), None); } #[test] fn image_resampling_rejects_invalid_sources_and_scales() { - assert_eq!(hayro::image_resampling_size(4, 4, 3, 47, 0.5, 0.5, 128), None); - assert_eq!(hayro::image_resampling_size(4, 4, 3, 49, 0.5, 0.5, 128), None); + assert_eq!(hayro::image_resampling_size(4, 4, 3, 47, 0.5, 0.5, 128, true), None); + assert_eq!(hayro::image_resampling_size(4, 4, 3, 49, 0.5, 0.5, 128, true), None); for scale in [f32::NAN, f32::INFINITY, f32::NEG_INFINITY, -1.0, 0.0] { - assert_eq!(hayro::image_resampling_size(4, 4, 3, 48, 0.5, scale, 128), None); + assert_eq!(hayro::image_resampling_size(4, 4, 3, 48, 0.5, scale, 128, true), None); } } #[test] fn image_resampling_keeps_valid_sizes_and_exact_limits() { - assert_eq!(hayro::image_resampling_size(16, 8, 1, 128, 0.5, 0.5, 128), Some((8, 4))); - assert_eq!(hayro::image_resampling_size(16, 1, 3, 48, 0.5, 8.0, 128), Some((8, 8))); - assert_eq!(hayro::image_resampling_size(16, 8, 4, 512, 1.0, 1.0, 128), Some((16, 8))); - assert_eq!(hayro::image_resampling_size(0, 8, 1, 0, 1.0, 1.0, 128), None); - assert_eq!(hayro::image_resampling_size(16, 9, 1, 144, 1.0, 1.0, 128), None); - assert_eq!(hayro::image_resampling_size(65_536, 1, 1, 65_536, 1.0, 1.0, u64::MAX), None); + assert_eq!(hayro::image_resampling_size(16, 8, 1, 128, 0.5, 0.5, 128, true), Some((8, 4))); + assert_eq!(hayro::image_resampling_size(16, 1, 3, 48, 0.5, 8.0, 128, true), Some((8, 8))); + assert_eq!(hayro::image_resampling_size(16, 8, 4, 512, 1.0, 1.0, 128, true), Some((16, 8))); + assert_eq!(hayro::image_resampling_size(0, 8, 1, 0, 1.0, 1.0, 128, true), None); + assert_eq!(hayro::image_resampling_size(16, 9, 1, 144, 1.0, 1.0, 128, true), None); + assert_eq!(hayro::image_resampling_size(65_536, 1, 1, 65_536, 1.0, 1.0, u64::MAX, true), None); for channels in [1, 3, 4] { - assert_eq!(hayro::image_resampling_size(65_536, 1, channels, 65_536 * channels, 1.0 / 4096.0, 1.0, 65_536), Some((16, 1))); + assert_eq!(hayro::image_resampling_size(65_536, 1, channels, 65_536 * channels, 1.0 / 4096.0, 1.0, 65_536, true), Some((16, 1))); } - assert_eq!(hayro::image_resampling_size(65_535, 1, 1, 65_535, 1.0, 1.0, 65_535), Some((65_535, 1))); - assert_eq!(hayro::image_resampling_size((1 << 20) + 1, 1, 1, (1 << 20) + 1, 1.0 / 4096.0, 1.0, 1 << 28), None); + assert_eq!(hayro::image_resampling_size(65_535, 1, 1, 65_535, 1.0, 1.0, 65_535, true), Some((65_535, 1))); + assert_eq!(hayro::image_resampling_size((1 << 20) + 1, 1, 1, (1 << 20) + 1, 1.0 / 4096.0, 1.0, 1 << 28, true), None); } #[test] fn image_resampling_padded_backend_dimensions_stay_checked() { // A Type 3 image's two-pixel frame may reach u16::MAX exactly, never wrap to zero. - assert_eq!(hayro::image_resampling_size(65_531 + 4, 1 + 4, 4, 65_535 * 5 * 4, 1.0, 1.0, 65_535 * 5), Some((65_535, 5))); - assert_eq!(hayro::image_resampling_size(65_531 + 4, 1 + 4, 4, 65_535 * 5 * 4, 1.0, 1.0, 65_535 * 5 - 1), None); - assert_eq!(hayro::image_resampling_size(65_532 + 4, 1 + 4, 4, 65_536 * 5 * 4, 1.0, 1.0, 1 << 28), None); + assert_eq!(hayro::image_resampling_size(65_531 + 4, 1 + 4, 4, 65_535 * 5 * 4, 1.0, 1.0, 65_535 * 5, true), Some((65_535, 5))); + assert_eq!(hayro::image_resampling_size(65_531 + 4, 1 + 4, 4, 65_535 * 5 * 4, 1.0, 1.0, 65_535 * 5 - 1, true), None); + assert_eq!(hayro::image_resampling_size(65_532 + 4, 1 + 4, 4, 65_536 * 5 * 4, 1.0, 1.0, 1 << 28, true), None); } + + /// Nearest-neighbour copies source pixels and needs no filter tables, so a source wider than the + /// Catmull-Rom side cap still shrinks. The pixel budget applies to it all the same. + #[test] + fn image_resampling_nearest_accepts_wide_sources_the_filter_refuses() { + let wide: u32 = (1 << 20) + 1; + assert_eq!(hayro::image_resampling_size(wide, 1, 1, wide as usize, 1.0 / 4096.0, 1.0, 1 << 28, true), None); + assert_eq!(hayro::image_resampling_size(wide, 1, 1, wide as usize, 1.0 / 4096.0, 1.0, 1 << 28, false), Some((257, 1))); + assert_eq!(hayro::image_resampling_size(wide, 1, 1, wide as usize, 1.0 / 4096.0, 1.0, 256, false), None); + } + fn strip_image_pdf(width: u32, body: &str, space: &str, encoded: &str, alpha: Option<&str>) -> Vec { let (mask_ref, mask_obj) = match alpha { Some(data) => ( @@ -2193,6 +2204,23 @@ mod tests { assert_eq!(&page.rgba[(20 + 3) * 4..][..4], &[255, 128, 128, 255]); } + /// A source wider than the filter's 2^20-pixel side cap is shrunk by nearest-neighbour rather + /// than refused and skipped (the default, `/Interpolate` omitted, is nearest). + #[test] + fn wide_non_interpolated_sources_draw_after_shrinking() { + let data = "7f".repeat(1_100_000); + let pdf = strip_image_pdf(1_100_000, "q 16 0 0 1 2 2 cm /Im0 Do Q\n", "DeviceGray", &data, None); + let mut renderer = PageRenderer::new(Arc::new(pdf), RenderConfig::default()); + let page = renderer.render(RenderRequest { page: 0, kind: RequestKind::Pixels, scale: 1.0, ..Default::default() }); + assert!(page.error.is_none(), "{:?}", page.error); + assert_eq!((page.width, page.height), (20, 4)); + let pixel = |x: usize| &page.rgba[(20 + x) * 4..][..4]; + assert_eq!(pixel(1), &[255, 255, 255, 255]); + assert_eq!(pixel(3), &[127, 127, 127, 255], "source image was not dropped"); + assert_eq!(pixel(17), &[127, 127, 127, 255]); + assert_eq!(pixel(19), &[255, 255, 255, 255]); + } + #[test] fn image_resampling_mismatched_alpha_mask_keeps_pixels_and_placement() { let data = "ff0000".repeat(16); @@ -4501,6 +4529,180 @@ trailer << /Root 1 0 R >> assert_eq!(&page.rgba[((38 * 40 + 1) * 4)..][..4], &[255, 0, 0, 255]); } + /// Hex-encodes `bytes` for an `/ASCIIHexDecode` stream. + fn hex(bytes: &[u8]) -> String { + bytes.iter().map(|b| format!("{b:02x}")).collect() + } + + /// An 8×4 source of 2×2 blocks: block column `x / 2` and row `y / 2` takes `levels[(y / 2) * 4 + x / 2]`. + fn block_source(levels: [T; 8]) -> Vec { + (0..32).map(|i| levels[(i / 16) * 4 + (i % 8) / 2]).collect() + } + + /// Draws one `size` image of colour space `space` (`data` as raw samples, with an optional gray + /// `/SMask` of the same size) at 1:1 on a `device`-sized page, writing `/Interpolate` when given. + fn draw_minified_image( + space: &str, + size: (u32, u32), + interpolate: Option, + data: &[u8], + alpha: Option<&[u8]>, + device: (u32, u32), + ) -> RenderedPage { + let (width, height) = size; + let interp = interpolate.map_or_else(String::new, |value| format!("/Interpolate {value} ")); + let (smask, mask) = match alpha { + Some(alpha) => ( + "/SMask 6 0 R ", + format!( + "6 0 obj << /Type /XObject /Subtype /Image /Width {width} /Height {height} /ColorSpace /DeviceGray /BitsPerComponent 8 /Filter /ASCIIHexDecode /Length {} >> stream\n{}>\nendstream endobj\n", + hex(alpha).len() + 1, + hex(alpha) + ), + ), + None => ("", String::new()), + }; + let image = hex(data); + let content = format!("q {} 0 0 {} 0 0 cm /Im0 Do Q", device.0, device.1); + let pdf = format!( + "%PDF-1.4\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n\ + 2 0 obj << /Type /Pages /Kids [3 0 R] /Count 1 >> endobj\n\ + 3 0 obj << /Type /Page /Parent 2 0 R /MediaBox [0 0 {} {}] /Contents 4 0 R /Resources << /XObject << /Im0 5 0 R >> >> >> endobj\n\ + 4 0 obj << /Length {} >> stream\n{content}\nendstream endobj\n\ + 5 0 obj << /Type /XObject /Subtype /Image /Width {width} /Height {height} /ColorSpace /{space} /BitsPerComponent 8 {interp}{smask}/Filter /ASCIIHexDecode /Length {} >> stream\n{image}>\nendstream endobj\n\ + {mask}trailer << /Root 1 0 R >>\n%%EOF\n", + device.0, + device.1, + content.len(), + image.len() + 1 + ); + let mut renderer = PageRenderer::new(Arc::new(pdf.into_bytes()), RenderConfig::default()); + let page = renderer.render(RenderRequest { page: 0, kind: RequestKind::Pixels, scale: 1.0, ..Default::default() }); + assert!(page.error.is_none(), "{:?}", page.error); + assert_eq!((page.width, page.height), device); + page + } + + /// Issue #624: an image drawn below its source resolution was pre-resampled with Catmull-Rom + /// even when `/Interpolate` was false (or absent, whose PDF default is false). That blends + /// neighboring samples before the renderer's later non-interpolating image sampler sees them, + /// making scans, screenshots and rasterized text look soft. + #[test] + fn non_interpolated_images_are_not_smoothed_when_minified() { + // Top band K W R G, bottom band B Y M C. Nearest 8×4 → 4×2 sampling picks each block's + // pixel, so every device pixel is one palette colour; Catmull-Rom blends across blocks. + let palette: [[u8; 3]; 8] = [[0, 0, 0], [255, 255, 255], [255, 0, 0], [0, 255, 0], [0, 0, 255], [255, 255, 0], [255, 0, 255], [0, 255, 255]]; + let rgb: Vec = block_source(palette).concat(); + let exact: Vec<[u8; 4]> = palette.iter().map(|c| [c[0], c[1], c[2], 255]).collect(); + let pixels = |p: &RenderedPage| p.rgba.as_chunks::<4>().0.to_vec(); + + // `/Interpolate` defaults to false, and explicit false is equivalent. + let omitted = draw_minified_image("DeviceRGB", (8, 4), None, &rgb, None, (4, 2)); + assert_eq!(pixels(&omitted), exact, "default interpolation"); + let disabled = draw_minified_image("DeviceRGB", (8, 4), Some(false), &rgb, None, (4, 2)); + assert_eq!(&omitted.rgba[..], &disabled.rgba[..], "/Interpolate false must match the default"); + + // The fix must not disable interpolation: the same source asking for it blends blocks. + let enabled = draw_minified_image("DeviceRGB", (8, 4), Some(true), &rgb, None, (4, 2)); + assert_ne!(pixels(&enabled), exact, "/Interpolate true should still blend"); + assert!(pixels(&enabled).iter().any(|px| px[..3].iter().any(|&c| (32..=223).contains(&c))), "/Interpolate true made no mid-tone"); + } + + #[test] + fn non_interpolated_gray_images_are_not_smoothed_when_minified() { + let levels = [0u8, 255, 85, 170, 40, 200, 120, 230]; + let page = draw_minified_image("DeviceGray", (8, 4), None, &block_source(levels), None, (4, 2)); + let expected: Vec<[u8; 4]> = levels.iter().map(|&v| [v, v, v, 255]).collect(); + assert_eq!(page.rgba.as_chunks::<4>().0.to_vec(), expected); + } + + #[test] + fn non_integer_minification_samples_the_same_columns() { + // Ten columns drawn six pixels wide: centre sampling reads columns 0, 2, 4, 5, 7 and 9. + let ramp = [10u8, 20, 30, 40, 50, 60, 70, 80, 90, 100]; + let page = draw_minified_image("DeviceGray", (10, 1), None, &ramp, None, (6, 1)); + let grays: Vec = page.rgba.as_chunks::<4>().0.iter().map(|px| px[0]).collect(); + assert_eq!(grays, [10, 30, 50, 60, 80, 100]); + } + + #[test] + fn non_integer_minification_samples_colour_and_mask_from_the_same_columns() { + // Ten gray columns with a soft mask, drawn six pixels wide: columns 0, 2, 4, 5, 7 and 9 are + // sampled, so the mask must pick the same columns as the colours. + let ramp = [10u8, 20, 30, 40, 50, 60, 70, 80, 90, 100]; + let mask = [255u8, 0, 0, 0, 255, 255, 0, 0, 0, 255]; + let page = draw_minified_image("DeviceGray", (10, 1), None, &ramp, Some(&mask), (6, 1)); + // Opaque columns keep their gray; transparent columns show the white page. + assert_eq!( + page.rgba.as_chunks::<4>().0.to_vec(), + vec![[10, 10, 10, 255], [255, 255, 255, 255], [50, 50, 50, 255], [60, 60, 60, 255], [255, 255, 255, 255], [100, 100, 100, 255]] + ); + } + + #[test] + fn non_interpolated_alpha_images_keep_their_colours_and_mask_when_minified() { + let palette: [[u8; 3]; 8] = [[0, 0, 0], [255, 255, 255], [255, 0, 0], [0, 255, 0], [0, 0, 255], [255, 255, 0], [255, 0, 255], [0, 255, 255]]; + let rgb: Vec = block_source(palette).concat(); + let alpha = block_source([255u8, 0, 128, 255, 0, 255, 64, 128]); + let page = draw_minified_image("DeviceRGB", (8, 4), None, &rgb, Some(&alpha), (4, 2)); + // Premultiplied colours composited over the white page: alpha 0 shows the page. + let expected = vec![ + [0, 0, 0, 255], + [255, 255, 255, 255], + [255, 127, 127, 255], + [0, 255, 0, 255], + [255, 255, 255, 255], + [255, 255, 0, 255], + [255, 191, 255, 255], + [127, 255, 255, 255], + ]; + assert_eq!(page.rgba.as_chunks::<4>().0.to_vec(), expected); + } + + /// Type 3 glyph images used to be sampled bicubically (`ImageQuality::High`) whatever their + /// `/Interpolate`, which blends the nearest pre-resize back in. The glyph is 4.6 × 2.3 pixels + /// and its image pre-resizes to 5 × 3, so the final draw samples fractionally and bicubic + /// filtering would blend palette colours. Interior pixels must stay palette colours unless the + /// image asks for interpolation. + #[test] + fn non_interpolated_type3_glyph_images_are_not_smoothed_when_minified() { + let palette: [[u8; 3]; 8] = [[0, 0, 0], [255, 255, 255], [255, 0, 0], [0, 255, 0], [0, 0, 255], [255, 255, 0], [255, 0, 255], [0, 255, 255]]; + let data = hex(&block_source(palette).concat()); + let render = |interp: &str| { + let content = "BT /F1 1 Tf 0 0.7 Td (A) Tj ET"; + let glyph = "4.6 0 d0 q 4.6 0 0 2.3 0 0 cm /Im0 Do Q"; + let pdf = format!( + "%PDF-1.4\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n\ + 2 0 obj << /Type /Pages /Kids [3 0 R] /Count 1 >> endobj\n\ + 3 0 obj << /Type /Page /Parent 2 0 R /MediaBox [0 0 5 3] /Contents 4 0 R /Resources << /Font << /F1 5 0 R >> >> >> endobj\n\ + 4 0 obj << /Length {} >> stream\n{content}\nendstream endobj\n\ + 5 0 obj << /Type /Font /Subtype /Type3 /FontBBox [0 0 10 10] /FontMatrix [1 0 0 1 0 0] /FirstChar 65 /LastChar 65 /Widths [5] /Encoding << /Differences [65 /a] >> /CharProcs << /a 6 0 R >> /Resources << /XObject << /Im0 7 0 R >> >> >> endobj\n\ + 6 0 obj << /Length {} >> stream\n{glyph}\nendstream endobj\n\ + 7 0 obj << /Type /XObject /Subtype /Image /Width 8 /Height 4 /ColorSpace /DeviceRGB /BitsPerComponent 8 {interp}/Filter /ASCIIHexDecode /Length {} >> stream\n{data}>\nendstream endobj\n\ + trailer << /Root 1 0 R >>\n%%EOF\n", + content.len(), + glyph.len(), + data.len() + 1 + ); + let mut renderer = PageRenderer::new(Arc::new(pdf.into_bytes()), RenderConfig::default()); + let page = renderer.render(RenderRequest { page: 0, kind: RequestKind::Pixels, scale: 1.0, ..Default::default() }); + assert!(page.error.is_none(), "{:?}", page.error); + assert_eq!((page.width, page.height), (5, 3)); + page + }; + // The glyph fully covers columns 0–3 and rows 0–1. + let interior = |p: &RenderedPage| -> Vec<[u8; 3]> { + (0..2).flat_map(|y| (0..4).map(move |x| (y * 5 + x) * 4)).map(|i| [p.rgba[i], p.rgba[i + 1], p.rgba[i + 2]]).collect() + }; + + let omitted = render(""); + for px in interior(&omitted) { + assert!(palette.contains(&px), "non-interpolated glyph image was smoothed to {px:?}"); + } + let enabled = render("/Interpolate true "); + assert!(interior(&enabled).iter().any(|px| !palette.contains(px)), "/Interpolate true glyph image should still be sampled bicubically"); + } + /// From `cargo xtask fuzz`: a CID font whose /W range spans every u32 inserted billions of /// widths (vendored hayro-interpret patch: `MAX_CID`). Must finish quickly. #[test] diff --git a/vendor/README.md b/vendor/README.md index ffb77ca6b..7c9e36340 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -10,6 +10,7 @@ the fix. Vendoring copyleft code is never allowed (plan/adr/0001). | hayro-interpret | 0.7.0 | Apache-2.0 OR MIT | (1) select `/AP /N` appearance states via `/AS` (checkboxes, radios, stateful icons) and honour the NoView flag; (2) Type3 Unicode fallback to `/Encoding` glyph names, then printable ASCII; (3) `Type3Glyph::advance_width`; (4) `InterpreterSettings::ocg_overrides` for viewer layer toggles; (5) soft masks whose group lacks `/CS` were dropped (Chrome gradient text); (6) paint nesting cap `MAX_PAINT_NESTING` for tiling patterns and Type 3 glyphs (self-referencing content overflowed the stack); (7) CID width ranges in `/W` and `/W2` clamped to `MAX_CID` (a `0 4294967295 w` range hung); (8) `InterpreterSettings::hide_comments` skips markup annotations but keeps widgets and links (View ▸ Hide all comments); (9) `image_size_ok`: images and masks over 2^28 pixels are not decoded (a fuzzed `/W 4294967295` stencil mask allocated 4 GiB); (10) `MAX_NESTED_PAINTS`: nested paints (forms, Type 3 glyphs and tiling patterns inside one another) share a per-page budget of 50,000 (a glyph showing eight glyphs of its own font, sixteen deep, hung); (11) depends on skrifa 0.47 instead of 0.42 (upstream read-fonts fixed a Type 1 tokenizer that recursed through runs of numbers: a fuzzed font hung or overflowed the stack), with the one API change (`Charset::glyph_id` returns `Option`); (12) annotation appearances whose `/BBox` or `/Matrix` collapses to a line or a point are skipped (mapping them onto `/Rect` divided by zero and handed the device infinite or NaN matrices); (13) a Highlight annotation without a usable normal appearance is drawn from its `/QuadPoints`, `/C` and `/CA` with Multiply blending, as pdfcraft-annot draws highlights (it was not drawn at all); (14) simple-font `/Widths` (`read_widths`): entries only for codes 0–255 (one entry per code below `/FirstChar` was allocated: `4294967295` asked for 34 GB), an entry that isn't a number leaves its code missing instead of ending the array, and a `/LastChar` below `/FirstChar` gives no widths instead of discarding the font for a standard one; (15) the appearance box is mapped onto `/Rect` corner to corner: the translation now accounts for the scale (an appearance whose box didn't start at the origin and differed in size from `/Rect` was drawn shifted); (16) a clip set by `W`/`W*` takes effect after whichever path-painting operator ends the path (`S`, `f`, `B`, … as well as `n`; ISO 32000-2 §8.5.4): it was applied only on `n`, so `re W* S` clipped nothing and the clip stayed pending for a later, unrelated `n`; (17) `InterpreterSettings::cancelled`: once set, interpretation stops before the next content operator (a render pool sets it for every worker when dropped, after an edit or on closing, and for one worker when the watchdog gives up on its render, so renders whose answers nobody can receive stop instead of running to the end); (18) `MAX_PAGE_CONTENT`: the content a page holds at once (its contents, and the forms, tiling patterns and Type 3 glyph procedures being painted) stays within 512 MiB (`decode_content`; once it runs out, `InterpreterWarning::ContentTruncated` is reported (once per page by pdfcraft-render) so a truncated page is not a clean render; each level gives its bytes back when it finishes): forms nest fifty deep and each level kept its content while the next ran, so a form painting itself around a stream inflating to 256 MiB would have held over 12 GB; and Type 0 sampled functions take at most `MAX_SAMPLE_ENTRIES` (2^21) table points and `MAX_SAMPLE_VALUES` (2^23) samples, read no further than `/Size` asks (256 MiB of 1-bit samples asked for over 8 GB); (19) mesh shadings (types 4–7) are sampled only inside the area being drawn (`ShadingPattern::encode_within`, which the vendored hayro renderer calls with that area plus a pixel), within 8 visits per pixel of it plus 4 per triangle (`TriangleSampler`), and patches are triangulated one at a time: points far off the page were sampled over their whole bounding box, up to 65536 × 65536 entries (a fuzzed 147-byte patch stream; a synthetic page passed 6 GB in six seconds), ten thousand overlapping triangles ran for minutes, and every patch became 722 triangles before any limit; meshes hold at most `MAX_MESH_PATCHES` (2^16) patches and `MAX_MESH_TRIANGLES` (2^20) triangles, a lattice needs two to 2^19 vertices per row (`/VerticesPerRow 0` pushed empty rows for ever; one huge row read the whole stream), and a page samples at most `MAX_PAGE_MESH_TRIANGLES` (2^25) mesh triangles in all (a mesh painted a thousand times was triangulated a thousand times); each cut logs a warning; (20) PDF function construction is limited to 64 levels and 10,000 total nodes with cycle detection; calculator parsing and evaluation share procedure depth/work budgets, integer division/bitshift/rotation/index are panic-free, and fixed-size stack errors propagate; (21) a Type 0 font drawn with a substitute that isn't CID-keyed (it isn't embedded, or its program doesn't load) draws `.notdef` for a CID of an Adobe character collection (Japan1, GB1, CNS1, Korea1) that it can't find by Unicode: hayro took the CID for a glyph index of the substitute, which numbers its glyphs its own way, so the character was drawn as an unrelated one (𠮷 as "Ｑ" in BIZ UDPGothic); (22) a Type 0 font drawn with a substitute finds a character given with a variation selector (`/ToUnicode`, or Adobe-Japan1-UCS2, which maps the JIS X 0208 forms of the kanji JIS X 0213:2004 redrew that way: CID 1247 is 噂 U+E0100) through the substitute's variation sequences, else as the character alone: such a CID found no glyph and was drawn as an unrelated one; (23) backport of hayro 0.8's `gradient` module: `EncodedShadingPattern::as_svg_gradient` turns an axial or radial shading into stops of an sRGB gradient (within 0.01 per channel, a stop at every stitching-function bound via `Function::stitching_bounds`) when a native gradient draws it exactly (extended past the box drawn in; a radial one with no background colour) | (1) `raster::tests::widget_appearance_states`; (2, 3) `xtask text-oracle` on corpus/pdfjs issue918; (4) `raster::tests::layer_override_hides_content`; (5) `raster::tests::soft_mask_without_group_colour_space_is_applied`; (6) `raster::tests::self_referencing_tiling_pattern_terminates`, `raster::tests::self_referencing_type3_glyph_terminates`; (7) `raster::tests::huge_cid_width_ranges_terminate`; (8) `raster::tests::hiding_comments_keeps_fields`; (9) `raster::tests::absurd_mask_and_fax_sizes_are_refused_before_decoding`; (10) `raster::tests::type3_glyphs_that_fan_out_into_themselves_finish`; (11) `raster::tests::type1_font_programs_with_long_runs_of_numbers_load_quickly`; (12) `raster::tests::degenerate_annotation_appearances_are_skipped`; (13) `raster::tests::highlights_without_an_appearance_are_drawn`; (14) `raster::tests::malformed_simple_font_widths_keep_later_widths_and_the_font`, `raster::tests::huge_simple_font_first_char_terminates`; (15) `raster::tests::annotation_appearance_box_maps_onto_rect`; (16) `raster::tests::clipping_path_applies_after_any_painting_operator`; (17) `raster::tests::dropping_the_pool_cancels_its_renders`, `raster::tests::the_watchdog_stops_the_render_it_gives_up_on`; (18) `raster::tests::page_contents_and_nested_forms_share_one_budget`, `raster::tests::content_painted_again_and_again_keeps_drawing`, `raster::tests::sampled_functions_with_billions_of_samples_are_refused`; (19) `raster::tests::mesh_shadings_far_off_the_page_render`, `raster::tests::many_overlapping_mesh_triangles_finish`, `raster::tests::mesh_shadings_with_many_patches_or_no_rows_finish`; (20) `raster::tests::function_limits_calculator_arithmetic_and_depth`, `raster::tests::function_limits_public_construction_work_and_depth`, `raster::tests::function_limits_stitching_cycles_are_refused_and_shared_children_work`, `raster::tests::function_limits_invalid_calculator_keeps_the_page_renderable`; (21) `raster::tests::cids_a_substitute_lacks_are_not_drawn_as_other_glyphs` |; (22) `raster::tests::variation_sequences_draw_their_kanji_in_a_substitute`; (23) `raster::tests::axial_and_radial_shadings_draw_as_native_gradients` | hayro | 0.7.1 | Apache-2.0 OR MIT | (1) `RenderSettings::{x_offset, y_offset}` to render one tile of a large page; (2) images over `MAX_IMAGE_PIXELS` (2^28) are skipped (a fuzzed `/W 4294967295` hung in resampling); (3) `tiling_cell_scale` keeps a tiling pattern's cell pixmap within 3000 px a side whatever its `/XStep`/`/YStep` (a fuzzed step far beyond `/BBox` allocated 2 GB); (4) stroke widths clamped to 4 × (canvas width + height) device pixels (a fuzzed `/LW 9223372036854775807` allocated 10 GB in stroke expansion); (5) `usable_dash_pattern`: a stroke whose dash pattern could cut it into more than `MAX_DASHES_PER_STROKE` (250,000) pieces, counting kurbo's restart of the pattern at every subpath and `ClosePath`, is drawn solid (a fuzzed `/D [[11] 0]` on a line from x = 92234775807 allocated over 5 GB, `[0.000001] 0 d` on a 20 pt line over 10 GB); (6) a dash pattern with a negative or non-finite entry, or a period that isn't positive, is drawn solid (`[-1 -1] 0 d` looped for ever in kurbo); (7) `render_size` and `render_into`: render into a buffer the caller allocates (PdfCraft renders into pixel-aligned memory that the GUI takes over as texture data); `render` is `render_into` on a new pixmap; (8) checked image source/target/RGBA, alpha-premultiplication scratch and intermediate sizes before resampling, finite transforms and exact source/mask buffers; sources wider than u16 may shrink before backend limits, with a 2^20 source-axis cap and conservative 128 MiB filter-planning estimate; an over-limit or failed resize keeps the original image resolution and geometry when the source fits the backend, otherwise skips it, with a logged warning; staging, resampling output/scratch, RGBA conversion and padding buffers use fallible reserves; (9) `may_paint_canvas`: a fill or stroke whose control-point box, grown by how far its paint reaches past the path (half the stroke width times the larger of the miter limit and √2) plus 0.5 user units and 2 pixels, misses the canvas is not drawn, so a tile no longer strokes and fills every path of its page (item 5 of #623); `set_skip_offscreen_paths` turns this off for the regression test; (10) backport of hayro 0.8: shadings that `as_svg_gradient` can represent are painted as a `vello_cpu` linear or two-point radial gradient instead of a texture sampled pixel by pixel through the shading function (InDesign fades are luminosity soft masks of one full-page axial `sh`: 40 on a report page took 15 s at 144 dpi, now under 1 s); without upstream's half-pixel shift, which suits vello_cpu 0.3 but moves 0.0.8's gradients off pixel centres | (1) `raster::tests::tiles_match_full_render`; (2) `raster::tests::absurd_image_dimensions_are_skipped`; (3) `raster::tests::tiling_cells_stay_small_whatever_the_step`; (4) `raster::tests::absurd_predictor_columns_and_line_widths_render`; (5) `raster::tests::dash_patterns_that_cut_a_stroke_into_billions_of_pieces_render`; (6) `raster::tests::invalid_dash_patterns_terminate_and_are_drawn_solid`; (7) `raster::tests::pixels_are_a_plain_renders_bytes_in_a_buffer_a_gui_can_take_over`; (8) `raster::tests::image_resampling_rejects_anisotropic_target_growth`, `raster::tests::image_resampling_bounds_intermediate_before_planning`, `raster::tests::image_resampling_rejects_invalid_sources_and_scales`, `raster::tests::image_resampling_keeps_valid_sizes_and_exact_limits`, `raster::tests::resampling_fallback_preserves_original_geometry_and_pixels`, `raster::tests::image_resampling_wide_sources_shrink_before_backend_side_limits`, `raster::tests::image_resampling_wide_transparent_sources_still_shrink`, `raster::tests::image_resampling_padded_backend_dimensions_stay_checked`, `raster::tests::image_resampling_mismatched_alpha_mask_keeps_pixels_and_placement`; (9) `raster::tests::skipping_paths_off_the_canvas_changes_no_pixel`; (10) `raster::tests::axial_and_radial_shadings_draw_as_native_gradients` | +| hayro | 0.7.1 | Apache-2.0 OR MIT | (1) `RenderSettings::{x_offset, y_offset}` to render one tile of a large page; (2) images over `MAX_IMAGE_PIXELS` (2^28) are skipped (a fuzzed `/W 4294967295` hung in resampling); (3) `tiling_cell_scale` keeps a tiling pattern's cell pixmap within 3000 px a side whatever its `/XStep`/`/YStep` (a fuzzed step far beyond `/BBox` allocated 2 GB); (4) stroke widths clamped to 4 × (canvas width + height) device pixels (a fuzzed `/LW 9223372036854775807` allocated 10 GB in stroke expansion); (5) `usable_dash_pattern`: a stroke whose dash pattern could cut it into more than `MAX_DASHES_PER_STROKE` (250,000) pieces, counting kurbo's restart of the pattern at every subpath and `ClosePath`, is drawn solid (a fuzzed `/D [[11] 0]` on a line from x = 92234775807 allocated over 5 GB, `[0.000001] 0 d` on a 20 pt line over 10 GB); (6) a dash pattern with a negative or non-finite entry, or a period that isn't positive, is drawn solid (`[-1 -1] 0 d` looped for ever in kurbo); (7) `render_size` and `render_into`: render into a buffer the caller allocates (PdfCraft renders into pixel-aligned memory that the GUI takes over as texture data); `render` is `render_into` on a new pixmap; (8) checked image source/target/RGBA, alpha-premultiplication scratch and intermediate sizes before resampling, finite transforms and exact source/mask buffers; sources wider than u16 may shrink before backend limits, with a 2^20 source-axis cap and conservative 128 MiB filter-planning estimate; an over-limit or failed resize keeps the original image resolution and geometry when the source fits the backend, otherwise skips it, with a logged warning; staging, resampling output/scratch, RGBA conversion and padding buffers use fallible reserves; (9) `may_paint_canvas`: a fill or stroke whose control-point box, grown by how far its paint reaches past the path (half the stroke width times the larger of the miter limit and √2) plus 0.5 user units and 2 pixels, misses the canvas is not drawn, so a tile no longer strokes and fills every path of its page (item 5 of #623); `set_skip_offscreen_paths` turns this off for the regression test; (10) `/Interpolate` governs the pre-resize too (#624): a minified image that does not request interpolation is pre-resized with nearest-neighbour, planned without the Catmull-Rom filter limits (`image_resampling_size` takes the flag); a Type 3 glyph image is sampled bicubically only when interpolated; a minified image with a matching soft mask is nearest-sampled straight into premultiplied RGBA | (1) `raster::tests::tiles_match_full_render`; (2) `raster::tests::absurd_image_dimensions_are_skipped`; (3) `raster::tests::tiling_cells_stay_small_whatever_the_step`; (4) `raster::tests::absurd_predictor_columns_and_line_widths_render`; (5) `raster::tests::dash_patterns_that_cut_a_stroke_into_billions_of_pieces_render`; (6) `raster::tests::invalid_dash_patterns_terminate_and_are_drawn_solid`; (7) `raster::tests::pixels_are_a_plain_renders_bytes_in_a_buffer_a_gui_can_take_over`; (8) `raster::tests::image_resampling_rejects_anisotropic_target_growth`, `raster::tests::image_resampling_bounds_intermediate_before_planning`, `raster::tests::image_resampling_rejects_invalid_sources_and_scales`, `raster::tests::image_resampling_keeps_valid_sizes_and_exact_limits`, `raster::tests::resampling_fallback_preserves_original_geometry_and_pixels`, `raster::tests::image_resampling_wide_sources_shrink_before_backend_side_limits`, `raster::tests::image_resampling_wide_transparent_sources_still_shrink`, `raster::tests::image_resampling_padded_backend_dimensions_stay_checked`, `raster::tests::image_resampling_mismatched_alpha_mask_keeps_pixels_and_placement`; (9) `raster::tests::skipping_paths_off_the_canvas_changes_no_pixel`; (10) `raster::tests::non_interpolated_images_are_not_smoothed_when_minified`, `raster::tests::non_interpolated_gray_images_are_not_smoothed_when_minified`, `raster::tests::non_integer_minification_samples_the_same_columns`, `raster::tests::non_integer_minification_samples_colour_and_mask_from_the_same_columns`, `raster::tests::non_interpolated_alpha_images_keep_their_colours_and_mask_when_minified`, `raster::tests::non_interpolated_type3_glyph_images_are_not_smoothed_when_minified`, `raster::tests::image_resampling_nearest_accepts_wide_sources_the_filter_refuses`, `raster::tests::wide_non_interpolated_sources_draw_after_shrinking` | | hayro-jbig2 | 0.3.0 | Apache-2.0 OR MIT | (1) at most 2^28 pixels per bitmap, page bitmap, halftone grid and grayscale image (each side could be 65535: 4.3 billion pixels decoded one by one); (2) at most 2^26 symbol pixels per symbol dictionary (a fuzzed dictionary decoded for minutes); (3) a symbol dictionary's height classes are capped at one per new symbol and its export runs at `2 × symbols + 1`, each plus `EXTRA_EMPTY_STEPS` (1024): an empty height class or a zero-length export run doesn't advance, and past the end of its data the arithmetic decoder can decode them for ever (one changed byte hung the renderer) | (1) `raster::tests::jbig2_regions_of_billions_of_pixels_are_refused`; (2) the nightly `cargo xtask fuzz` finding, which now finishes in about a second; (3) `raster::tests::jbig2_symbol_dictionaries_that_never_advance_terminate` | | lopdf | 0.45.0 | MIT | (1) PNG predictor rows longer than the data are refused before their buffers are allocated (a fuzzed `/Columns 4294967295` allocated two 4 GiB rows), and empty frames return without row buffers; (2) predictor row widths use saturating arithmetic or reject overflow; (3) sub-byte TIFF Predictor 2 scratch is bounded by the samples present in the input instead of the declared `/Colors`, aligned with [lopdf#589](https://github.com/J-F-Liu/lopdf/pull/589) | (1) `inspect::tests::png_predictor_rows_longer_than_the_data_are_refused_before_allocating`, `inspect::tests::empty_png_predictor_frames_do_not_allocate_rows`; (2) `inspect::tests::tiff_subbyte_predictor_row_width_overflow_is_refused`; (3) `inspect::tests::tiff_subbyte_predictor_scratch_is_bounded_by_available_samples`, `inspect::tests::tiff_subbyte_predictors_keep_components_rows_and_padding` | | hayro-syntax | 0.7.2 | Apache-2.0 OR MIT | (1) Page-tree cycle guard in `resolve_pages` (visited set + depth cap): a `/Kids` loop among compressed objects overflowed the stack and aborted the process; (2) `ccitt_size_ok`: CCITT images wider than 2^20 columns or over 2^28 pixels are not decoded (a fuzzed `/Columns 4294967295` allocated 4 GiB); (3) Flate/LZW predictor row widths are saturating `usize`, a zero width is refused and a row longer than the data is not allocated (a fuzzed `/Columns 9223372036854775807` wrapped to a 2^61-byte allocation and aborted); (4) the inline-image end-of-data check (`EI`) doesn't nest inside its own look-ahead and examines at most 256 candidates and steps (50 images with "EI" in their data ran for over ten minutes); (5) a stream whose `/Length` is wrong is recovered only when `stream` is the next token — scanning ahead to a later object's `stream` made an indirect appearance-state dictionary (Quartz checkboxes: `/AP /N` → `<< /Yes … /Off … >>`) render as a non-form, so the widget was skipped; (6) JPX rescaling uses an exact integer sample range for 1–32-bit components (32 shifted past u32, and floating-point maxima at 25–31 bits wrapped to zero), and refuses zero-sized rows; (7) `decode_limit`: Flate (through flate2 and the fallback inflater), LZW and RunLength never write past `MAX_DECODED_STREAM` (256 MiB), or, for the last filter of an image of known size, past twice its pixel bytes (a predictor tag byte per byte), at most 1 GiB; `Stream::decoded_within` for budgeted callers; a page's `/Contents` array shares one `MAX_DECODED_STREAM` (a 2 MB page whose content stream or 8 × 8 image inflated to 2 GB took the renderer past 3 GB in under a second; naming the stream twenty times in `/Contents`, 5 GB); (8) high-precision numbers (jsPDF MediaBox coordinates with over 19 digits) parse without overflowing the u64 mantissa: fractional digits past it are dropped, integer digits past it scale the value (a real, kept finite); (9) large dictionary indexes are built on first use and shared across repeated reads within each PDF (#307); the validated-byte cache is bounded, reader contexts remain separate, repairs and inline/content dictionaries bypass sharing, and small dictionaries stay eager; (10) decoded object-stream slots publish once under contention, cold loading rejects recursive dependencies, and xref repair serializes without holding recursive read guards; this permits one parser per native render pool with private worker caches; (11) `sync.rs`: a poisoned lock is recovered instead of unwrapped (a worker panic no longer cascades into every reader of the same PDF), and xref repair takes a blocking write lock instead of asserting a non-blocking one; (12) `SegmentList` (`util.rs`) returns `None` for an out-of-range index instead of panicking; (13) a page's `/UserUnit` scales `render_dimensions` and `initial_transform`, so the page and everything on it are sized in points, as Acrobat shows them; it is read as Acrobat reads it (the page's own entry, not inherited; a number from 1 up, at most 75,000; anything else counts as 1), and a page without it keeps exactly the transform it had; (14) revision 2–4 passwords are tried as given and then in PDFDocEncoding (`legacy_passwords` in `crypto/mod.rs`, which resolves the upstream `TODO: Convert to PDFDocEncoding`): passwords arrive as UTF-8 text, so a password with characters outside ASCII (`Çok güzel`, `ılık€`) written in PDFDocEncoding, as ISO 32000-2 §7.6.4.3.2 asks and qpdf and Acrobat write it, was always wrong; (15) page content is read a piece at a time (`page::ContentReader`, `Page::content_reader`): plain streams and Flate streams without a predictor are decoded as they are read, with a budget of 64 times their compressed size and never less than `MAX_DECODED_STREAM` (a stream that expands past it is cut and reported); other streams are decoded whole, as before, and share `MAX_DECODED_STREAM`. The content tokenizer reads a window at a time (`UntypedIter::new_window`, `TypedIter::needs_more`, `TypedIter::committed`): an instruction that runs past the window is not decided until more data follows, which `Reader` records by flagging reads and `at_end` past the end of the data, including through the clones the parser makes. The Flate decoder keeps its own 32 KiB history, so it pauses at any output size. `ContentReader::new` reuses raw/decrypted stream bytes for budget accounting and piece creation, and `decoded_raw_within` applies the existing Whole-stream filters and limits to those bytes without decrypting twice. | (1) `cos/tests/writer.rs::page_tree_loops_in_object_streams_do_not_crash_readers`; (2) `raster::tests::absurd_mask_and_fax_sizes_are_refused_before_decoding`; (3) `raster::tests::absurd_predictor_columns_and_line_widths_render`; (4) `raster::tests::inline_images_with_ei_in_their_data_parse_in_linear_time`; (5) `raster::tests::indirect_appearance_state_dict_is_not_another_stream`; (6) `raster::tests::jpx_stream_bit_depth_boundaries_do_not_panic`, `raster::tests::jpx_32_bit_image_does_not_prevent_other_page_content_from_rendering`, `raster::tests::jpx_gray_rgb_and_alpha_keep_eight_bit_samples`, `raster::tests::jpx_streams_reject_out_of_range_bit_depths`; (7) `raster::tests::decompression_bombs_stop_at_the_stream_limit`, `raster::tests::page_contents_and_nested_forms_share_one_budget`; (8) `inspect::tests::jspdf_high_precision_mediabox_does_not_overflow_dimensions`, `object::number::tests::high_precision_float_does_not_overflow_mantissa` (hayro-syntax); (9) `object::dict::lazy_index_tests`, `raster::tests::large_resource_indexes_preserve_pixels_and_text`; (10) `data::tests`, `xref::tests::concurrent_cold_object_stream_reads_all_succeed`, `raster::tests::shared_parser_is_lazy_and_initializes_once_under_contention`; (11) `data::tests::panicking_initializer_wakes_waiters_and_prevents_retries`, `xref::tests::concurrent_cold_object_stream_reads_all_succeed`; (12) `util::tests::segment_list_rejects_out_of_range_indices`; (13) `raster::tests::user_unit_scales_the_page_and_everything_on_it`; (14) `crypto::pdfcraft_password_tests`, `pdfcraft-engine` `tests::legacy_passwords_with_turkish_characters_open`; (15) `content::tests::windows_keep_every_instruction_at_every_split`, `content::tests::windows_keep_every_instruction_in_pieces_of_any_size`, `content::tests::windows_match_the_slice_on_random_content`, `content::tests::windows_drop_blanks_and_keep_a_comment_that_may_go_on`, `page::content_reader_tests::content_past_the_cap_is_read_to_the_end`, `page::content_reader_tests::a_stream_that_expands_past_the_budget_is_cut_there`, `page::content_reader_tests::a_small_expansion_under_the_cap_is_not_cut`, `raster::tests::page_content_past_the_old_cap_renders`, `raster::tests::content_reader_returns_the_same_bytes_in_any_pieces`, `raster::tests::content_bombs_stop_at_the_budget_and_say_so`, `page::content_reader_tests::plain_and_whole_pieces_keep_their_bytes`, `page::content_reader_tests::repeated_content_reference_counts_compressed_bytes_once`, `page::content_reader_tests::whole_cap_still_counts_later_unique_streams` diff --git a/vendor/hayro/src/renderer.rs b/vendor/hayro/src/renderer.rs index 3757cf7a4..56e4fc632 100644 --- a/vendor/hayro/src/renderer.rs +++ b/vendor/hayro/src/renderer.rs @@ -115,17 +115,23 @@ fn resampling_scratch_byte_len( /// PdfCraft patch: validate output, crossed intermediate and filter-work bounds before planning. /// Source width × target height also bounds PicScale's smaller single-threaded four-row scratch. +/// Nearest-neighbour (`!interpolate`) has none of those: it copies source pixels into the target, +/// so only the source and target buffers are bounded. fn resampling_byte_len( source: (u32, u32), target: (u32, u32), channels: usize, data_len: usize, max_pixels: u64, + interpolate: bool, ) -> Option { if source_byte_len(source.0, source.1, channels, max_pixels)? != data_len { return None; } let target_len = image_byte_len(target.0, target.1, channels, max_pixels)?; + if !interpolate { + return Some(target_len); + } resampling_scratch_byte_len(source, target, channels, max_pixels)?; source_byte_len(source.0, target.1, channels, max_pixels)?; if source.0 > MAX_RESAMPLING_SOURCE_SIDE || source.1 > MAX_RESAMPLING_SOURCE_SIDE { @@ -142,6 +148,7 @@ fn resampling_byte_len( /// PdfCraft patch: image dimensions selected before allocating resampling buffers. /// Exported for PdfCraft's small, metadata-only regression tests. `None` rejects invalid /// sources/scales or an over-budget target/intermediate; the caller may retain a valid source. +/// `interpolate` selects the Catmull-Rom limits; nearest-neighbour (`false`) skips them. #[doc(hidden)] pub fn image_resampling_size( width: u32, @@ -151,6 +158,7 @@ pub fn image_resampling_size( x_scale: f32, y_scale: f32, max_pixels: u64, + interpolate: bool, ) -> Option<(u32, u32)> { if !x_scale.is_finite() || !y_scale.is_finite() || x_scale <= 0.0 || y_scale <= 0.0 { return None; @@ -166,7 +174,14 @@ pub fn image_resampling_size( } else { (width, height) }; - resampling_byte_len((width, height), target, channels, data_len, max_pixels)?; + resampling_byte_len( + (width, height), + target, + channels, + data_len, + max_pixels, + interpolate, + )?; Some(target) } @@ -177,6 +192,49 @@ fn image_buffer(len: usize) -> Option> { Some(out) } +/// PdfCraft patch (#624): the source index that PicScale's nearest-neighbour plan copies for +/// destination `index` of `dst` samples taken from `src`. It is the same fixed-point centre +/// sampling as `ResampleNearestPlan`, so these are the samples a nearest resize would copy. +fn nearest_source_index(src: u32, dst: u32, index: u32) -> usize { + let step = (u64::from(src) << 32) / u64::from(dst); + ((u64::from(index) * step + (step >> 1)) >> 32) as usize +} + +/// PdfCraft patch (#624): nearest-resizes a colour image and its same-sized soft mask straight +/// into premultiplied RGBA of `target` size. Colour and mask come from the same source pixel, so +/// this equals a nearest resize of the expanded RGBA followed by premultiplying each pixel. +fn nearest_premultiplied_rgba( + color: &ImageData, + alpha: &[u8], + source: (u32, u32), + target: (u32, u32), +) -> Option> { + let (samples, channels) = match color { + ImageData::Luma(luma) => (luma.data.as_slice(), 1), + ImageData::Rgb(rgb) => (rgb.data.as_slice(), 3), + }; + let mut out = image_buffer(image_byte_len(target.0, target.1, 4, MAX_IMAGE_PIXELS)?)?; + for ty in 0..target.1 { + let sy = nearest_source_index(source.1, target.1, ty); + for tx in 0..target.0 { + let si = sy * source.0 as usize + nearest_source_index(source.0, target.0, tx); + let [r, g, b] = match samples.get(si * channels..si * channels + channels)? { + [v] => [*v; 3], + [r, g, b] => [*r, *g, *b], + _ => return None, + }; + let a = *alpha.get(si)?; + out.extend_from_slice( + &AlphaColor::from_rgba8(r, g, b, a) + .premultiply() + .to_rgba8() + .to_u8_array(), + ); + } + } + Some(out) +} + /// PdfCraft patch: most pieces one dashed stroke may be cut into. Stroke expansion keeps every /// dash, so a pattern that is tiny next to its path asks for billions: a fuzzed `/D [[11] 0]` on /// a line from x = 92234775807 allocated over 5 GB, and `[0.000001] 0 d` on a 20 pt line over @@ -483,9 +541,19 @@ impl Renderer { new_width: u32, new_height: u32, pixel_format: ImagePixelFormat, + interpolate: bool, ) -> (Vec, u32, u32) { + // PdfCraft patch (#624): `/Interpolate` governs the pre-minification pass too. Using + // Catmull-Rom here for an image that did not request interpolation blends hard edges + // before ImageQuality::Low gets a chance to sample it. Keep the pre-resize (and its + // bounded memory/performance behaviour), but use nearest-neighbour when interpolation + // is disabled. PDF's default for `/Interpolate` is false. + let nearest = Scaler::new(ResamplingFunction::Nearest); + let scaler = if interpolate { &self.scaler } else { &nearest }; let resized = match pixel_format { ImagePixelFormat::Luma => self.resize_image_data_impl::<1>( + scaler, + interpolate, data, src_width, src_height, @@ -496,6 +564,8 @@ impl Renderer { }, ), ImagePixelFormat::Rgb => self.resize_image_data_impl::<3>( + scaler, + interpolate, data, src_width, src_height, @@ -506,6 +576,8 @@ impl Renderer { }, ), ImagePixelFormat::Rgba => self.resize_image_data_impl::<4>( + scaler, + interpolate, data, src_width, src_height, @@ -529,6 +601,8 @@ impl Renderer { fn resize_image_data_impl( &self, + scaler: &Scaler, + interpolate: bool, data: Vec, src_width: u32, src_height: u32, @@ -549,19 +623,25 @@ impl Renderer { N, data.len(), MAX_IMAGE_PIXELS, + interpolate, )?; let source_size = ImageSize::new(src_width as usize, src_height as usize); let target_size = ImageSize::new(new_width as usize, new_height as usize); let src = ImageStore::::from_slice(&data, source_size.width, source_size.height) .ok()?; - let plan = plan(&self.scaler, source_size, target_size).ok()?; + let plan = plan(scaler, source_size, target_size).ok()?; let scratch_len = plan.scratch_size(); - let scratch_bound = resampling_scratch_byte_len( - (src_width, src_height), - (new_width, new_height), - N, - MAX_IMAGE_PIXELS, - )?; + // Nearest-neighbour needs no scratch, so any scratch it reports is refused. + let scratch_bound = if interpolate { + resampling_scratch_byte_len( + (src_width, src_height), + (new_width, new_height), + N, + MAX_IMAGE_PIXELS, + )? + } else { + 0 + }; if scratch_len > scratch_bound { return None; } @@ -643,6 +723,7 @@ impl Renderer { x_scale, y_scale, MAX_IMAGE_PIXELS, + interpolate, ) { Some(target) => target, None => { @@ -658,17 +739,33 @@ impl Renderer { (source_width, source_height) } }; - if requested_resize && self.in_type3_glyph { + // PdfCraft patch (#624): High is bicubic and would blend the nearest pre-resize of an image + // that did not request interpolation, so only interpolated glyph images are promoted. + if requested_resize && self.in_type3_glyph && interpolate { quality = ImageQuality::High; } let needs_resize = (new_width, new_height) != (source_width, source_height); + // PdfCraft patch (#624): a minified image with a soft mask that is not interpolated is + // nearest-sampled straight into premultiplied target RGBA. That skips the full-resolution + // RGBA copy below and the premultiply pass after it. + let direct = match &alpha_data { + Some(alpha) if needs_resize && !interpolate => nearest_premultiplied_rgba( + &image_data, + &alpha.data, + (source_width, source_height), + (new_width, new_height), + ), + _ => None, + }; + let premultiplied = direct.is_some(); // Preserve the single-channel/RGB fast paths. With alpha, expand directly to RGBA; // every source and alpha length was validated before zipping or allocating. - let (data, format) = match (image_data, alpha_data) { - (ImageData::Luma(luma), None) => (luma.data, ImagePixelFormat::Luma), - (ImageData::Rgb(rgb), None) => (rgb.data, ImagePixelFormat::Rgb), - (image, Some(alpha)) => { + let (data, format) = match (direct, image_data, alpha_data) { + (Some(rgba), _, _) => (rgba, ImagePixelFormat::Rgba), + (None, ImageData::Luma(luma), None) => (luma.data, ImagePixelFormat::Luma), + (None, ImageData::Rgb(rgb), None) => (rgb.data, ImagePixelFormat::Rgb), + (None, image, Some(alpha)) => { let Some(len) = source_byte_len(source_width, source_height, 4, MAX_IMAGE_PIXELS) else { return; @@ -702,7 +799,9 @@ impl Renderer { (rgba, ImagePixelFormat::Rgba) } }; - let (data, mut img_width, mut img_height) = if needs_resize { + let (data, mut img_width, mut img_height) = if premultiplied { + (data, new_width, new_height) + } else if needs_resize { self.resize_image_data( data, source_width, @@ -710,6 +809,7 @@ impl Renderer { new_width, new_height, format, + interpolate, ) } else { (data, source_width, source_height) @@ -746,7 +846,7 @@ impl Renderer { } rgba }; - if has_alpha { + if has_alpha && !premultiplied { let (chunks, _) = rgba_data.as_chunks_mut::<4>(); for chunk in chunks { let [r, g, b, a] = *chunk;