Rerun format_code (after merging clang-tidy PR)

tingweihg · May 20, 2023 · d740c6c · d740c6c
1 parent 5f02c7c
commit d740c6c
Show file tree

Hide file tree

Showing 65 changed files with 91 additions and 105 deletions.
diff --git a/examples/pdf-bookmarks.cc b/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

diff --git a/examples/pdf-count-strings.cc b/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>

diff --git a/examples/pdf-create.cc b/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;
 

diff --git a/examples/pdf-custom-filter.cc b/examples/pdf-custom-filter.cc
@@ -200,8 +200,7 @@ class StreamReplacer: public QPDFObjectHandle::StreamDataProvider
   public:
     StreamReplacer(QPDF* pdf);
     ~StreamReplacer() override = default;
-    void
-    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
+    void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerStream(
         QPDFObjectHandle stream,

diff --git a/examples/pdf-double-page-size.cc b/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;
 

diff --git a/examples/pdf-filter-tokens.cc b/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>

diff --git a/examples/pdf-invert-images.cc b/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
-    provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
+    void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
 
     void registerImage(
         QPDFObjectHandle image,

diff --git a/examples/pdf-mod-info.cc b/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;

diff --git a/examples/pdf-npages.cc b/examples/pdf-npages.cc
@@ -1,6 +1,6 @@
-#include <iostream>
 #include <cstdlib>
 #include <cstring>
+#include <iostream>
 
 #include <qpdf/QPDF.hh>
 #include <qpdf/QUtil.hh>

diff --git a/examples/pdf-overlay-page.cc b/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

diff --git a/examples/pdf-parse-content.cc b/examples/pdf-parse-content.cc
@@ -1,5 +1,5 @@
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 
 #include <qpdf/QIntC.hh>
 #include <qpdf/QPDF.hh>

diff --git a/examples/pdf-set-form-values.cc b/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;
 

diff --git a/examples/pdf-split-pages.cc b/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;

diff --git a/include/qpdf/Buffer.hh b/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
 {

diff --git a/include/qpdf/InputSource.hh b/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

diff --git a/include/qpdf/QPDF.hh b/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
-    processInputSource(std::shared_ptr<InputSource>, char const* password = nullptr);
+    void processInputSource(
+        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

diff --git a/include/qpdf/QPDFJob.hh b/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&);

diff --git a/include/qpdf/QPDFPageObjectHelper.hh b/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
-    filterContents(QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
+    void filterContents(
+        QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
 
     // Old name -- calls filterContents()
     QPDF_DLL

diff --git a/include/qpdf/QPDFTokenizer.hh b/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

diff --git a/include/qpdf/QPDFWriter.hh b/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>

diff --git a/include/qpdf/QUtil.hh b/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;

diff --git a/libqpdf/BufferInputSource.cc b/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) :

diff --git a/libqpdf/InputSource.cc b/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)

diff --git a/libqpdf/Pl_ASCII85Decoder.cc b/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),

diff --git a/libqpdf/Pl_Buffer.cc b/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),

diff --git a/libqpdf/Pl_DCT.cc b/libqpdf/Pl_DCT.cc
@@ -24,8 +24,7 @@ namespace
 static void
 error_handler(j_common_ptr cinfo)
 {
-    auto* jerr =
-        reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
+    auto* jerr = 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 =
-        reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
+    auto* cinfo = 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 =
-        reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
+    auto* cinfo = reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
 
 #if ( \
     (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \

diff --git a/libqpdf/Pl_LZWDecoder.cc b/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) :

diff --git a/libqpdf/Pl_PNGFilter.cc b/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)

diff --git a/libqpdf/Pl_TIFFPredictor.cc 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(

diff --git a/libqpdf/QPDF.cc b/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();
-                 iter != keys.rend();
-                 ++iter) {
+            for (auto iter = keys.rbegin(); 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();
-                 iter != keys.rend();
-                 ++iter) {
+            for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
                 queue.push_front(obj.getKey(*iter));
             }
         } else if (obj.isArray()) {

diff --git a/libqpdf/QPDFJob.cc b/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>