From cc95f4731e1c07de5f1ea8fe7106cd733d6c27d9 Mon Sep 17 00:00:00 2001 From: m-holger Date: Thu, 7 Nov 2024 13:49:41 +0000 Subject: [PATCH] Fix QPDF::copyForeignObject warning Provide correct obj_gen and offset. --- libqpdf/QPDF.cc | 7 +++++-- qpdf/qtest/qpdf/copy-foreign-objects-25.out | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index 03ffb628..c52831fc 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -2268,8 +2268,11 @@ QPDF::copyForeignObject(QPDFObjectHandle foreign) auto og = foreign.getObjGen(); if (!obj_copier.object_map.count(og)) { - warn(damagedPDF("unexpected reference to /Pages object while copying foreign object; " - "replacing with null")); + warn(damagedPDF( + other.getFilename() + " object " + og.unparse(' '), + foreign.getParsedOffset(), + "unexpected reference to /Pages object while copying foreign object; replacing with " + "null")); return QPDFObjectHandle::newNull(); } return obj_copier.object_map[foreign.getObjGen()]; diff --git a/qpdf/qtest/qpdf/copy-foreign-objects-25.out b/qpdf/qtest/qpdf/copy-foreign-objects-25.out index 36b5bb0d..8e18b4f5 100644 --- a/qpdf/qtest/qpdf/copy-foreign-objects-25.out +++ b/qpdf/qtest/qpdf/copy-foreign-objects-25.out @@ -1,2 +1,2 @@ -WARNING: minimal.pdf (object 6 0, offset 556): unexpected reference to /Pages object while copying foreign object; replacing with null +WARNING: minimal.pdf (copy-foreign-objects-in.pdf object 2 0, offset 768): unexpected reference to /Pages object while copying foreign object; replacing with null test 25 done