From b9aded1a0062b52346ecb8aefb6035ad006ceba2 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Tue, 10 Jul 2012 22:24:09 -0400 Subject: Favor string-based newStream method --- qpdf/test_driver.cc | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 8373bd04..2e3fc65e 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -503,10 +503,8 @@ void runtest(int n, char const* filename) else if (n == 9) { QPDFObjectHandle root = pdf.getRoot(); - PointerHolder b1 = new Buffer(20); - unsigned char* bp = b1->getBuffer(); - memcpy(bp, (char*)"data for new stream\n", 20); // no null! - QPDFObjectHandle qstream = QPDFObjectHandle::newStream(&pdf, b1); + QPDFObjectHandle qstream = QPDFObjectHandle::newStream( + &pdf, "data for new stream\n"); QPDFObjectHandle rstream = QPDFObjectHandle::newStream(&pdf); try { @@ -517,11 +515,11 @@ void runtest(int n, char const* filename) { std::cout << "exception: " << e.what() << std::endl; } - PointerHolder b2 = new Buffer(22); - bp = b2->getBuffer(); + PointerHolder buf = new Buffer(22); + unsigned char* bp = buf->getBuffer(); memcpy(bp, (char*)"data for other stream\n", 22); // no null! rstream.replaceStreamData( - b2, QPDFObjectHandle::newNull(), QPDFObjectHandle::newNull()); + buf, QPDFObjectHandle::newNull(), QPDFObjectHandle::newNull()); root.replaceKey("/QStream", qstream); root.replaceKey("/RStream", rstream); QPDFWriter w(pdf, "a.pdf"); @@ -531,16 +529,13 @@ void runtest(int n, char const* filename) } else if (n == 10) { - PointerHolder b1 = new Buffer(37); - unsigned char* bp = b1->getBuffer(); - memcpy(bp, (char*)"BT /F1 12 Tf 72 620 Td (Baked) Tj ET\n", 37); - PointerHolder b2 = new Buffer(38); - bp = b2->getBuffer(); - memcpy(bp, (char*)"BT /F1 18 Tf 72 520 Td (Mashed) Tj ET\n", 38); - std::vector pages = pdf.getAllPages(); - pages[0].addPageContents(QPDFObjectHandle::newStream(&pdf, b1), true); - pages[0].addPageContents(QPDFObjectHandle::newStream(&pdf, b2), false); + pages[0].addPageContents( + QPDFObjectHandle::newStream( + &pdf, "BT /F1 12 Tf 72 620 Td (Baked) Tj ET\n"), true); + pages[0].addPageContents( + QPDFObjectHandle::newStream( + &pdf, "BT /F1 18 Tf 72 520 Td (Mashed) Tj ET\n"), false); QPDFWriter w(pdf, "a.pdf"); w.setStaticID(true); -- cgit v1.2.3-54-g00ecf