From a7e269537d8f4b33d1bc8a5a83c53432db9b7560 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Fri, 24 Sep 2010 20:45:18 +0000 Subject: update code to new PointerHolder, and reintroduce change that was accidentally backed out git-svn-id: svn+q:///qpdf/trunk@1031 71b93d88-0707-0410-a8cf-f5a4172ac649 --- libqpdf/QPDFWriter.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'libqpdf/QPDFWriter.cc') diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index 68fd62f5..0cba17d9 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -527,8 +527,7 @@ QPDFWriter::writeString(std::string const& str) void QPDFWriter::writeBuffer(PointerHolder& b) { - this->pipeline->write(b.getPointer()->getBuffer(), - b.getPointer()->getSize()); + this->pipeline->write(b->getBuffer(), b->getSize()); } void @@ -1038,7 +1037,7 @@ QPDFWriter::unparseObject(QPDFObjectHandle object, int level, compress = false; } - this->cur_stream_length = stream_data.getPointer()->getSize(); + this->cur_stream_length = stream_data->getSize(); if (is_metadata && this->encrypted && (! this->encrypt_metadata)) { // Don't encrypt stream data for the metadata stream @@ -1226,7 +1225,7 @@ QPDFWriter::writeObjectStream(QPDFObjectHandle object) writeStringQDF("\n "); writeString(" /Type /ObjStm"); writeStringQDF("\n "); - unsigned long length = stream_buffer.getPointer()->getSize(); + unsigned long length = stream_buffer->getSize(); adjustAESStreamLength(length); writeString(" /Length " + QUtil::int_to_string(length)); writeStringQDF("\n "); @@ -1718,8 +1717,8 @@ QPDFWriter::writeHintStream(int hint_id) openObject(hint_id); setDataKey(hint_id); - unsigned char* hs = hint_buffer.getPointer()->getBuffer(); - unsigned long hlen = hint_buffer.getPointer()->getSize(); + unsigned char* hs = hint_buffer->getBuffer(); + unsigned long hlen = hint_buffer->getSize(); writeString("<< /Filter /FlateDecode /S "); writeString(QUtil::int_to_string(S)); @@ -1888,8 +1887,7 @@ QPDFWriter::writeXRefStream(int xref_id, int max_id, int max_offset, writeStringQDF("\n "); writeString(" /Type /XRef"); writeStringQDF("\n "); - writeString(" /Length " + - QUtil::int_to_string(xref_data.getPointer()->getSize())); + writeString(" /Length " + QUtil::int_to_string(xref_data->getSize())); if (compressed) { writeStringQDF("\n "); @@ -2251,7 +2249,7 @@ QPDFWriter::writeLinearized() activatePipelineStack(); writeHintStream(hint_id); popPipelineStack(&hint_buffer); - hint_length = hint_buffer.getPointer()->getSize(); + hint_length = hint_buffer->getSize(); // Restore hint offset this->xref[hint_id] = QPDFXRefEntry(1, hint_offset, 0); -- cgit v1.2.3-54-g00ecf