Files
designcraft/crates/pdf/tests/support/image_content_cache_contract.rs
T
aiongg 18ae8e4761 Merge upstream main a184db6f8 with our 15 PRs (batch-0) into next
Conflicts resolved per file (both sides kept unless noted):
crates/engine/src/atomic.rs | 1 | main's: `write_file` removed (main routes command writes through `crate::io::write_file`); its one caller in file.rs now uses `crate::io::write_file`
crates/engine/src/cmd/datamerge/fill.rs | 1 | next's `Graphic` literal (has `clip` and `wrap`, which next's `Graphic` carries)
crates/engine/src/cmd/datamerge/mod.rs | 1 | main's `read_path_capped` (crate::io metadata/read_capped, roots checked); next's capped read is the same behaviour
crates/engine/src/cmd/datamerge/parse.rs | 1 | main's (`crate::io::metadata`, `crate::io::Metadata`)
crates/engine/src/cmd/edit.rs | 1 | next's `spread_param(p, "edit.paste")` (the second argument is the command id on both sides)
crates/engine/src/cmd/export.rs | 3 | main's: EPUB params doc, `toc_title` once (main's position; next's duplicate dropped)
crates/engine/src/cmd/file.rs | 7 | place doc: next's (lists page/rect/autoflow params #803 checks); next's recent-file functions + main's `foreign_document`; next's open (load_bytes, warnings, non-DesignCraft refusal) with main's checked `crate::io::read_file` for the bytes; main's `check_write` be
crates/engine/src/cmd/find.rs | 7 | main's Find scope (FindContext, scope/selection/story, continuation, UTF-8 repair) on next's `designcraft_compose::grep::Grep` (dialect GREP): find uses `find_all` capped at MAX_MATCHES, change uses `replacements`/`find_all` (literal change text not expanded), fin
crates/engine/src/cmd/fonts.rs | 1 | next's (`has_style`, resolved/replacement face); `has_style` already compares styles ignoring spacing and case, which is main's `same_style` fix; main's test kept
crates/engine/src/cmd/interchange.rs | 1 | next's `import_idml_report_with_previews` (previews for unreadable links)
crates/engine/src/cmd/layout.rs | 8 | pages.insert: main's overflow-safe `after` + next's checked `parent_ref`; main's duplicateSpread doc; layout.section: next's `SectionEdit` (already keeps unnamed settings, #717) with main's `d.repaginate()` moved into `SectionEdit::apply` (remove and set paths),
crates/engine/src/cmd/links.rs | 5 | next's links.list (no doc clone); main's `text_status` via crate::io; `use std::io::Read` dropped (unused after main's read_capped); test literals main's. `link_missing` (next) uses `crate::io::exists` for the file-guard scan
crates/engine/src/cmd/object.rs | 4 | object.fill/stroke tint-alone: main's (23e1680e7; out-of-range tint is an error, which main's test asserts); object.fit doc: next's (lists `axis`)
crates/engine/src/cmd/paths.rs | 1 | next's (shatai transform on outlines)
crates/engine/src/cmd/place_text.rs | 1 | next's `add_flow_frame` (used by autoflow)
crates/engine/src/cmd/preflight.rs | 2 | next's overset/unplacedStory issue (its `overset_location` already applies the parent transform main's #738 fix adds); next's two test modules kept with main's
crates/engine/src/cmd/scripts.rs | 1 | combined: next's `in_undo_step = false` (#406) + main's full rollback of a failed script (#709)
crates/engine/src/cmd/style.rs | 14 | param docs next's (gradient swatch.create, swatch stops, model colours); create_para next's; rename_style main's structure (rename entry, then `redirect_style_refs`), redirect has next's full reference set (cells, defaults, notes, TOC) + main's never-based-on-it
crates/engine/src/cmd/text.rs | 10 | main's selectSentence/Paragraph/Story + select_around; next's selectionAttrs (mixed) + main's openTypeFeatures/type.feature; main's comments; tracked typing: next's `reserve_command_text` + main's `insert_format_at`; empty-paragraph mark formatting main's (with `
crates/engine/src/cmd/thread.rs | 1 | next's `spread_param(p, "text.thread")`
crates/engine/src/dtd.rs | 1 | next's linear, depth-bounded `expand_parameter_entities` with main's budget (input + 1 MiB, `MAX_EXPANDED_BYTES`) and message ("expand the DTD beyond"); 16 MiB constant removed; both sides' tests pass on message
crates/engine/src/guard.rs | 2 | main's whole-transaction snapshot (docs, active, journal; #742) + next's `in_undo_step` restore; tests both
crates/engine/src/lib.rs | 5 | LoadedGraphic doc next's; next's `new_document_preview`; execute: main's `discard_stale_find_scope()` before next's nested-undo run; modules both (tests_autosize, tests_file_guard, tests_params, tests_roots)
crates/engine/src/recovery.rs | 1 | next's test (superset of main's assertion)
crates/engine/src/tests.rs | 4 | moved tests deduplicated (identical on both sides); next's preflight and direct-selection/kerning tests + main's style-delete, locked-frame and baseline-fit tests
crates/engine/src/tests_idml.rs | 3 | main's order (drop cap and margins tests identical on both sides, once each)
crates/ui-egui/src/canvas.rs | 3 | next's screen_options/DisplayKey block and tests kept; two tests that auto-merge had added twice (parent_guides_on_a_page_are_not_picked_there, baseline_grid_lines_are_the_ones_on_the_page) kept once; main's `typing`/`screen_at`/`click` helpers and its tests clicks
crates/ui-egui/src/control.rs | 3 | main's `count` check and pending budget (control queue + synthetic queue); exact-budget test runs both sides' cases (click 255 on 9,492 pending; drag 9492×255)
crates/ui-egui/src/cursors.rs | 1 | main's (same Pen cursor set)
crates/ui-egui/src/dialogs.rs | 14 | dialog body (newDocument … alert match) is next's text, with main's Find/Change scope reset (`set_field`, `reset_find_scope`, `find_change_params`) and main's Create Guides / Margins and Columns arms ported in; `Dialog::new` ruby section (next) + main's `set_fi
crates/ui-egui/src/i18n.rs | 7 | ka and pl modules, languages, statics and lookups both; `category_first` covers uk, ru, pl, ka and `count_label` keeps next's Czech plurals; shared TABLE union; next's duplicate rows for Auto, Number:, Gutter:, Top:, Bottom:, Inside:, Outside:, Left:, Right: dropped
crates/ui-egui/src/i18n/ar.rs | 2 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/it.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/ja.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/pt_br.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/i18n/uk.rs | 1 | union of rows, no duplicate keys
crates/ui-egui/src/icons.rs | 2 | both tests (main's typography icon, next's distribute icons)
crates/ui-egui/src/lib.rs | 11 | UiState: next's tabs_panel + main's last_color/last_gradient; `cursors` field once; next's SVG paste and paste-on-spread-in-view; next's extensionless document open; opens_as_document next's comment; tests both (next's control bar / key-name tests, main's rich black
crates/ui-egui/src/menus.rs | 15 | app.language doc next's text with pl and ka; UI_COMMANDS both (next's Tabs, Toggle Presentation, Apply None text; main's panel commands, Apply Color, Apply Gradient); Edit › Interface Language stays out (next moved it to Preferences); Type menu main's order with
crates/ui-egui/src/panels/glyphs.rs | 1 | next's (already has main's scroll-bar fix); the scroll-bar test module auto-merge had added twice kept once
crates/ui-egui/src/panels/layers.rs | 3 | next's drag-and-drop `object_rows`, with main's features ported into it: selection reveal (layer opens, row scrolls into view once), selected rows highlighted (also a group whose member is selected), double-click rename in place (`object.rename` queued like
crates/ui-egui/src/panels/mod.rs | 6 | tabs + typography modules and color_panel_tests; SelInfo has wrap_side/wrap_contour and wrap_offsets (offsets from the graphic's own wrap when it is selected); next's swatch_picker returning the chip response; next's content_selection_tests
crates/ui-egui/src/panels/pages.rs | 1 | next's (parents dragged by id)
crates/ui-egui/src/panels/properties.rs | 4 | next's swatch popup (Apply To, Tint); main's four wrap offsets then next's Wrap To / Contour Type; test fixtures main's (`..Default::default()`, no unused builder)
crates/ui-egui/src/panels/swatches.rs | 3 | main's Delete Swatch button + next's New Swatch comment; next's draggable rows; click: main's PICKED + fill/stroke in front, with next's no-apply on double-click
crates/ui-egui/src/toolbar.rs | 2 | main's Apply Color / Gradient / None wells and functions; next's apply_none doc line
crates/compose/src/lib.rs | 5 | next's line loop kept (mark_leading + last_line_mark, wrap segments/carry, grid gyoudori); main's mark-chars base_leading block (auto-merged) stays beside it. `fits`: next's #106 rule (baseline fit for horizontal frames, full descent for paths, vertical text, footnote
crates/compose/src/tests.rs | 5 | next's tests (tombstone set, sliver/one-sided/contour/clipping wrap tests, borders, lists, kenten, grid, anchored wrap, balance, shaped frames) plus main's an_empty_last_paragraph_isnt_overset; main's wrap_object_beside_one_narrow_column_leaves_the_other_alone re-ad
crates/doc/src/assets.rs | 1 | main's doc comment (same meaning)
crates/doc/src/build.rs | 3 | parent_page_for: next's parent_page_for_side (RTL-aware); single_sided_page_shows_first_parent_page test kept once, at main's position
crates/doc/src/item.rs | 1 | next's rotated_group_bounds_follow_the_children_outlines test kept
crates/doc/src/lib.rs | 1 | next's kerning_increment field kept; main's "Bulleted & Numbered" wording
crates/doc/src/page.rs | 1 | next's outer_page_indices + parent_page_for_side (integration of parent-margins with rtl-master-sides); main's parent_page_index dropped, its only caller (build.rs) uses parent_page_for_side
crates/doc/src/slice.rs | 5 | extract: next's `marked()` (get-based, fix_notes/fix_endnotes/fix_marks; main's version indexed slices and could panic); insert_story: main's take() limit on endnote/editorial payload copies with next's id comment, redundant `let ne`/`let nn` dropped; main's excess_note
crates/geom/src/corners.rs | 1 | next's box_outline_rounds_only_closed_corners test kept
crates/render/src/damage.rs | 1 | next's wrapping-anchored-object damage test kept
crates/render/src/fx.rs | 2 | feather: next's choke/corners sigma+join inside main's structure (body and clip at device resolution, with_filters(.., None)); inner glow centre: next's blend `mix` with main's clip argument (bp, xf)
crates/render/src/lib.rs | 3 | next's layer comment; next's front baseline grid draw after items; gradient match on g.kind (main's tuple scrutinee did not match the single-pattern arms)
crates/render/src/text.rs | 5 | paint_glyphs: main's paint_stroke closure structure with next's stroke overprint (overprinting helper, stroke `(TextPaint, bool)`); callers pass next's overprint_fill/overprint_stroke
crates/render/tests/placed_pdf.rs | 1 | main's `near` helper version
crates/tools/src/lib.rs | 1 | main's (PenConvert already declared below, avoids a duplicate variant)
crates/tools/src/pen.rs | 1 | main's module doc
crates/tools/src/select.rs | 1 | next's Drag::Corner variant (live corners) kept
crates/tools/src/tests.rs | 4 | next's tests (content drag, live corners, table border drag, eyedropper matchFrom, fitting handles, pen cursors once); eyedropper_ignores_inactive keeps next's samples_image check (main's exact-JSON compare lacks matchFrom) with main's `..Default::default()` Asset lit
crates/tools/src/text.rs | 2 | next's table border drag (BorderDrag, border_at) kept, then main's comment on locked text frames
crates/tools/src/xform.rs | 2 | main's explicit `Vec<&Item>` for shown children; next's eyedropper matchFrom (integration 796e9d713)
Cargo.toml | 2 | main's craft-pdf workspace dep added (craft-print stays once, in next's craft-libs block); [patch.crates-io] keeps next's winit (rust-windowing #4694 backport) and adds main's krilla patch; main's skylartaylor winit left out (see UNSURE 1)
Cargo.lock | 1 | union: next's craft-atomic and craft-cms entries plus main's craft-pdf entry; needs `cargo` normalisation
README.md | 1 | Open bullet combines INDD import via indd-utils (next) and editable PowerPoint export (main); main's paragraph break kept
contributors/people.toml | 1 | both people kept (switch87 from next, Nmarello from main)
apps/designcraft-cli/src/main.rs | 4 | next's `Export` enum dispatch kept; main's .pptx export added as `Export::Pptx` (run prints slides and warnings, script runs file.exportPptx); main's `--pdf-options` null-as-{} parse; usage lines list .pptx
apps/designcraft/src/main.rs | 3 | `startup.leave()` right after `app.ui` (main #380) and next's macOS `sync_movable` kept after the IME discard; next's Apple Events install kept; main's macOS Dock Quit `with_close_requested_on_terminate` block left out (needs the skylartaylor winit; UNSURE 1)
crates/fonts/src/fontdb.rs | 9 | FONT6 aliases (next) combined with #911 WWS names (main): ScannedFace and both CatalogEntry constructors carry `wws` and `aliases`; `canonical_family` falls back to WWS family names; `exact_style_traits` canonicalises then tries typographic, then WWS names (`named_st
crates/format/src/lib.rs | 1 | tests: both sides kept (next's r7a nullable-default tests; main's oversized ZIP entry/asset/entry-count tests)
crates/idml/src/import.rs | 11 | main's bounded `Package` reader under next's `import_idml_report_with_previews` (metadata read through `pkg.part`); next's `tab_list_repaired` kept; ruler origin: next's `settings.ruler_origin`, and main's guide import reads it (main's private `RulerOrigin` enum and
crates/idml/src/tests.rs | 6 | item-level union: all next tests plus main's new ones (ruler guides, package limits, CJK leading model, liquid page rules module, mojikumi); no test dropped
crates/mcp/src/backend.rs | 1 | test comment merged from both
crates/pdf/src/tests.rs | 1 | tests: both sides kept
crates/pdf/src/text.rs | 4 | next's (skew `tan`, cluster `start`, ruby overprint warning); main had no change here beyond base
crates/textimport/src/docx.rs | 5 | next's (ListCounter integration for list levels, page-break test position); main's side was the older form of the same code
crates/epub/src/lib.rs | 30 | non-test code is next's (StoryWriter holds img_src/images/no_alt/heading_ids; covers main's #787/#791/#782 fixes, plus #314 group transforms, anchored images in images_without_alt, endnote story skipped in the TOC); tests: next's set plus main's extra css_weight_style a
docs/control-protocol.md | 2 | next's rows (ui.paste, count 1–255, documentGrid) and wording
docs/file-format-parity.md | 1 | rows combined (next's ICC notes, main's TIFF indexed colour)
docs/gaps.md | 2 | status change notes unioned; Flex Layout removed from missing (main implemented it), next's Parent Options sentence kept
docs/localization-parity.md | 4 | Polish and Georgian rows; 5 languages beyond the twelve; file list includes cs and ka; both history rows
docs/roadmap.md | 1 | M1 next's (#186 fixed on next), M2 main's IME wording
docs/target-app-parity.md | 6 | next's status line; File formats row next's, UI/UX row main's (IME no longer failing); UI line next's plus main's Swatches detail; one Page tool line (main's fuller one); Load styles and main's fuller Pathfinder line both kept, main's duplicate short Pathfinder line r
docs/ui-parity.md | 1 | IME row main's, Font menu row next's

