Rerun format_code (after merging clang-tidy PR)

examples/pdf-bookmarks.cc

@@ -4,9 +4,9 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 // This program demonstrates extraction of bookmarks using the qpdf
 // outlines API. Note that all the information shown by this program

examples/pdf-count-strings.cc

@@ -4,8 +4,8 @@
 // that uses QPDFObjectHandle::TokenFilter with addContentTokenFilter.
 //
 
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QPDF.hh>

examples/pdf-create.cc

@@ -14,9 +14,9 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
+#include <cstdlib>
 #include <iostream>
 #include <memory>
-#include <cstdlib>
 
 static char const* whoami = nullptr;
 

examples/pdf-custom-filter.cc

@@ -200,8 +200,7 @@ class StreamReplacer: public QPDFObjectHandle::StreamDataProvider
   public:
     StreamReplacer(QPDF* pdf);
     ~StreamReplacer() override = default;
-    void
+    void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
-    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerStream(
         QPDFObjectHandle stream,

examples/pdf-double-page-size.cc

@@ -4,9 +4,9 @@
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 

examples/pdf-filter-tokens.cc

@@ -6,9 +6,9 @@
 //
 
 #include <algorithm>
+#include <cstdlib>
 #include <deque>
 #include <iostream>
-#include <cstdlib>
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QPDFObjectHandle.hh>

examples/pdf-invert-images.cc

@@ -5,9 +5,9 @@
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
@@ -34,8 +34,7 @@ class ImageInverter: public QPDFObjectHandle::StreamDataProvider
 {
   public:
     ~ImageInverter() override = default;
-    void
+    void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
-    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerImage(
         QPDFObjectHandle image,

examples/pdf-mod-info.cc

@@ -5,10 +5,10 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* version = "1.1";
 static char const* whoami = nullptr;

examples/pdf-npages.cc

@@ -1,6 +1,6 @@
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>

examples/pdf-overlay-page.cc

@@ -3,8 +3,8 @@
 #include <qpdf/QPDFPageObjectHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 // This program demonstrates use of form XObjects to overlay a page
 // from one file onto all pages of another file. The qpdf program's

examples/pdf-parse-content.cc

@@ -1,5 +1,5 @@
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>

examples/pdf-set-form-values.cc

@@ -3,8 +3,8 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 static char const* whoami = nullptr;
 

examples/pdf-split-pages.cc

@@ -10,9 +10,9 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
 
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
-#include <cstdlib>
 #include <string>
 
 static bool static_id = false;

include/qpdf/Buffer.hh

@@ -25,8 +25,8 @@
 #include <qpdf/DLL.h>
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 
-#include <memory>
 #include <cstddef>
+#include <memory>
 
 class Buffer
 {

include/qpdf/InputSource.hh

@@ -26,8 +26,8 @@
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 #include <qpdf/Types.h>
 
-#include <memory>
 #include <cstdio>
+#include <memory>
 #include <string>
 
 // Remember to use QPDF_DLL_CLASS on anything derived from InputSource

include/qpdf/QPDF.hh

@@ -25,12 +25,12 @@
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
 
+#include <cstdio>
 #include <functional>
 #include <iostream>
 #include <list>
 #include <map>
 #include <memory>
-#include <cstdio>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -113,8 +113,8 @@ class QPDF
     // your own method of retrieving a PDF file, you can subclass
     // InputSource and use this method.
     QPDF_DLL
-    void
+    void processInputSource(
-    processInputSource(std::shared_ptr<InputSource>, char const* password = nullptr);
+        std::shared_ptr<InputSource>, char const* password = nullptr);
 
     // Create a PDF from an input source that contains JSON as written
     // by writeJSON (or qpdf --json-output, version 2 or higher). The

include/qpdf/QPDFJob.hh

@@ -497,7 +497,8 @@ class QPDFJob
 
     // Helper functions
     static void usage(std::string const& msg);
-    static JSON json_schema(int json_version, std::set<std::string>* keys = nullptr);
+    static JSON
+    json_schema(int json_version, std::set<std::string>* keys = nullptr);
     static void parse_object_id(
         std::string const& objspec, bool& trailer, int& obj, int& gen);
     void parseRotationParameter(std::string const&);

include/qpdf/QPDFPageObjectHelper.hh

@@ -319,8 +319,8 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
     // contents, as happens with addContentTokenFilter. See
     // examples/pdf-count-strings.cc for an example.
     QPDF_DLL
-    void
+    void filterContents(
-    filterContents(QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
+        QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
 
     // Old name -- calls filterContents()
     QPDF_DLL

include/qpdf/QPDFTokenizer.hh

@@ -27,8 +27,8 @@
 #include <qpdf/InputSource.hh>
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 
-#include <memory>
 #include <cstdio>
+#include <memory>
 #include <string>
 
 class QPDFTokenizer

include/qpdf/QPDFWriter.hh

@@ -29,12 +29,12 @@
 #include <qpdf/DLL.h>
 #include <qpdf/Types.h>
 
+#include <cstdio>
 #include <functional>
 #include <list>
 #include <map>
 #include <memory>
 #include <set>
-#include <cstdio>
 #include <string>
 #include <string_view>
 #include <vector>

include/qpdf/QUtil.hh

@@ -25,14 +25,14 @@
 #include <qpdf/DLL.h>
 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
 #include <qpdf/Types.h>
+#include <cstdio>
 #include <cstring>
+#include <ctime>
 #include <functional>
 #include <list>
 #include <memory>
 #include <stdexcept>
-#include <cstdio>
 #include <string>
-#include <ctime>
 #include <vector>
 
 class RandomDataProvider;

libqpdf/BufferInputSource.cc

@@ -2,8 +2,8 @@
 
 #include <qpdf/QIntC.hh>
 #include <algorithm>
-#include <sstream>
 #include <cstring>
+#include <sstream>
 
 BufferInputSource::BufferInputSource(
     std::string const& description, Buffer* buf, bool own_memory) :

libqpdf/InputSource.cc

@@ -2,8 +2,8 @@
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QTC.hh>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 void
 InputSource::setLastOffset(qpdf_offset_t offset)

libqpdf/Pl_ASCII85Decoder.cc

@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCII85Decoder.hh>
 
 #include <qpdf/QTC.hh>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 Pl_ASCII85Decoder::Pl_ASCII85Decoder(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),

libqpdf/Pl_Buffer.cc

@@ -1,9 +1,9 @@
 #include <qpdf/Pl_Buffer.hh>
 
 #include <algorithm>
-#include <stdexcept>
 #include <cstdlib>
 #include <cstring>
+#include <stdexcept>
 
 Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
     Pipeline(identifier, next),

libqpdf/Pl_DCT.cc

@@ -24,8 +24,7 @@ namespace
 static void
 error_handler(j_common_ptr cinfo)
 {
-    auto* jerr =
+    auto* jerr = reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
-        reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
     char buf[JMSG_LENGTH_MAX];
     (*cinfo->err->format_message)(cinfo, buf);
     jerr->msg = buf;
@@ -261,8 +260,7 @@ jpeg_buffer_src(j_decompress_ptr cinfo, Buffer* buffer)
 void
 Pl_DCT::compress(void* cinfo_p, Buffer* b)
 {
-    auto* cinfo =
+    auto* cinfo = reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
-        reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
 
 #if ( \
     (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
@@ -316,8 +314,7 @@ Pl_DCT::compress(void* cinfo_p, Buffer* b)
 void
 Pl_DCT::decompress(void* cinfo_p, Buffer* b)
 {
-    auto* cinfo =
+    auto* cinfo = reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
-        reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
 
 #if ( \
     (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \

libqpdf/Pl_LZWDecoder.cc

@@ -3,8 +3,8 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 Pl_LZWDecoder::Pl_LZWDecoder(
     char const* identifier, Pipeline* next, bool early_code_change) :

libqpdf/Pl_PNGFilter.cc

@@ -4,8 +4,8 @@
 #include <qpdf/QUtil.hh>
 
 #include <climits>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 
 static int
 abs_diff(int a, int b)

libqpdf/Pl_TIFFPredictor.cc

@@ -6,8 +6,8 @@
 #include <qpdf/QUtil.hh>
 
 #include <climits>
-#include <stdexcept>
 #include <cstring>
+#include <stdexcept>
 #include <vector>
 
 Pl_TIFFPredictor::Pl_TIFFPredictor(

libqpdf/QPDF.cc

@@ -4,13 +4,13 @@
 
 #include <algorithm>
 #include <atomic>
+#include <cstdlib>
+#include <cstring>
 #include <limits>
 #include <map>
 #include <memory.h>
 #include <regex>
 #include <sstream>
-#include <cstdlib>
-#include <cstring>
 #include <vector>
 
 #include <qpdf/BufferInputSource.hh>
@@ -2528,9 +2528,7 @@ QPDF::getCompressibleObjGens()
         if (obj.isStream()) {
             QPDFObjectHandle dict = obj.getDict();
             std::set<std::string> keys = dict.getKeys();
-            for (auto iter = keys.rbegin();
+            for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
-                 iter != keys.rend();
-                 ++iter) {
                 std::string const& key = *iter;
                 QPDFObjectHandle value = dict.getKey(key);
                 if (key == "/Length") {
@@ -2544,9 +2542,7 @@ QPDF::getCompressibleObjGens()
             }
         } else if (obj.isDictionary()) {
             std::set<std::string> keys = obj.getKeys();
-            for (auto iter = keys.rbegin();
+            for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
-                 iter != keys.rend();
-                 ++iter) {
                 queue.push_front(obj.getKey(*iter));
             }
         } else if (obj.isArray()) {

libqpdf/QPDFJob.cc

@@ -1,9 +1,9 @@
 #include <qpdf/QPDFJob.hh>
 
+#include <cctype>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cctype>
 #include <fcntl.h>
 #include <iostream>
 #include <memory>

libqpdf/QPDFJob_argv.cc

@@ -2,13 +2,13 @@
 
 // See "HOW TO ADD A COMMAND-LINE ARGUMENT" in README-maintainer.
 
-#include <cstdio>
 #include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <memory>
 #include <sstream>
-#include <cstdlib>
-#include <cstring>
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDFArgParser.hh>

libqpdf/QPDFObjectHandle.cc

@@ -29,11 +29,11 @@
 #include <qpdf/QUtil.hh>
 
 #include <algorithm>
-#include <cstring>
 #include <cctype>
 #include <climits>
-#include <stdexcept>
 #include <cstdlib>
+#include <cstring>
+#include <stdexcept>
 
 using namespace std::literals;
 

libqpdf/QPDFTokenizer.cc

@@ -10,9 +10,9 @@
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <stdexcept>
 #include <cstdlib>
 #include <cstring>
+#include <stdexcept>
 
 static inline bool
 is_delimiter(char ch)

libqpdf/QPDFWriter.cc

@@ -23,8 +23,8 @@
 #include <qpdf/RC4.hh>
 
 #include <algorithm>
-#include <stdexcept>
 #include <cstdlib>
+#include <stdexcept>
 
 QPDFWriter::ProgressReporter::~ProgressReporter()
 {
@@ -997,8 +997,7 @@ void
 QPDFWriter::activatePipelineStack(PipelinePopper& pp)
 {
     std::string stack_id("stack " + std::to_string(this->m->next_stack_id));
-    auto* c =
+    auto* c = new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back());
-        new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back());
     ++this->m->next_stack_id;
     this->m->pipeline_stack.push_back(c);
     this->m->pipeline = c;

libqpdf/QPDF_json.cc

@@ -246,8 +246,7 @@ class QPDF::JSONReactor: public JSON::Reactor
     void arrayStart() override;
     void containerEnd(JSON const& value) override;
     void topLevelScalar() override;
-    bool
+    bool dictionaryItem(std::string const& key, JSON const& value) override;
-    dictionaryItem(std::string const& key, JSON const& value) override;
     bool arrayItem(JSON const& value) override;
 
     bool anyErrors() const;

libqpdf/QTC.cc

@@ -1,9 +1,9 @@
 #include <qpdf/QTC.hh>
 
 #include <qpdf/QUtil.hh>
+#include <cstdio>
 #include <map>
 #include <set>
-#include <cstdio>
 
 static bool
 tc_active(char const* const scope)

libqpdf/QUtil.cc

@@ -11,6 +11,9 @@
 
 #include <cctype>
 #include <cerrno>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <fstream>
 #include <iomanip>
@@ -21,9 +24,6 @@
 #include <set>
 #include <sstream>
 #include <stdexcept>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
 #ifndef QPDF_NO_WCHAR_T
 # include <cwchar>
 #endif

libqpdf/RC4.cc

@@ -2,7 +2,6 @@
 
 #include <qpdf/QPDFCryptoProvider.hh>
 
-
 RC4::RC4(unsigned char const* key_data, int key_len) :
     crypto(QPDFCryptoProvider::getImpl())
 {

libtests/aes.cc

@@ -3,10 +3,10 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 usage()

libtests/ascii85.cc

@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCII85Decoder.hh>
 
 #include <qpdf/Pl_StdioFile.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 int
 main()

libtests/bits.cc

@@ -3,8 +3,8 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 // See comments in bits_functions.hh
 #define BITS_TESTING 1

libtests/buffer.cc

@@ -4,10 +4,10 @@
 #include <qpdf/Pl_Count.hh>
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/QUtil.hh>
+#include <cstdlib>
 #include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <cstdlib>
 
 static unsigned char*
 uc(char const* s)

libtests/closed_file_input_source.cc

@@ -1,8 +1,8 @@
 #include <qpdf/ClosedFileInputSource.hh>
 #include <qpdf/FileInputSource.hh>
 
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 void
 check(std::string const& what, bool result)

libtests/dct_compress.cc

@@ -2,10 +2,10 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 usage()

libtests/dct_uncompress.cc

@@ -2,9 +2,9 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 
 int
 main(int argc, char* argv[])

libtests/flate.cc

@@ -4,8 +4,8 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 void
 run(char const* filename)

libtests/hex.cc

@@ -1,8 +1,8 @@
 #include <qpdf/Pl_ASCIIHexDecoder.hh>
 
 #include <qpdf/Pl_StdioFile.hh>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 int
 main()

libtests/json_parse.cc

@@ -15,8 +15,7 @@ namespace
         void arrayStart() override;
         void containerEnd(JSON const& value) override;
         void topLevelScalar() override;
-        bool
+        bool dictionaryItem(std::string const& key, JSON const& value) override;
-        dictionaryItem(std::string const& key, JSON const& value) override;
         bool arrayItem(JSON const& value) override;
 
       private:

libtests/lzw.cc

@@ -2,9 +2,9 @@
 
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 int
 main(int argc, char* argv[])

libtests/md5.cc

@@ -2,8 +2,8 @@
 #include <qpdf/Pl_Discard.hh>
 #include <qpdf/Pl_MD5.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
+#include <iostream>
 
 static void
 test_string(char const* str)

libtests/predictors.cc

@@ -6,9 +6,9 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 void
 run(char const* filename,

libtests/qutil.cc

@@ -3,11 +3,11 @@
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/QPDFSystemError.hh>
 #include <qpdf/QUtil.hh>
-#include <fstream>
-#include <iostream>
 #include <climits>
 #include <cstdio>
 #include <cstring>
+#include <fstream>
+#include <iostream>
 
 #ifdef _WIN32
 # include <io.h>

libtests/rc4.cc

@@ -5,10 +5,10 @@
 #include <qpdf/QIntC.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static void
 other_tests()

libtests/runlength.cc

@@ -2,10 +2,10 @@
 #include <qpdf/Pl_StdioFile.hh>
 #include <qpdf/QUtil.hh>
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 int
 main(int argc, char* argv[])

libtests/sha2.cc

@@ -1,7 +1,7 @@
 #include <qpdf/Pl_SHA2.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 static void
 test(

qpdf/pdf_from_scratch.cc

@@ -4,10 +4,10 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 

qpdf/test_driver.cc

@@ -26,13 +26,13 @@
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QTC.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <climits>
-#include <map>
-#include <sstream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
+#include <map>
+#include <sstream>
 
 #define QPDF_OBJECT_NOWARN
 #include <qpdf/QPDFObject.hh>

qpdf/test_large_file.cc

@@ -12,9 +12,9 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFWriter.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 // Run "test_large_file write small a.pdf" to get a PDF file that you
 // can look at in a reader.

qpdf/test_pdf_doc_encoding.cc

@@ -1,8 +1,8 @@
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 

qpdf/test_pdf_unicode.cc

@@ -1,8 +1,8 @@
 #include <qpdf/QPDFObjectHandle.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 

qpdf/test_tokenizer.cc

@@ -6,10 +6,10 @@
 #include <qpdf/QPDFPageDocumentHelper.hh>
 #include <qpdf/QPDFTokenizer.hh>
 #include <qpdf/QUtil.hh>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 static char const* whoami = nullptr;
 
@@ -203,8 +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();
-        auto* bis =
+        auto* bis = new BufferInputSource("content data", content_data.get());
-            new BufferInputSource("content data", content_data.get());
         is = std::shared_ptr<InputSource>(bis);
         dump_tokens(
             is,
@@ -220,8 +219,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<Buffer> b = obj.getStreamData(qpdf_dl_specialized);
-            auto* bis =
+            auto* bis = new BufferInputSource("object stream data", b.get());
-                new BufferInputSource("object stream data", b.get());
             is = std::shared_ptr<InputSource>(bis);
             dump_tokens(
                 is,

qpdf/test_unicode_filenames.cc

@@ -5,9 +5,9 @@
 # include <windows.h>
 #endif
 
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
+#include <iostream>
 
 static void
 do_copy(FILE* in, FILE* out)

zlib-flate/zlib-flate.cc

@@ -3,11 +3,11 @@
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>
 
-#include <fcntl.h>
-#include <iostream>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <fcntl.h>
+#include <iostream>
 
 static char const* whoami = nullptr;