mirror of
https://github.com/storytold/pdfcraft.git
synced 2026-11-15 23:32:37 +00:00
fix(print): reuse shared appearance promotions (#3532)
This commit is contained in:
1 parent
1489436392
commit
69109cd43e
2 files changed
+134
-7
No files matched your search
+17
-5
@@ -748,7 +748,12 @@ fn appearance_matrix(doc: &Document, form: &Dict, rect: [f64; 4]) -> Option<Matr
|
||||
}
|
||||
|
||||
/// A Form XObject holding page `index` as it prints (user space; BBox = crop box).
|
||||
fn page_form(doc: &mut Document, index: usize, content: Content) -> Result<ObjRef, PrintError> {
|
||||
fn page_form(
|
||||
doc: &mut Document,
|
||||
index: usize,
|
||||
content: Content,
|
||||
promoted: &mut std::collections::HashMap<ObjRef, ObjRef>,
|
||||
) -> Result<ObjRef, PrintError> {
|
||||
let page = pdfcraft_model::pages(doc).swap_remove(index);
|
||||
let crop = page.crop(doc);
|
||||
let mut res = page.dict.get(b"Resources").and_then(|r| doc.resolve(r).as_dict().cloned()).unwrap_or_default();
|
||||
@@ -782,9 +787,15 @@ fn page_form(doc: &mut Document, index: usize, content: Content) -> Result<ObjRe
|
||||
{
|
||||
// Some existing annotation appearances omit Subtype, but Do dispatch needs a Form XObject.
|
||||
// Keep the original intact: other document objects can share this appearance.
|
||||
let mut stream = stream.clone();
|
||||
stream.dict.set(b"Subtype".to_vec(), Object::name("Form"));
|
||||
doc.add(Object::Stream(stream))
|
||||
if let Some(&cached) = promoted.get(&ap) {
|
||||
cached
|
||||
} else {
|
||||
let mut stream = stream.clone();
|
||||
stream.dict.set(b"Subtype".to_vec(), Object::name("Form"));
|
||||
let copy = doc.add(Object::Stream(stream));
|
||||
promoted.insert(ap, copy);
|
||||
copy
|
||||
}
|
||||
} else {
|
||||
ap
|
||||
};
|
||||
@@ -817,6 +828,7 @@ pub fn impose(src: &Document, settings: &Settings) -> Result<Vec<u8>, PrintError
|
||||
let mut doc = src.clone();
|
||||
// One form per source page used (a page may appear on several sheets: posters).
|
||||
let mut forms: std::collections::HashMap<usize, ObjRef> = std::collections::HashMap::new();
|
||||
let mut promoted = std::collections::HashMap::new();
|
||||
let views: Vec<[f64; 6]> = pages.iter().map(|p| p.view_matrix(src)).collect();
|
||||
let pages_root = doc.add(Object::Null);
|
||||
let mut kids = Vec::new();
|
||||
@@ -827,7 +839,7 @@ pub fn impose(src: &Document, settings: &Settings) -> Result<Vec<u8>, PrintError
|
||||
let form = match forms.get(&pl.page) {
|
||||
Some(f) => *f,
|
||||
None => {
|
||||
let f = page_form(&mut doc, pl.page, settings.content)?;
|
||||
let f = page_form(&mut doc, pl.page, settings.content, &mut promoted)?;
|
||||
forms.insert(pl.page, f);
|
||||
f
|
||||
}
|
||||
|
||||
@@ -52,8 +52,12 @@ fn print_settings(content: Content) -> Settings {
|
||||
}
|
||||
|
||||
fn render(bytes: Vec<u8>) -> RenderedPage {
|
||||
render_page(bytes, 0)
|
||||
}
|
||||
|
||||
fn render_page(bytes: Vec<u8>, index: usize) -> RenderedPage {
|
||||
let page = PageRenderer::new(Arc::new(bytes), RenderConfig::default()).render(RenderRequest {
|
||||
page: 0,
|
||||
page: index,
|
||||
kind: RequestKind::Pixels,
|
||||
tile: None,
|
||||
scale: 1.0,
|
||||
@@ -143,7 +147,7 @@ fn promotion_preserves_streams_and_explicit_subtypes() {
|
||||
for subtype in [None, Some(Object::name("Form")), Some(Object::name("Image")), Some(Object::Null), Some(Object::Int(7))] {
|
||||
let (mut doc, ap, _) = widget_fixture(subtype.clone(), Some([2.0, 0.0, 0.0, 3.0, 5.0, 7.0]));
|
||||
let original = doc.get(ap);
|
||||
let form = page_form(&mut doc, 0, Content::Document).unwrap();
|
||||
let form = page_form(&mut doc, 0, Content::Document, &mut std::collections::HashMap::new()).unwrap();
|
||||
assert_eq!(doc.get(ap), original, "original in the print clone");
|
||||
let promoted = xobject(&doc, doc.get(form).as_dict().unwrap(), b"PCPrA0");
|
||||
if subtype.is_some() {
|
||||
@@ -198,6 +202,13 @@ fn selected_shared_appearances_keep_placement_flags_and_content_modes() {
|
||||
let output = impose(&doc, &print_settings(content)).unwrap();
|
||||
let reopened = Document::open(Arc::new(output.clone())).unwrap();
|
||||
assert_eq!(pdfcraft_model::pages(&reopened).len(), 1);
|
||||
let sheet = &pdfcraft_model::pages(&reopened)[0];
|
||||
let form = reopened.get(xobject(&reopened, &sheet.dict, b"P0"));
|
||||
assert_eq!(
|
||||
xobject(&reopened, form.as_dict().unwrap(), b"PCPrA0"),
|
||||
xobject(&reopened, form.as_dict().unwrap(), b"PCPrA1"),
|
||||
"selected shared appearance keeps one promotion"
|
||||
);
|
||||
let page = render(output);
|
||||
for (x, y, expected) in
|
||||
[(30, 70, [0, 255, 0, 255]), (75, 70, [0, 255, 0, 255]), (30, 30, [255, 255, 255, 255]), (75, 30, [255, 255, 255, 255])]
|
||||
@@ -215,3 +226,107 @@ fn selected_shared_appearances_keep_placement_flags_and_content_modes() {
|
||||
assert_eq!(saved(&doc), before, "shared source graph stays unchanged");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn shared_promotions_span_pages_without_merging_distinct_sources() {
|
||||
let mut doc = fixture(2);
|
||||
// Contributor-original drawing and a bounded PDF comment expose repeated encoded payloads.
|
||||
let mut payload = b"/Ink cs 0 1 0 scn 0 0 20 10 re f\n%".to_vec();
|
||||
payload.extend(std::iter::repeat_n(b'x', 32 * 1024));
|
||||
payload.push(b'\n');
|
||||
let mut appearances = Vec::new();
|
||||
for marker in ["Shared", "Distinct"] {
|
||||
let mut colors = Dict::new();
|
||||
colors.set(b"Ink".to_vec(), Object::name("DeviceRGB"));
|
||||
let mut resources = Dict::new();
|
||||
resources.set(b"ColorSpace".to_vec(), Object::Dict(colors));
|
||||
resources.set(b"PrivateMarker".to_vec(), Object::name(marker));
|
||||
let resources = doc.add(Object::Dict(resources));
|
||||
let mut dict = Dict::new();
|
||||
dict.set(b"BBox".to_vec(), numbers(&[0.0, 0.0, 20.0, 10.0]));
|
||||
dict.set(b"Resources".to_vec(), Object::Ref(resources));
|
||||
appearances.push(doc.add(Object::Stream(Stream::from_raw(dict, payload.clone()))));
|
||||
}
|
||||
let pages = pdfcraft_model::pages(&doc);
|
||||
for (index, page) in pages.iter().enumerate() {
|
||||
let mut widgets = Vec::new();
|
||||
for (ap, rect) in [(appearances[0], [10.0, 20.0, 50.0, 40.0]), (appearances[0], [60.0, 20.0, 90.0, 40.0])]
|
||||
.into_iter()
|
||||
.chain((index == 1).then_some((appearances[1], [10.0, 60.0, 50.0, 80.0])))
|
||||
{
|
||||
let mut widget = Dict::new();
|
||||
widget.set(b"Subtype".to_vec(), Object::name("Widget"));
|
||||
widget.set(b"FT".to_vec(), Object::name("Tx"));
|
||||
widget.set(b"F".to_vec(), Object::Int(4));
|
||||
widget.set(b"Rect".to_vec(), numbers(&rect));
|
||||
let mut appearance = Dict::new();
|
||||
appearance.set(b"N".to_vec(), Object::Ref(ap));
|
||||
widget.set(b"AP".to_vec(), Object::Dict(appearance));
|
||||
widgets.push(Object::Ref(doc.add(Object::Dict(widget))));
|
||||
}
|
||||
doc.update_dict(page.obj, |dict| {
|
||||
dict.set(b"MediaBox".to_vec(), numbers(&[0.0, 0.0, 100.0, 100.0]));
|
||||
dict.set(b"Annots".to_vec(), Object::Array(widgets));
|
||||
dict.remove(b"Contents");
|
||||
dict.set(b"Resources".to_vec(), Object::Dict(Dict::new()));
|
||||
})
|
||||
.unwrap();
|
||||
}
|
||||
let before = saved(&doc);
|
||||
let state = doc.read_state();
|
||||
let source_bytes = doc.bytes().clone();
|
||||
let graph: Vec<_> = doc.scan_objects().collect();
|
||||
let originals: Vec<_> = appearances.iter().map(|ap| doc.get(*ap)).collect();
|
||||
let settings = Settings { pages: vec![0, 1], ..print_settings(Content::Document) };
|
||||
for _ in 0..2 {
|
||||
let output = impose(&doc, &settings).unwrap();
|
||||
let reopened = Document::open(Arc::new(output.clone())).unwrap();
|
||||
let sheets = pdfcraft_model::pages(&reopened);
|
||||
assert_eq!(sheets.len(), 2);
|
||||
let mut shared = Vec::new();
|
||||
let mut distinct = None;
|
||||
for (index, sheet) in sheets.iter().enumerate() {
|
||||
let form = reopened.get(xobject(&reopened, &sheet.dict, b"P0"));
|
||||
let form = form.as_dict().unwrap();
|
||||
shared.push(xobject(&reopened, form, b"PCPrA0"));
|
||||
shared.push(xobject(&reopened, form, b"PCPrA1"));
|
||||
if index == 1 {
|
||||
distinct = Some(xobject(&reopened, form, b"PCPrA2"));
|
||||
}
|
||||
let rendered = render_page(output.clone(), index);
|
||||
assert_eq!(pixel(&rendered, 30, 70), [0, 255, 0, 255]);
|
||||
assert_eq!(pixel(&rendered, 75, 70), [0, 255, 0, 255]);
|
||||
assert_eq!(pixel(&rendered, 30, 30), if index == 1 { [0, 255, 0, 255] } else { [255, 255, 255, 255] });
|
||||
assert_eq!(pixel(&rendered, 75, 30), [255, 255, 255, 255]);
|
||||
assert_eq!(pixel(&rendered, 5, 5), [255, 255, 255, 255]);
|
||||
}
|
||||
let copies = reopened
|
||||
.scan_objects()
|
||||
.filter(|(_, object)| matches!(&**object, Object::Stream(stream) if stream.raw.as_ref() == payload.as_slice()))
|
||||
.count();
|
||||
eprintln!(
|
||||
"shared promotion output: bytes={}, payload_bytes={}, copies={copies}, shared={shared:?}, distinct={distinct:?}",
|
||||
output.len(),
|
||||
payload.len()
|
||||
);
|
||||
assert!(state.matches(&doc));
|
||||
assert_eq!(doc.bytes(), &source_bytes);
|
||||
assert_eq!(doc.scan_objects().collect::<Vec<_>>(), graph);
|
||||
assert_eq!(saved(&doc), before);
|
||||
for (ap, original) in appearances.iter().zip(&originals) {
|
||||
assert_eq!(doc.get(*ap), *original);
|
||||
}
|
||||
assert_eq!(copies, 2, "one encoded payload per distinct source appearance");
|
||||
assert!(shared.iter().all(|ap| *ap == shared[0]), "shared uses span both page forms");
|
||||
let distinct = distinct.unwrap();
|
||||
assert_ne!(shared[0], distinct, "identical bytes do not merge source references");
|
||||
for (ap, marker) in [(shared[0], b"Shared".as_slice()), (distinct, b"Distinct".as_slice())] {
|
||||
let object = reopened.get(ap);
|
||||
let Object::Stream(stream) = &*object else { panic!("promoted appearance stream") };
|
||||
assert_eq!(stream.raw.as_ref(), payload.as_slice());
|
||||
assert_eq!(stream.dict.name(b"Subtype"), Some(b"Form".as_slice()));
|
||||
let resources = reopened.resolve(stream.dict.get(b"Resources").unwrap());
|
||||
assert_eq!(resources.as_dict().unwrap().name(b"PrivateMarker"), Some(marker));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user