From 7f043fe88ed8d7ce14a67cbfaf0c0b18015b8f9f Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 20 May 2023 11:25:58 +0100 Subject: Remove unused include directives --- libqpdf/qpdf-c.cc | 1 - 1 file changed, 1 deletion(-) (limited to 'libqpdf/qpdf-c.cc') diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc index 01987365..e7df8ac3 100644 --- a/libqpdf/qpdf-c.cc +++ b/libqpdf/qpdf-c.cc @@ -15,7 +15,6 @@ #include #include -#include #include #include #include -- cgit v1.2.3-54-g00ecf From 41ec7eda54e2263eeb1aee4c3a0616c9c2777fb7 Mon Sep 17 00:00:00 2001 From: m-holger Date: Sat, 20 May 2023 13:24:10 +0100 Subject: Use auto when initialializing with new --- examples/pdf-create.cc | 4 ++-- examples/pdf-custom-filter.cc | 2 +- examples/pdf-invert-images.cc | 2 +- libqpdf/Pl_Buffer.cc | 2 +- libqpdf/QPDF.cc | 4 ++-- libqpdf/QPDFWriter.cc | 4 ++-- libqpdf/QPDF_Array.cc | 2 +- libqpdf/qpdf-c.cc | 2 +- libtests/aes.cc | 6 +++--- libtests/bits.cc | 2 +- libtests/flate.cc | 2 +- libtests/pointer_holder.cc | 4 ++-- libtests/rc4.cc | 6 +++--- qpdf/test_driver.cc | 6 +++--- qpdf/test_large_file.cc | 2 +- qpdf/test_tokenizer.cc | 6 +++--- 16 files changed, 28 insertions(+), 28 deletions(-) (limited to 'libqpdf/qpdf-c.cc') diff --git a/examples/pdf-create.cc b/examples/pdf-create.cc index 7898479a..af7ec6b7 100644 --- a/examples/pdf-create.cc +++ b/examples/pdf-create.cc @@ -166,7 +166,7 @@ add_page( // mode. Since we are not specifying, QPDFWriter will compress // with /FlateDecode if we don't provide any other form of // compression. - ImageProvider* p = new ImageProvider(color_space, filter); + auto* p = new ImageProvider(color_space, filter); std::shared_ptr provider(p); size_t width = p->getWidth(); size_t height = p->getHeight(); @@ -286,7 +286,7 @@ check( if (!this_errors) { // Check image data auto actual_data = image.getStreamData(qpdf_dl_all); - ImageProvider* p = new ImageProvider(desired_color_space, "null"); + auto* p = new ImageProvider(desired_color_space, "null"); std::shared_ptr provider(p); Pl_Buffer b_p("get image data"); provider->provideStreamData(QPDFObjGen(), &b_p); diff --git a/examples/pdf-custom-filter.cc b/examples/pdf-custom-filter.cc index 2310a687..f6977a21 100644 --- a/examples/pdf-custom-filter.cc +++ b/examples/pdf-custom-filter.cc @@ -409,7 +409,7 @@ process( // Create a single StreamReplacer instance. The interface requires // a std::shared_ptr in various places, so allocate a StreamReplacer // and stash it in a std::shared_ptr. - StreamReplacer* replacer = new StreamReplacer(&qpdf); + auto* replacer = new StreamReplacer(&qpdf); std::shared_ptr p(replacer); for (auto& o: qpdf.getAllObjects()) { diff --git a/examples/pdf-invert-images.cc b/examples/pdf-invert-images.cc index 06d74198..89989885 100644 --- a/examples/pdf-invert-images.cc +++ b/examples/pdf-invert-images.cc @@ -124,7 +124,7 @@ main(int argc, char* argv[]) QPDF qpdf; qpdf.processFile(infilename, password); - ImageInverter* inv = new ImageInverter; + auto* inv = new ImageInverter; auto p = std::shared_ptr(inv); // For each page... diff --git a/libqpdf/Pl_Buffer.cc b/libqpdf/Pl_Buffer.cc index d942465d..ff200643 100644 --- a/libqpdf/Pl_Buffer.cc +++ b/libqpdf/Pl_Buffer.cc @@ -45,7 +45,7 @@ Pl_Buffer::getBuffer() } auto size = this->m->data.length(); - Buffer* b = new Buffer(size); + auto* b = new Buffer(size); if (size > 0) { unsigned char* p = b->getBuffer(); memcpy(p, this->m->data.data(), size); diff --git a/libqpdf/QPDF.cc b/libqpdf/QPDF.cc index bc88b5d6..3a4712e0 100644 --- a/libqpdf/QPDF.cc +++ b/libqpdf/QPDF.cc @@ -264,7 +264,7 @@ QPDF::create() void QPDF::processFile(char const* filename, char const* password) { - FileInputSource* fi = new FileInputSource(filename); + auto* fi = new FileInputSource(filename); processInputSource(std::shared_ptr(fi), password); } @@ -272,7 +272,7 @@ void QPDF::processFile( char const* description, FILE* filep, bool close_file, char const* password) { - FileInputSource* fi = new FileInputSource(description, filep, close_file); + auto* fi = new FileInputSource(description, filep, close_file); processInputSource(std::shared_ptr(fi), password); } diff --git a/libqpdf/QPDFWriter.cc b/libqpdf/QPDFWriter.cc index 56b4e1ef..a5a54cc7 100644 --- a/libqpdf/QPDFWriter.cc +++ b/libqpdf/QPDFWriter.cc @@ -997,7 +997,7 @@ void QPDFWriter::activatePipelineStack(PipelinePopper& pp) { std::string stack_id("stack " + std::to_string(this->m->next_stack_id)); - Pl_Count* c = + auto* c = new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back()); ++this->m->next_stack_id; this->m->pipeline_stack.push_back(c); @@ -1030,7 +1030,7 @@ QPDFWriter::PipelinePopper::~PipelinePopper() qw->m->md5_pipeline = nullptr; } qw->m->pipeline_stack.pop_back(); - Pl_Buffer* buf = dynamic_cast(p); + auto* buf = dynamic_cast(p); if (bp && buf) { *bp = buf->getBufferSharedPointer(); } diff --git a/libqpdf/QPDF_Array.cc b/libqpdf/QPDF_Array.cc index 3bd139b1..d0228361 100644 --- a/libqpdf/QPDF_Array.cc +++ b/libqpdf/QPDF_Array.cc @@ -83,7 +83,7 @@ QPDF_Array::copy(bool shallow) return do_create(new QPDF_Array(*this)); } else { if (sparse) { - QPDF_Array* result = new QPDF_Array(); + auto* result = new QPDF_Array(); result->sp_size = sp_size; for (auto const& element: sp_elements) { auto const& obj = element.second; diff --git a/libqpdf/qpdf-c.cc b/libqpdf/qpdf-c.cc index e7df8ac3..8f36195a 100644 --- a/libqpdf/qpdf-c.cc +++ b/libqpdf/qpdf-c.cc @@ -106,7 +106,7 @@ qpdf_data qpdf_init() { QTC::TC("qpdf", "qpdf-c called qpdf_init"); - qpdf_data qpdf = new _qpdf_data(); + auto qpdf = new _qpdf_data(); qpdf->qpdf = QPDF::create(); return qpdf; } diff --git a/libtests/aes.cc b/libtests/aes.cc index 5ae8152a..a981fc22 100644 --- a/libtests/aes.cc +++ b/libtests/aes.cc @@ -74,7 +74,7 @@ main(int argc, char* argv[]) FILE* infile = QUtil::safe_fopen(infilename, "rb"); FILE* outfile = QUtil::safe_fopen(outfilename, "wb"); - unsigned char* key = new unsigned char[keylen]; + auto* key = new unsigned char[keylen]; for (unsigned int i = 0; i < strlen(hexkey); i += 2) { char t[3]; t[0] = hexkey[i]; @@ -85,8 +85,8 @@ main(int argc, char* argv[]) key[i / 2] = static_cast(val); } - Pl_StdioFile* out = new Pl_StdioFile("stdout", outfile); - Pl_AES_PDF* aes = new Pl_AES_PDF("aes_128_cbc", out, encrypt, key, keylen); + auto* out = new Pl_StdioFile("stdout", outfile); + auto* aes = new Pl_AES_PDF("aes_128_cbc", out, encrypt, key, keylen); delete[] key; key = nullptr; if (!cbc_mode) { diff --git a/libtests/bits.cc b/libtests/bits.cc index e63ebdd3..af715da8 100644 --- a/libtests/bits.cc +++ b/libtests/bits.cc @@ -141,7 +141,7 @@ test() unsigned char ch = 0; bit_offset = 7; - Pl_Buffer* bp = new Pl_Buffer("buffer"); + auto* bp = new Pl_Buffer("buffer"); test_write_bits(ch, bit_offset, 30UL, 5, bp); test_write_bits(ch, bit_offset, 10UL, 4, bp); diff --git a/libtests/flate.cc b/libtests/flate.cc index 93c41f85..9b64ca67 100644 --- a/libtests/flate.cc +++ b/libtests/flate.cc @@ -28,7 +28,7 @@ run(char const* filename) Pipeline* inf2 = new Pl_Flate("inf2", out2, Pl_Flate::a_inflate); // Count bytes written to o3 - Pl_Count* count3 = new Pl_Count("count3", out3); + auto* count3 = new Pl_Count("count3", out3); // Do both simultaneously Pipeline* inf3 = new Pl_Flate("inf3", count3, Pl_Flate::a_inflate); diff --git a/libtests/pointer_holder.cc b/libtests/pointer_holder.cc index e5a58d17..4b9d43cb 100644 --- a/libtests/pointer_holder.cc +++ b/libtests/pointer_holder.cc @@ -72,7 +72,7 @@ test_ph() ObjectHolder oh0; { std::cout << "hello" << std::endl; - Object* o1 = new Object; + auto* o1 = new Object; ObjectHolder oh1(o1); std::cout << "oh1 refcount = " << oh1.getRefcount() << std::endl; ObjectHolder oh2(oh1); @@ -95,7 +95,7 @@ test_ph() } ol1.push_back(oh3); ol1.push_back(oh3); - Object* o3 = new Object; + auto* o3 = new Object; oh0 = o3; PointerHolder oh6(new Object()); oh6->hello(); diff --git a/libtests/rc4.cc b/libtests/rc4.cc index ca4af91d..300c6201 100644 --- a/libtests/rc4.cc +++ b/libtests/rc4.cc @@ -41,7 +41,7 @@ main(int argc, char* argv[]) char* outfilename = argv[3]; unsigned int hexkeylen = QIntC::to_uint(strlen(hexkey)); unsigned int keylen = hexkeylen / 2; - unsigned char* key = new unsigned char[keylen + 1]; + auto* key = new unsigned char[keylen + 1]; key[keylen] = '\0'; FILE* infile = QUtil::safe_fopen(infilename, "rb"); @@ -56,9 +56,9 @@ main(int argc, char* argv[]) } FILE* outfile = QUtil::safe_fopen(outfilename, "wb"); - Pl_StdioFile* out = new Pl_StdioFile("stdout", outfile); + auto* out = new Pl_StdioFile("stdout", outfile); // Use a small buffer size (64) for testing - Pl_RC4* rc4 = new Pl_RC4("rc4", out, key, QIntC::to_int(keylen), 64U); + auto* rc4 = new Pl_RC4("rc4", out, key, QIntC::to_int(keylen), 64U); delete[] key; // 64 < buffer size < 512, buffer_size is not a power of 2 for testing diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index e9e7754c..da1be6c0 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -499,7 +499,7 @@ test_8(QPDF& pdf, char const* arg2) auto b = p1.getBufferSharedPointer(); // This is a bogus way to use StreamDataProvider, but it does // adequately test its functionality. - Provider* provider = new Provider(b); + auto* provider = new Provider(b); auto p = std::shared_ptr(provider); qstream.replaceStreamData( p, @@ -1068,7 +1068,7 @@ test_27(QPDF& pdf, char const* arg2) pl.writeCStr("new data for stream\n"); pl.finish(); auto b = pl.getBufferSharedPointer(); - Provider* provider = new Provider(b); + auto* provider = new Provider(b); p1 = decltype(p1)(provider); } // Create a stream that uses a provider in empty1 and copy it @@ -1095,7 +1095,7 @@ test_27(QPDF& pdf, char const* arg2) pl.writeCStr("more data for stream\n"); pl.finish(); auto b = pl.getBufferSharedPointer(); - Provider* provider = new Provider(b); + auto* provider = new Provider(b); p2 = decltype(p2)(provider); } QPDF empty3; diff --git a/qpdf/test_large_file.cc b/qpdf/test_large_file.cc index aea7c0c5..cfd1c5db 100644 --- a/qpdf/test_large_file.cc +++ b/qpdf/test_large_file.cc @@ -218,7 +218,7 @@ create_pdf(char const* filename) image_dict.replaceKey("/BitsPerComponent", newInteger(8)); image_dict.replaceKey("/Width", newInteger(width)); image_dict.replaceKey("/Height", newInteger(height)); - ImageProvider* p = new ImageProvider(pageno); + auto* p = new ImageProvider(pageno); std::shared_ptr provider(p); image.replaceStreamData( provider, QPDFObjectHandle::newNull(), QPDFObjectHandle::newNull()); diff --git a/qpdf/test_tokenizer.cc b/qpdf/test_tokenizer.cc index d9c09c0b..507de459 100644 --- a/qpdf/test_tokenizer.cc +++ b/qpdf/test_tokenizer.cc @@ -190,7 +190,7 @@ process(char const* filename, bool include_ignorable, size_t max_len) std::shared_ptr is; // Tokenize file, skipping streams - FileInputSource* fis = new FileInputSource(filename); + auto* fis = new FileInputSource(filename); is = std::shared_ptr(fis); dump_tokens(is, "FILE", max_len, include_ignorable, true, false); @@ -203,7 +203,7 @@ process(char const* filename, bool include_ignorable, size_t max_len) Pl_Buffer plb("buffer"); page.pipeContents(&plb); auto content_data = plb.getBufferSharedPointer(); - BufferInputSource* bis = + auto* bis = new BufferInputSource("content data", content_data.get()); is = std::shared_ptr(bis); dump_tokens( @@ -220,7 +220,7 @@ process(char const* filename, bool include_ignorable, size_t max_len) if (obj.isStream() && obj.getDict().getKey("/Type").isName() && obj.getDict().getKey("/Type").getName() == "/ObjStm") { std::shared_ptr b = obj.getStreamData(qpdf_dl_specialized); - BufferInputSource* bis = + auto* bis = new BufferInputSource("object stream data", b.get()); is = std::shared_ptr(bis); dump_tokens( -- cgit v1.2.3-54-g00ecf