i18n/fr.rs: five rows dropped that main's shared table now has (Row, Open Path, Flex Layout, Current Page Number, Rulers).
2026-10-16 03:09:22 +00:00

332 lines
16 KiB
Rust

//! Public-export controls run against the production RandomState cache, independent of the
//! unit-only forced-collision hasher. Also included by the library unit-test target.
//! All images and placed PDFs are tiny procedural fixtures.
use std::sync::Arc;
use craft_pdf::write::backend as krilla;
use designcraft_compose::Cache;
use designcraft_doc::{Asset, AssetId, Content, Document, Graphic, Item, ItemId, Shape, SpreadRef};
use designcraft_geom::{Affine, Rect, shapes};
use designcraft_pdf::{BookletOptions, PdfOptions, Standard, export_booklet, export_pdf, export_pdf_with_report};
use crate::image_fixtures as fixtures;
fn png(w: u32, h: u32, color: [u8; 4]) -> Vec<u8> {
let img = image::RgbaImage::from_pixel(w, h, image::Rgba(color));
let mut bytes = Vec::new();
img.write_to(&mut std::io::Cursor::new(&mut bytes), image::ImageFormat::Png).unwrap();
bytes
}
fn place(d: &mut Document, data: Vec<u8>, x: f64) {
place_named(d, data, x, &format!("original-{x}.png"), "image/png", 0);
}
fn place_named(d: &mut Document, data: Vec<u8>, x: f64, name: &str, mime: &str, page: u32) {
let aid = AssetId(d.alloc());
d.assets.insert(aid, Arc::new(Asset { id: aid, name: name.into(), mime: mime.into(), data: Arc::new(data), page, ..Default::default() }));
let id = ItemId(d.alloc());
let mut item = Item::new(id, d.default_layer(), Shape::Rectangle, shapes::rectangle(Rect::new(x, 36.0, x + 20.0, 56.0)));
item.stroke.weight = 0.0;
item.content = Content::Graphic(Graphic {
asset: aid,
size: (20.0, 20.0),
xf: Affine::translate((x, 36.0)),
clip: None,
auto_fit: Default::default(),
fit_align: 4,
crop: [0.0; 4],
wrap: Default::default(),
});
d.insert_item(SpreadRef::Doc(0), item, None).unwrap();
}
#[derive(Debug)]
struct DrawnImage {
size: (u32, u32),
rgb: [u8; 3],
alpha: u8,
x: f64,
}
fn drawn_images(bytes: Vec<u8>) -> Vec<DrawnImage> {
drawn_content(bytes).0
}
fn drawn_content(bytes: Vec<u8>) -> (Vec<DrawnImage>, Vec<([u8; 4], kurbo::Rect)>) {
use hayro_interpret::font::Glyph;
use hayro_interpret::{
BlendMode, ClipPath, Context, Device, GlyphDrawMode, Image, ImageData, InterpreterCache, InterpreterSettings, Paint, PathDrawMode, SoftMask,
interpret_page,
};
use kurbo::Shape as _;
struct Sink(Vec<DrawnImage>, Vec<([u8; 4], kurbo::Rect)>);
impl Device<'_> for Sink {
fn set_soft_mask(&mut self, _: Option<SoftMask<'_>>) {}
fn set_blend_mode(&mut self, _: BlendMode) {}
fn draw_path(&mut self, path: &kurbo::BezPath, transform: kurbo::Affine, paint: &Paint<'_>, mode: &PathDrawMode) {
if let (Paint::Color(color), PathDrawMode::Fill(_)) = (paint, mode) {
self.1.push((color.to_rgba().to_rgba8(), (transform * path.clone()).bounding_box()));
}
}
fn push_clip_path(&mut self, _: &ClipPath) {}
fn push_transparency_group(&mut self, _: f32, _: Option<SoftMask<'_>>, _: BlendMode) {}
fn draw_glyph(&mut self, _: &Glyph<'_>, _: kurbo::Affine, _: kurbo::Affine, _: &Paint<'_>, _: &GlyphDrawMode) {}
fn draw_image(&mut self, image: Image<'_, '_>, transform: kurbo::Affine) {
if let Image::Raster(image) = image {
image.with_rgba(
|pixels, alpha| {
let size = (pixels.width(), pixels.height());
let rgb = match pixels {
ImageData::Rgb(p) => [p.data[0], p.data[1], p.data[2]],
ImageData::Luma(p) => [p.data[0]; 3],
};
self.0.push(DrawnImage { size, rgb, alpha: alpha.map_or(255, |p| p.data[0]), x: transform.as_coeffs()[4] });
},
None,
);
}
}
fn pop_clip_path(&mut self) {}
fn pop_transparency_group(&mut self) {}
}
let pdf = hayro_syntax::Pdf::new(bytes).unwrap();
let cache = InterpreterCache::new();
let mut sink = Sink(Vec::new(), Vec::new());
for page in pdf.pages().iter() {
let mut context =
Context::new(kurbo::Affine::IDENTITY, kurbo::Rect::new(0.0, 0.0, 1000.0, 1000.0), &cache, pdf.xref(), InterpreterSettings::default());
interpret_page(page, &mut context, &mut sink);
}
(sink.0, sink.1)
}
#[test]
fn repeated_svg_assets_keep_vector_paths_and_placement() {
let svg = br#"<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><rect x="2" y="3" width="5" height="7" fill="red"/></svg>"#;
let mut d = Document::new(&Default::default());
for (name, x) in [("vector-a.svg", 36.0), ("vector-b.svg", 66.0)] {
place_named(&mut d, svg.to_vec(), x, name, "image/svg+xml", 0);
}
let report = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
assert!(report.warnings.is_empty(), "{:?}", report.warnings);
assert!(image_objects(&report.bytes).is_empty(), "placed SVGs must stay vector artwork");
let (images, paths) = drawn_content(report.bytes);
assert!(images.is_empty());
let red: Vec<_> = paths.into_iter().filter(|(color, _)| *color == [255, 0, 0, 255]).collect();
assert_eq!(red.len(), 2, "both SVG assets must paint the original rectangle");
for ((_, bounds), x) in red.iter().zip([38.0, 68.0]) {
assert!((bounds.x0 - x).abs() < 1e-6, "{bounds:?}");
assert!((bounds.width() - 5.0).abs() < 1e-6, "{bounds:?}");
assert!((bounds.height() - 7.0).abs() < 1e-6, "{bounds:?}");
}
}
#[test]
fn repeated_encoded_assets_preserve_colors_alpha_dimensions_and_placement() {
let mut d = Document::new(&Default::default());
let red = png(2, 1, [255, 0, 0, 255]);
let blue = png(1, 2, [0, 0, 255, 128]);
for (data, x) in [(red.clone(), 36.0), (blue.clone(), 66.0), (red, 96.0), (blue, 126.0)] {
place(&mut d, data, x);
}
d.check().unwrap();
let got = drawn_images(export_pdf(&d, &Cache::new(), &PdfOptions::default()).unwrap());
assert_eq!(got.len(), 4);
for (index, item) in got.iter().enumerate() {
assert_eq!(item.size, if index % 2 == 0 { (2, 1) } else { (1, 2) });
assert_eq!(item.rgb, if index % 2 == 0 { [255, 0, 0] } else { [0, 0, 255] });
assert_eq!(item.alpha, if index % 2 == 0 { 255 } else { 128 });
assert!((item.x - (36.0 + index as f64 * 30.0)).abs() < 1e-6, "{got:?}");
}
}
#[test]
fn compress_images_context_does_not_leak_between_exports() {
let mut d = Document::new(&Default::default());
let data = png(4, 4, [220, 30, 40, 255]);
place(&mut d, data.clone(), 36.0);
place(&mut d, data, 66.0);
for compress_images in [false, true, false] {
let bytes = export_pdf(&d, &Cache::new(), &PdfOptions { compress_images, ..Default::default() }).unwrap();
let has_dct = bytes.windows(b"/DCTDecode".len()).any(|w| w == b"/DCTDecode");
assert_eq!(has_dct, compress_images, "export options must remain independent");
}
}
#[test]
fn repeated_png_with_deferred_decode_error_is_skipped() {
let mut bad = png(2, 2, [255, 0, 0, 255]);
let idat = bad.windows(4).position(|w| w == b"IDAT").unwrap();
bad[idat + 4] ^= 255;
// Metadata succeeds, while corrupted IDAT decoding would fail later in the backend: the
// image is decoded first, so both copies are skipped with a warning, not a failed export.
assert!(krilla::image::Image::from_png(Arc::new(bad.clone()).into(), true).is_ok());
let mut d = Document::new(&Default::default());
place(&mut d, bad.clone(), 36.0);
place(&mut d, bad, 66.0);
let report = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
assert!(report.warnings.iter().any(|w| w.contains("could not be decoded")), "{:?}", report.warnings);
assert!(image_objects(&report.bytes).is_empty());
}
#[derive(Debug, PartialEq)]
struct ImageObject {
space: String,
size: (i32, i32),
samples: Vec<u8>,
alpha: Option<Vec<u8>>,
}
fn image_objects(bytes: &[u8]) -> Vec<ImageObject> {
use hayro_syntax::object::{Name, Stream};
let pdf = hayro_syntax::Pdf::new(bytes.to_vec()).unwrap();
pdf.objects()
.into_iter()
.filter_map(|o| o.into_stream())
.filter(|s| s.dict().get::<Name>("Subtype").is_some_and(|n| n.as_str() == "Image"))
.map(|s| ImageObject {
space: s.dict().get::<Name>("ColorSpace").map_or("ICC".into(), |n| n.as_str().to_owned()),
size: (s.dict().get::<i32>("Width").unwrap(), s.dict().get::<i32>("Height").unwrap()),
samples: s.decoded().unwrap().into_owned(),
alpha: s.dict().get::<Stream<'_>>("SMask").map(|a| a.decoded().unwrap().into_owned()),
})
.collect()
}
#[test]
fn repeated_cmyk_tiffs_keep_exact_inks_and_unassociated_alpha() {
for alpha in [None, Some(2)] {
let bytes = fixtures::cmyk_tiff(alpha, false);
let mut d = Document::new(&Default::default());
for (name, x) in [("a.tif", 36.0), ("b.tif", 66.0)] {
place_named(&mut d, bytes.clone(), x, name, "image/tiff", 0);
}
for standard in [Standard::None, Standard::PdfX4] {
for compress_images in [false, true] {
let report = export_pdf_with_report(&d, &Cache::new(), &PdfOptions { standard, compress_images, ..Default::default() }).unwrap();
assert!(report.warnings.is_empty(), "{:?}", report.warnings);
let images = image_objects(&report.bytes);
let cmyk: Vec<_> = images.iter().filter(|i| i.space == "DeviceCMYK").collect();
assert_eq!(cmyk.len(), 1, "{images:?}");
assert_eq!(cmyk[0].size, (2, 1));
assert_eq!(cmyk[0].samples, fixtures::INKS);
assert_eq!(cmyk[0].alpha, alpha.map(|_| fixtures::ALPHA.to_vec()));
let drawn = drawn_images(report.bytes);
assert_eq!(drawn.len(), 2);
assert_eq!(drawn.iter().map(|i| i.x).collect::<Vec<_>>(), [36.0, 66.0]);
}
}
}
}
#[test]
fn successful_fallback_warns_for_both_names_and_preserves_rgb_samples() {
let bytes = fixtures::cmyk_tiff(None, true);
let mut d = Document::new(&Default::default());
for (name, x) in [("other-inks-a.tif", 36.0), ("other-inks-b.tif", 66.0)] {
place_named(&mut d, bytes.clone(), x, name, "image/tiff", 0);
}
let reason = "converted to RGB (a CMYK TIFF that is planar, has premultiplied alpha, uses other inks or is over 256 MiB)";
let expected_warnings = [format!("other-inks-a.tif: {reason}"), format!("other-inks-b.tif: {reason}")];
for compress_images in [false, true] {
let report = export_pdf_with_report(&d, &Cache::new(), &PdfOptions { compress_images, ..Default::default() }).unwrap();
assert_eq!(report.warnings, expected_warnings);
let images = image_objects(&report.bytes);
assert_eq!(images.len(), 1);
assert_eq!(images[0].space, "DeviceRGB");
assert_eq!(images[0].samples, [0, 0, 0, 255, 0, 0]);
assert_eq!(images[0].size, (2, 1));
}
let booklet = export_booklet(&d, &Cache::new(), &BookletOptions::default()).unwrap();
assert_eq!(booklet.warnings, expected_warnings);
assert_eq!(image_objects(&booklet.bytes)[0].samples, [0, 0, 0, 255, 0, 0]);
}
#[test]
fn pdfa_rgb_conversion_does_not_poison_later_cmyk_exports() {
let bytes = fixtures::cmyk_tiff(None, false);
// PDF/A gets the RGB the screen shows: converted through the working CMYK space.
let rgb: Vec<u8> = designcraft_images::decode_rgba(&bytes).unwrap().pixels().flat_map(|p| [p[0], p[1], p[2]]).collect();
let mut d = Document::new(&Default::default());
place_named(&mut d, bytes.clone(), 36.0, "a.tif", "image/tiff", 0);
place_named(&mut d, bytes, 66.0, "b.tif", "image/tiff", 0);
for standard in [Standard::PdfA2b, Standard::None, Standard::PdfX4, Standard::PdfA2b, Standard::None] {
let result = export_pdf_with_report(&d, &Cache::new(), &PdfOptions { standard, created: Some(1_700_000_000), ..Default::default() });
let report = result.unwrap();
let images = image_objects(&report.bytes);
assert_eq!(images.len(), 1);
if standard == Standard::PdfA2b {
assert_eq!(report.warnings, ["PDF/A: CMYK colours were converted to RGB (no CMYK output intent profile is available yet)"]);
assert_eq!(images[0].space, "ICC");
assert_eq!(images[0].samples, rgb);
} else {
assert!(report.warnings.is_empty());
assert_eq!(images[0].space, "DeviceCMYK");
assert_eq!(images[0].samples, fixtures::INKS);
}
}
}
#[test]
fn unsupported_associated_alpha_keeps_each_asset_failure_warning() {
let bytes = fixtures::cmyk_tiff(Some(1), false);
let mut d = Document::new(&Default::default());
for (name, x) in [("alpha-a.tif", 36.0), ("alpha-b.tif", 66.0)] {
place_named(&mut d, bytes.clone(), x, name, "image/tiff", 0);
}
let report = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
assert!(image_objects(&report.bytes).is_empty());
assert_eq!(report.warnings.len(), 4);
for name in ["alpha-a.tif", "alpha-b.tif"] {
assert!(report.warnings.iter().any(|w| w.starts_with(&format!("{name}: converted to RGB"))));
assert!(report.warnings.contains(&format!("image `{name}` could not be decoded and was skipped")));
}
}
fn two_page_pdf() -> Vec<u8> {
let mut pdf = krilla::Document::new();
for color in [[255, 0, 0, 255], [0, 0, 255, 255]] {
let mut page = pdf.start_page_with(krilla::page::PageSettings::new(krilla::geom::Size::from_wh(20.0, 20.0).unwrap()));
let mut surface = page.surface();
let image = krilla::image::Image::from_png(Arc::new(png(1, 1, color)).into(), true).unwrap();
surface.draw_image(image, krilla::geom::Size::from_wh(20.0, 20.0).unwrap());
surface.finish();
page.finish();
}
pdf.finish().unwrap()
}
#[test]
fn placed_pdf_selection_and_media_routing_precede_content_cache() {
let mut d = Document::new(&Default::default());
let pdf = two_page_pdf();
place_named(&mut d, pdf.clone(), 36.0, "page-two.pdf", "application/pdf", 1);
place_named(&mut d, pdf, 66.0, "page-one.pdf", "application/pdf", 0);
let red = png(2, 1, [255, 0, 0, 255]);
place_named(&mut d, red.clone(), 96.0, "red.png", "image/png", 0);
place_named(&mut d, red, 126.0, "movie.mp4", "video/mp4", 0);
let report = export_pdf_with_report(&d, &Cache::new(), &PdfOptions::default()).unwrap();
assert!(report.warnings.is_empty(), "{:?}", report.warnings);
let drawn = drawn_images(report.bytes);
assert_eq!(drawn.len(), 3, "media bytes must draw the existing placeholder, not the matching raster: {drawn:?}");
assert_eq!(drawn.iter().map(|i| (i.rgb, i.size)).collect::<Vec<_>>(), [([0, 0, 255], (1, 1)), ([255, 0, 0], (1, 1)), ([255, 0, 0], (2, 1))]);
assert_eq!(drawn.iter().map(|i| i.x).collect::<Vec<_>>(), [36.0, 66.0, 96.0]);
}
#[test]
fn repeated_direct_pngs_export_as_pdfa_without_interpolation() {
let data = png(2, 1, [220, 30, 40, 255]);
let mut d = Document::new(&Default::default());
place(&mut d, data.clone(), 36.0);
place(&mut d, data, 66.0);
// PDF/A turns image interpolation off (#128), and the cached conversion keeps that.
let report =
export_pdf_with_report(&d, &Cache::new(), &PdfOptions { standard: Standard::PdfA2b, created: Some(1_700_000_000), ..Default::default() })
.unwrap();
assert_eq!(image_objects(&report.bytes).len(), 1, "both placements share one image");
let needle = b"/Interpolate true";
assert!(!report.bytes.windows(needle.len()).any(|w| w == needle));
}