Skip to content

PdfCraft: An open-source PDF reader and editor written by scratch in pure Rust

M2.6: merge #5472's last fix

Grzegorz Martensbd5bcb7f10d0
diff --cc crates/optimize/src/images.rs
index 405f15c5b,b25e8484c..51c130abd
--- a/crates/optimize/src/images.rs
+++ b/crates/optimize/src/images.rs
@@@ -1354,51 -1339,7 +1353,52 @@@ mod dimension_tests
assert!(decoded(&alone, &jbig2) > 0, "stored as JBIG2 its symbols may come out smaller");
}
+ /// A run has one allowance for all its JBIG2 images. Those past it stay as they are, and the
+ /// report says how many: a file of thousands of them can't hold a run for hours.
+ #[test]
+ fn jbig2_images_past_the_runs_allowance_stay_as_they_are() {
+ let coded = pdfcraft_filters::encode_jbig2_generic(&[0xF0; 4], 16, 2).unwrap();
+ let mut dict = Dict::new();
+ dict.set(b"Type".to_vec(), Object::name("XObject"));
+ dict.set(b"Subtype".to_vec(), Object::name("Image"));
+ dict.set(b"Width".to_vec(), Object::Int(16));
+ dict.set(b"Height".to_vec(), Object::Int(2));
+ dict.set(b"BitsPerComponent".to_vec(), Object::Int(1));
+ dict.set(b"ColorSpace".to_vec(), Object::name("DeviceGray"));
+ dict.set(b"Filter".to_vec(), Object::name("JBIG2Decode"));
+ let image = Stream::from_raw(dict, coded);
+ let mut cost = ImageBudget::with_work(u64::MAX);
+ cost.decode(&Document::new_empty(), &image, 1 << 20).unwrap();
+ let cost = u64::MAX - cost.work_left();
+
+ let mut doc = Document::new_empty();
+ let refs = [doc.add(Object::Stream(image.clone())), doc.add(Object::Stream(image.clone())), doc.add(Object::Stream(image.clone()))];
+ let mut xobjects = Dict::new();
+ for (i, r) in refs.iter().enumerate() {
+ xobjects.set(format!("I{i}").into_bytes(), Object::Ref(*r));
+ }
+ let mut resources = Dict::new();
+ resources.set(b"XObject".to_vec(), Object::Dict(xobjects));
+ // Drawn small enough, at 720 ppi, for the settings to resample all three.
+ let content = doc.add(Object::Stream(Stream::flate(Dict::new(), b"q 1.6 0 0 .2 0 0 cm /I0 Do /I1 Do /I2 Do Q")));
+ let mut page = Dict::new();
+ page.set(b"Type".to_vec(), Object::name("Page"));
+ page.set(b"Resources".to_vec(), Object::Dict(resources));
+ page.set(b"Contents".to_vec(), Object::Ref(content));
+ let page = doc.add(Object::Dict(page));
+
+ let settings = Settings { mono: MonoSettings { compression: MonoCompression::CcittG4, ..MonoSettings::REDUCE }, ..Settings::default() };
+ let mut report = Report::default();
+ let mut budget = ImageBudget::with_work(2 * cost);
+ run_within(&mut doc, &[page], &settings, &mut report, &mut |_| true, &mut budget).unwrap();
+ assert_eq!(report.images_refused, 1);
+ assert_eq!(budget.work_left(), 0, "two decoded and the third refused");
+ assert_eq!(report.images_resampled, 2);
+ let changed = refs.iter().filter(|r| matches!(&*doc.get(**r), Object::Stream(s) if *s != image)).count();
+ assert_eq!(changed, 2, "the third is as it was");
+ }
+
+ /// A JPEG larger than its dictionary says is refused from its header, before its pixels are decoded.
#[test]
fn a_jpeg_of_another_size_than_its_dictionary_is_not_decoded() {
let data = jpeg(&vec![128; 1000 * 1000], 1, 1000, 1000, 50).unwrap_or_default();