OpenSystemsDevelopment / qpdf

Commit d740c6ccced02147f84a39d5e5f0984d12bac6cb

Authored by Jay Berkenbilt
1 parent 5f02c7c9

Rerun format_code (after merging clang-tidy PR)

Inline Side-by-side
Showing 65 changed files with 91 additions and 105 deletions
examples/pdf-bookmarks.cc
  View file @d740c6c
... ... @@ -4,9 +4,9 @@
4 4 #include <qpdf/QPDFPageDocumentHelper.hh>
5 5 #include <qpdf/QTC.hh>
6 6 #include <qpdf/QUtil.hh>
7   -#include <iostream>
8 7 #include <cstdlib>
9 8 #include <cstring>
  9 +#include <iostream>
10 10  
11 11 // This program demonstrates extraction of bookmarks using the qpdf
12 12 // outlines API. Note that all the information shown by this program
... ...
examples/pdf-count-strings.cc
  View file @d740c6c
... ... @@ -4,8 +4,8 @@
4 4 // that uses QPDFObjectHandle::TokenFilter with addContentTokenFilter.
5 5 //
6 6  
7   -#include <iostream>
8 7 #include <cstdlib>
  8 +#include <iostream>
9 9  
10 10 #include <qpdf/Pl_StdioFile.hh>
11 11 #include <qpdf/QPDF.hh>
... ...
examples/pdf-create.cc
  View file @d740c6c
... ... @@ -14,9 +14,9 @@
14 14 #include <qpdf/QPDFPageDocumentHelper.hh>
15 15 #include <qpdf/QPDFWriter.hh>
16 16 #include <qpdf/QUtil.hh>
  17 +#include <cstdlib>
17 18 #include <iostream>
18 19 #include <memory>
19   -#include <cstdlib>
20 20  
21 21 static char const* whoami = nullptr;
22 22  
... ...
examples/pdf-custom-filter.cc
  View file @d740c6c
... ... @@ -200,8 +200,7 @@ class StreamReplacer: public QPDFObjectHandle::StreamDataProvider
200 200 public:
201 201 StreamReplacer(QPDF* pdf);
202 202 ~StreamReplacer() override = default;
203   - void
204   - provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
  203 + void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
205 204  
206 205 void registerStream(
207 206 QPDFObjectHandle stream,
... ...
examples/pdf-double-page-size.cc
  View file @d740c6c
... ... @@ -4,9 +4,9 @@
4 4 #include <qpdf/QPDFPageObjectHelper.hh>
5 5 #include <qpdf/QPDFWriter.hh>
6 6 #include <qpdf/QUtil.hh>
7   -#include <iostream>
8 7 #include <cstdlib>
9 8 #include <cstring>
  9 +#include <iostream>
10 10  
11 11 static char const* whoami = nullptr;
12 12  
... ...
examples/pdf-filter-tokens.cc
  View file @d740c6c
... ... @@ -6,9 +6,9 @@
6 6 //
7 7  
8 8 #include <algorithm>
  9 +#include <cstdlib>
9 10 #include <deque>
10 11 #include <iostream>
11   -#include <cstdlib>
12 12  
13 13 #include <qpdf/QPDF.hh>
14 14 #include <qpdf/QPDFObjectHandle.hh>
... ...
examples/pdf-invert-images.cc
  View file @d740c6c
... ... @@ -5,9 +5,9 @@
5 5 #include <qpdf/QPDFPageObjectHelper.hh>
6 6 #include <qpdf/QPDFWriter.hh>
7 7 #include <qpdf/QUtil.hh>
8   -#include <iostream>
9 8 #include <cstdlib>
10 9 #include <cstring>
  10 +#include <iostream>
11 11  
12 12 static char const* whoami = nullptr;
13 13  
... ... @@ -34,8 +34,7 @@ class ImageInverter: public QPDFObjectHandle::StreamDataProvider
34 34 {
35 35 public:
36 36 ~ImageInverter() override = default;
37   - void
38   - provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
  37 + void provideStreamData(QPDFObjGen const& og, Pipeline* pipeline) override;
39 38  
40 39 void registerImage(
41 40 QPDFObjectHandle image,
... ...
examples/pdf-mod-info.cc
  View file @d740c6c
... ... @@ -5,10 +5,10 @@
5 5 #include <qpdf/QPDFWriter.hh>
6 6 #include <qpdf/QTC.hh>
7 7 #include <qpdf/QUtil.hh>
8   -#include <iostream>
9 8 #include <cstdio>
10 9 #include <cstdlib>
11 10 #include <cstring>
  11 +#include <iostream>
12 12  
13 13 static char const* version = "1.1";
14 14 static char const* whoami = nullptr;
... ...
examples/pdf-npages.cc
  View file @d740c6c
1   -#include <iostream>
2 1 #include <cstdlib>
3 2 #include <cstring>
  3 +#include <iostream>
4 4  
5 5 #include <qpdf/QPDF.hh>
6 6 #include <qpdf/QUtil.hh>
... ...
examples/pdf-overlay-page.cc
  View file @d740c6c
... ... @@ -3,8 +3,8 @@
3 3 #include <qpdf/QPDFPageObjectHelper.hh>
4 4 #include <qpdf/QPDFWriter.hh>
5 5 #include <qpdf/QUtil.hh>
6   -#include <iostream>
7 6 #include <cstdlib>
  7 +#include <iostream>
8 8  
9 9 // This program demonstrates use of form XObjects to overlay a page
10 10 // from one file onto all pages of another file. The qpdf program's
... ...
examples/pdf-parse-content.cc
  View file @d740c6c
1   -#include <iostream>
2 1 #include <cstdlib>
  2 +#include <iostream>
3 3  
4 4 #include <qpdf/QIntC.hh>
5 5 #include <qpdf/QPDF.hh>
... ...
examples/pdf-set-form-values.cc
  View file @d740c6c
... ... @@ -3,8 +3,8 @@
3 3 #include <qpdf/QPDFPageDocumentHelper.hh>
4 4 #include <qpdf/QPDFWriter.hh>
5 5 #include <qpdf/QUtil.hh>
6   -#include <iostream>
7 6 #include <cstdlib>
  7 +#include <iostream>
8 8  
9 9 static char const* whoami = nullptr;
10 10  
... ...
examples/pdf-split-pages.cc
  View file @d740c6c
... ... @@ -10,9 +10,9 @@
10 10 #include <qpdf/QPDFWriter.hh>
11 11 #include <qpdf/QUtil.hh>
12 12  
  13 +#include <cstdlib>
13 14 #include <cstring>
14 15 #include <iostream>
15   -#include <cstdlib>
16 16 #include <string>
17 17  
18 18 static bool static_id = false;
... ...
include/qpdf/Buffer.hh
  View file @d740c6c
... ... @@ -25,8 +25,8 @@
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
27 27  
28   -#include <memory>
29 28 #include <cstddef>
  29 +#include <memory>
30 30  
31 31 class Buffer
32 32 {
... ...
include/qpdf/InputSource.hh
  View file @d740c6c
... ... @@ -26,8 +26,8 @@
26 26 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
27 27 #include <qpdf/Types.h>
28 28  
29   -#include <memory>
30 29 #include <cstdio>
  30 +#include <memory>
31 31 #include <string>
32 32  
33 33 // Remember to use QPDF_DLL_CLASS on anything derived from InputSource
... ...
include/qpdf/QPDF.hh
  View file @d740c6c
... ... @@ -25,12 +25,12 @@
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/Types.h>
27 27  
  28 +#include <cstdio>
28 29 #include <functional>
29 30 #include <iostream>
30 31 #include <list>
31 32 #include <map>
32 33 #include <memory>
33   -#include <cstdio>
34 34 #include <string>
35 35 #include <string_view>
36 36 #include <vector>
... ... @@ -113,8 +113,8 @@ class QPDF
113 113 // your own method of retrieving a PDF file, you can subclass
114 114 // InputSource and use this method.
115 115 QPDF_DLL
116   - void
117   - processInputSource(std::shared_ptr<InputSource>, char const* password = nullptr);
  116 + void processInputSource(
  117 + std::shared_ptr<InputSource>, char const* password = nullptr);
118 118  
119 119 // Create a PDF from an input source that contains JSON as written
120 120 // by writeJSON (or qpdf --json-output, version 2 or higher). The
... ...
include/qpdf/QPDFJob.hh
  View file @d740c6c
... ... @@ -497,7 +497,8 @@ class QPDFJob
497 497  
498 498 // Helper functions
499 499 static void usage(std::string const& msg);
500   - static JSON json_schema(int json_version, std::set<std::string>* keys = nullptr);
  500 + static JSON
  501 + json_schema(int json_version, std::set<std::string>* keys = nullptr);
501 502 static void parse_object_id(
502 503 std::string const& objspec, bool& trailer, int& obj, int& gen);
503 504 void parseRotationParameter(std::string const&);
... ...
include/qpdf/QPDFPageObjectHelper.hh
  View file @d740c6c
... ... @@ -319,8 +319,8 @@ class QPDFPageObjectHelper: public QPDFObjectHelper
319 319 // contents, as happens with addContentTokenFilter. See
320 320 // examples/pdf-count-strings.cc for an example.
321 321 QPDF_DLL
322   - void
323   - filterContents(QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
  322 + void filterContents(
  323 + QPDFObjectHandle::TokenFilter* filter, Pipeline* next = nullptr);
324 324  
325 325 // Old name -- calls filterContents()
326 326 QPDF_DLL
... ...
include/qpdf/QPDFTokenizer.hh
  View file @d740c6c
... ... @@ -27,8 +27,8 @@
27 27 #include <qpdf/InputSource.hh>
28 28 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
29 29  
30   -#include <memory>
31 30 #include <cstdio>
  31 +#include <memory>
32 32 #include <string>
33 33  
34 34 class QPDFTokenizer
... ...
include/qpdf/QPDFWriter.hh
  View file @d740c6c
... ... @@ -29,12 +29,12 @@
29 29 #include <qpdf/DLL.h>
30 30 #include <qpdf/Types.h>
31 31  
  32 +#include <cstdio>
32 33 #include <functional>
33 34 #include <list>
34 35 #include <map>
35 36 #include <memory>
36 37 #include <set>
37   -#include <cstdio>
38 38 #include <string>
39 39 #include <string_view>
40 40 #include <vector>
... ...
include/qpdf/QUtil.hh
  View file @d740c6c
... ... @@ -25,14 +25,14 @@
25 25 #include <qpdf/DLL.h>
26 26 #include <qpdf/PointerHolder.hh> // unused -- remove in qpdf 12 (see #785)
27 27 #include <qpdf/Types.h>
  28 +#include <cstdio>
28 29 #include <cstring>
  30 +#include <ctime>
29 31 #include <functional>
30 32 #include <list>
31 33 #include <memory>
32 34 #include <stdexcept>
33   -#include <cstdio>
34 35 #include <string>
35   -#include <ctime>
36 36 #include <vector>
37 37  
38 38 class RandomDataProvider;
... ...
libqpdf/BufferInputSource.cc
  View file @d740c6c
... ... @@ -2,8 +2,8 @@
2 2  
3 3 #include <qpdf/QIntC.hh>
4 4 #include <algorithm>
5   -#include <sstream>
6 5 #include <cstring>
  6 +#include <sstream>
7 7  
8 8 BufferInputSource::BufferInputSource(
9 9 std::string const& description, Buffer* buf, bool own_memory) :
... ...
libqpdf/InputSource.cc
  View file @d740c6c
... ... @@ -2,8 +2,8 @@
2 2  
3 3 #include <qpdf/QIntC.hh>
4 4 #include <qpdf/QTC.hh>
5   -#include <stdexcept>
6 5 #include <cstring>
  6 +#include <stdexcept>
7 7  
8 8 void
9 9 InputSource::setLastOffset(qpdf_offset_t offset)
... ...
libqpdf/Pl_ASCII85Decoder.cc
  View file @d740c6c
1 1 #include <qpdf/Pl_ASCII85Decoder.hh>
2 2  
3 3 #include <qpdf/QTC.hh>
4   -#include <stdexcept>
5 4 #include <cstring>
  5 +#include <stdexcept>
6 6  
7 7 Pl_ASCII85Decoder::Pl_ASCII85Decoder(char const* identifier, Pipeline* next) :
8 8 Pipeline(identifier, next),
... ...
libqpdf/Pl_Buffer.cc
  View file @d740c6c
1 1 #include <qpdf/Pl_Buffer.hh>
2 2  
3 3 #include <algorithm>
4   -#include <stdexcept>
5 4 #include <cstdlib>
6 5 #include <cstring>
  6 +#include <stdexcept>
7 7  
8 8 Pl_Buffer::Pl_Buffer(char const* identifier, Pipeline* next) :
9 9 Pipeline(identifier, next),
... ...
libqpdf/Pl_DCT.cc
  View file @d740c6c
... ... @@ -24,8 +24,7 @@ namespace
24 24 static void
25 25 error_handler(j_common_ptr cinfo)
26 26 {
27   - auto* jerr =
28   - reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
  27 + auto* jerr = reinterpret_cast<qpdf_jpeg_error_mgr*>(cinfo->err);
29 28 char buf[JMSG_LENGTH_MAX];
30 29 (*cinfo->err->format_message)(cinfo, buf);
31 30 jerr->msg = buf;
... ... @@ -261,8 +260,7 @@ jpeg_buffer_src(j_decompress_ptr cinfo, Buffer* buffer)
261 260 void
262 261 Pl_DCT::compress(void* cinfo_p, Buffer* b)
263 262 {
264   - auto* cinfo =
265   - reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
  263 + auto* cinfo = reinterpret_cast<jpeg_compress_struct*>(cinfo_p);
266 264  
267 265 #if ( \
268 266 (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
... ... @@ -316,8 +314,7 @@ Pl_DCT::compress(void* cinfo_p, Buffer* b)
316 314 void
317 315 Pl_DCT::decompress(void* cinfo_p, Buffer* b)
318 316 {
319   - auto* cinfo =
320   - reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
  317 + auto* cinfo = reinterpret_cast<jpeg_decompress_struct*>(cinfo_p);
321 318  
322 319 #if ( \
323 320 (defined(__GNUC__) && ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) || \
... ...
libqpdf/Pl_LZWDecoder.cc
  View file @d740c6c
... ... @@ -3,8 +3,8 @@
3 3 #include <qpdf/QIntC.hh>
4 4 #include <qpdf/QTC.hh>
5 5 #include <qpdf/QUtil.hh>
6   -#include <stdexcept>
7 6 #include <cstring>
  7 +#include <stdexcept>
8 8  
9 9 Pl_LZWDecoder::Pl_LZWDecoder(
10 10 char const* identifier, Pipeline* next, bool early_code_change) :
... ...
libqpdf/Pl_PNGFilter.cc
  View file @d740c6c
... ... @@ -4,8 +4,8 @@
4 4 #include <qpdf/QUtil.hh>
5 5  
6 6 #include <climits>
7   -#include <stdexcept>
8 7 #include <cstring>
  8 +#include <stdexcept>
9 9  
10 10 static int
11 11 abs_diff(int a, int b)
... ...
libqpdf/Pl_TIFFPredictor.cc
  View file @d740c6c
... ... @@ -6,8 +6,8 @@
6 6 #include <qpdf/QUtil.hh>
7 7  
8 8 #include <climits>
9   -#include <stdexcept>
10 9 #include <cstring>
  10 +#include <stdexcept>
11 11 #include <vector>
12 12  
13 13 Pl_TIFFPredictor::Pl_TIFFPredictor(
... ...
libqpdf/QPDF.cc
  View file @d740c6c
... ... @@ -4,13 +4,13 @@
4 4  
5 5 #include <algorithm>
6 6 #include <atomic>
  7 +#include <cstdlib>
  8 +#include <cstring>
7 9 #include <limits>
8 10 #include <map>
9 11 #include <memory.h>
10 12 #include <regex>
11 13 #include <sstream>
12   -#include <cstdlib>
13   -#include <cstring>
14 14 #include <vector>
15 15  
16 16 #include <qpdf/BufferInputSource.hh>
... ... @@ -2528,9 +2528,7 @@ QPDF::getCompressibleObjGens()
2528 2528 if (obj.isStream()) {
2529 2529 QPDFObjectHandle dict = obj.getDict();
2530 2530 std::set<std::string> keys = dict.getKeys();
2531   - for (auto iter = keys.rbegin();
2532   - iter != keys.rend();
2533   - ++iter) {
  2531 + for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
2534 2532 std::string const& key = *iter;
2535 2533 QPDFObjectHandle value = dict.getKey(key);
2536 2534 if (key == "/Length") {
... ... @@ -2544,9 +2542,7 @@ QPDF::getCompressibleObjGens()
2544 2542 }
2545 2543 } else if (obj.isDictionary()) {
2546 2544 std::set<std::string> keys = obj.getKeys();
2547   - for (auto iter = keys.rbegin();
2548   - iter != keys.rend();
2549   - ++iter) {
  2545 + for (auto iter = keys.rbegin(); iter != keys.rend(); ++iter) {
2550 2546 queue.push_front(obj.getKey(*iter));
2551 2547 }
2552 2548 } else if (obj.isArray()) {
... ...
libqpdf/QPDFJob.cc
  View file @d740c6c
1 1 #include <qpdf/QPDFJob.hh>
2 2  
  3 +#include <cctype>
3 4 #include <cstdio>
4 5 #include <cstdlib>
5 6 #include <cstring>
6   -#include <cctype>
7 7 #include <fcntl.h>
8 8 #include <iostream>
9 9 #include <memory>
... ...
libqpdf/QPDFJob_argv.cc
  View file @d740c6c
... ... @@ -2,13 +2,13 @@
2 2  
3 3 // See "HOW TO ADD A COMMAND-LINE ARGUMENT" in README-maintainer.
4 4  
5   -#include <cstdio>
6 5 #include <cctype>
  6 +#include <cstdio>
  7 +#include <cstdlib>
  8 +#include <cstring>
7 9 #include <iostream>
8 10 #include <memory>
9 11 #include <sstream>
10   -#include <cstdlib>
11   -#include <cstring>
12 12  
13 13 #include <qpdf/QIntC.hh>
14 14 #include <qpdf/QPDFArgParser.hh>
... ...
libqpdf/QPDFObjectHandle.cc
  View file @d740c6c
... ... @@ -29,11 +29,11 @@
29 29 #include <qpdf/QUtil.hh>
30 30  
31 31 #include <algorithm>
32   -#include <cstring>
33 32 #include <cctype>
34 33 #include <climits>
35   -#include <stdexcept>
36 34 #include <cstdlib>
  35 +#include <cstring>
  36 +#include <stdexcept>
37 37  
38 38 using namespace std::literals;
39 39  
... ...
libqpdf/QPDFTokenizer.cc
  View file @d740c6c
... ... @@ -10,9 +10,9 @@
10 10 #include <qpdf/QTC.hh>
11 11 #include <qpdf/QUtil.hh>
12 12  
13   -#include <stdexcept>
14 13 #include <cstdlib>
15 14 #include <cstring>
  15 +#include <stdexcept>
16 16  
17 17 static inline bool
18 18 is_delimiter(char ch)
... ...
libqpdf/QPDFWriter.cc
  View file @d740c6c
... ... @@ -23,8 +23,8 @@
23 23 #include <qpdf/RC4.hh>
24 24  
25 25 #include <algorithm>
26   -#include <stdexcept>
27 26 #include <cstdlib>
  27 +#include <stdexcept>
28 28  
29 29 QPDFWriter::ProgressReporter::~ProgressReporter()
30 30 {
... ... @@ -997,8 +997,7 @@ void
997 997 QPDFWriter::activatePipelineStack(PipelinePopper& pp)
998 998 {
999 999 std::string stack_id("stack " + std::to_string(this->m->next_stack_id));
1000   - auto* c =
1001   - new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back());
  1000 + auto* c = new Pl_Count(stack_id.c_str(), this->m->pipeline_stack.back());
1002 1001 ++this->m->next_stack_id;
1003 1002 this->m->pipeline_stack.push_back(c);
1004 1003 this->m->pipeline = c;
... ...
libqpdf/QPDF_json.cc
  View file @d740c6c
... ... @@ -246,8 +246,7 @@ class QPDF::JSONReactor: public JSON::Reactor
246 246 void arrayStart() override;
247 247 void containerEnd(JSON const& value) override;
248 248 void topLevelScalar() override;
249   - bool
250   - dictionaryItem(std::string const& key, JSON const& value) override;
  249 + bool dictionaryItem(std::string const& key, JSON const& value) override;
251 250 bool arrayItem(JSON const& value) override;
252 251  
253 252 bool anyErrors() const;
... ...
libqpdf/QTC.cc
  View file @d740c6c
1 1 #include <qpdf/QTC.hh>
2 2  
3 3 #include <qpdf/QUtil.hh>
  4 +#include <cstdio>
4 5 #include <map>
5 6 #include <set>
6   -#include <cstdio>
7 7  
8 8 static bool
9 9 tc_active(char const* const scope)
... ...
libqpdf/QUtil.cc
  View file @d740c6c
... ... @@ -11,6 +11,9 @@
11 11  
12 12 #include <cctype>
13 13 #include <cerrno>
  14 +#include <cstdio>
  15 +#include <cstdlib>
  16 +#include <cstring>
14 17 #include <fcntl.h>
15 18 #include <fstream>
16 19 #include <iomanip>
... ... @@ -21,9 +24,6 @@
21 24 #include <set>
22 25 #include <sstream>
23 26 #include <stdexcept>
24   -#include <cstdio>
25   -#include <cstdlib>
26   -#include <cstring>
27 27 #ifndef QPDF_NO_WCHAR_T
28 28 # include <cwchar>
29 29 #endif
... ...
libqpdf/RC4.cc
  View file @d740c6c
... ... @@ -2,7 +2,6 @@
2 2  
3 3 #include <qpdf/QPDFCryptoProvider.hh>
4 4  
5   -
6 5 RC4::RC4(unsigned char const* key_data, int key_len) :
7 6 crypto(QPDFCryptoProvider::getImpl())
8 7 {
... ...
libtests/aes.cc
  View file @d740c6c
... ... @@ -3,10 +3,10 @@
3 3 #include <qpdf/QIntC.hh>
4 4 #include <qpdf/QUtil.hh>
5 5  
6   -#include <iostream>
7 6 #include <cstdio>
8 7 #include <cstdlib>
9 8 #include <cstring>
  9 +#include <iostream>
10 10  
11 11 static void
12 12 usage()
... ...
libtests/ascii85.cc
  View file @d740c6c
1 1 #include <qpdf/Pl_ASCII85Decoder.hh>
2 2  
3 3 #include <qpdf/Pl_StdioFile.hh>
4   -#include <iostream>
5 4 #include <cstdlib>
  5 +#include <iostream>
6 6  
7 7 int
8 8 main()
... ...
libtests/bits.cc
  View file @d740c6c
... ... @@ -3,8 +3,8 @@
3 3 #include <qpdf/Pl_Buffer.hh>
4 4 #include <qpdf/QIntC.hh>
5 5 #include <qpdf/QUtil.hh>
6   -#include <iostream>
7 6 #include <cstdlib>
  7 +#include <iostream>
8 8  
9 9 // See comments in bits_functions.hh
10 10 #define BITS_TESTING 1
... ...
libtests/buffer.cc
  View file @d740c6c
... ... @@ -4,10 +4,10 @@
4 4 #include <qpdf/Pl_Count.hh>
5 5 #include <qpdf/Pl_Discard.hh>
6 6 #include <qpdf/QUtil.hh>
  7 +#include <cstdlib>
7 8 #include <cstring>
8 9 #include <iostream>
9 10 #include <stdexcept>
10   -#include <cstdlib>
11 11  
12 12 static unsigned char*
13 13 uc(char const* s)
... ...
libtests/closed_file_input_source.cc
  View file @d740c6c
1 1 #include <qpdf/ClosedFileInputSource.hh>
2 2 #include <qpdf/FileInputSource.hh>
3 3  
4   -#include <iostream>
5 4 #include <cstdio>
  5 +#include <iostream>
6 6  
7 7 void
8 8 check(std::string const& what, bool result)
... ...
libtests/dct_compress.cc
  View file @d740c6c
... ... @@ -2,10 +2,10 @@
2 2 #include <qpdf/Pl_StdioFile.hh>
3 3 #include <qpdf/QUtil.hh>
4 4  
5   -#include <iostream>
6 5 #include <cstdio>
7 6 #include <cstdlib>
8 7 #include <cstring>
  8 +#include <iostream>
9 9  
10 10 static void
11 11 usage()
... ...
libtests/dct_uncompress.cc
  View file @d740c6c
... ... @@ -2,9 +2,9 @@
2 2 #include <qpdf/Pl_StdioFile.hh>
3 3 #include <qpdf/QUtil.hh>
4 4  
5   -#include <iostream>
6 5 #include <cstdio>
7 6 #include <cstdlib>
  7 +#include <iostream>
8 8  
9 9 int
10 10 main(int argc, char* argv[])
... ...
libtests/flate.cc
  View file @d740c6c
... ... @@ -4,8 +4,8 @@
4 4 #include <qpdf/Pl_StdioFile.hh>
5 5 #include <qpdf/QUtil.hh>
6 6  
7   -#include <iostream>
8 7 #include <cstdlib>
  8 +#include <iostream>
9 9  
10 10 void
11 11 run(char const* filename)
... ...
libtests/hex.cc
  View file @d740c6c
1 1 #include <qpdf/Pl_ASCIIHexDecoder.hh>
2 2  
3 3 #include <qpdf/Pl_StdioFile.hh>
4   -#include <iostream>
5 4 #include <cstdlib>
  5 +#include <iostream>
6 6  
7 7 int
8 8 main()
... ...
libtests/json_parse.cc
  View file @d740c6c
... ... @@ -15,8 +15,7 @@ namespace
15 15 void arrayStart() override;
16 16 void containerEnd(JSON const& value) override;
17 17 void topLevelScalar() override;
18   - bool
19   - dictionaryItem(std::string const& key, JSON const& value) override;
  18 + bool dictionaryItem(std::string const& key, JSON const& value) override;
20 19 bool arrayItem(JSON const& value) override;
21 20  
22 21 private:
... ...
libtests/lzw.cc
  View file @d740c6c
... ... @@ -2,9 +2,9 @@
2 2  
3 3 #include <qpdf/Pl_StdioFile.hh>
4 4 #include <qpdf/QUtil.hh>
5   -#include <iostream>
6 5 #include <cstdlib>
7 6 #include <cstring>
  7 +#include <iostream>
8 8  
9 9 int
10 10 main(int argc, char* argv[])
... ...
libtests/md5.cc
  View file @d740c6c
... ... @@ -2,8 +2,8 @@
2 2 #include <qpdf/Pl_Discard.hh>
3 3 #include <qpdf/Pl_MD5.hh>
4 4 #include <qpdf/QUtil.hh>
5   -#include <iostream>
6 5 #include <cstdio>
  6 +#include <iostream>
7 7  
8 8 static void
9 9 test_string(char const* str)
... ...
libtests/predictors.cc
  View file @d740c6c
... ... @@ -6,9 +6,9 @@
6 6 #include <qpdf/QIntC.hh>
7 7 #include <qpdf/QUtil.hh>
8 8  
9   -#include <iostream>
10 9 #include <cstdlib>
11 10 #include <cstring>
  11 +#include <iostream>
12 12  
13 13 void
14 14 run(char const* filename,
... ...
libtests/qintc.cc
  View file @d740c6c
... ... @@ -69,11 +69,11 @@ try_range_check_subtract_real(
69 69 int
70 70 main()
71 71 {
72   - uint32_t u1 = 3141592653U; // Too big for signed type
73   - int32_t i1 = -1153374643; // Same bit pattern as u1
74   - uint64_t ul1 = 1099511627776LL; // Too big for 32-bit
75   - uint64_t ul2 = 12345; // Fits into 32-bit
76   - int32_t i2 = 81; // Fits in char and uchar
  72 + uint32_t u1 = 3141592653U; // Too big for signed type
  73 + int32_t i1 = -1153374643; // Same bit pattern as u1
  74 + uint64_t ul1 = 1099511627776LL; // Too big for 32-bit
  75 + uint64_t ul2 = 12345; // Fits into 32-bit
  76 + int32_t i2 = 81; // Fits in char and uchar
77 77 auto c1 = static_cast<signed char>('\xf7'); // Signed value when char
78 78 char c2 = 'W'; // char; may be signed or unsigned
79 79  
... ...
libtests/qutil.cc
  View file @d740c6c
... ... @@ -3,11 +3,11 @@
3 3 #include <qpdf/Pl_Buffer.hh>
4 4 #include <qpdf/QPDFSystemError.hh>
5 5 #include <qpdf/QUtil.hh>
6   -#include <fstream>
7   -#include <iostream>
8 6 #include <climits>
9 7 #include <cstdio>
10 8 #include <cstring>
  9 +#include <fstream>
  10 +#include <iostream>
11 11  
12 12 #ifdef _WIN32
13 13 # include <io.h>
... ...
libtests/rc4.cc
  View file @d740c6c
... ... @@ -5,10 +5,10 @@
5 5 #include <qpdf/QIntC.hh>
6 6 #include <qpdf/QUtil.hh>
7 7  
8   -#include <iostream>
9 8 #include <cstdio>
10 9 #include <cstdlib>
11 10 #include <cstring>
  11 +#include <iostream>
12 12  
13 13 static void
14 14 other_tests()
... ...
libtests/runlength.cc
  View file @d740c6c
... ... @@ -2,10 +2,10 @@
2 2 #include <qpdf/Pl_StdioFile.hh>
3 3 #include <qpdf/QUtil.hh>
4 4  
5   -#include <iostream>
6 5 #include <cstdio>
7 6 #include <cstdlib>
8 7 #include <cstring>
  8 +#include <iostream>
9 9  
10 10 int
11 11 main(int argc, char* argv[])
... ...
libtests/sha2.cc
  View file @d740c6c
1 1 #include <qpdf/Pl_SHA2.hh>
2 2 #include <qpdf/QUtil.hh>
3   -#include <iostream>
4 3 #include <cstring>
  4 +#include <iostream>
5 5  
6 6 static void
7 7 test(
... ...
qpdf/pdf_from_scratch.cc
  View file @d740c6c
... ... @@ -4,10 +4,10 @@
4 4 #include <qpdf/QPDFPageDocumentHelper.hh>
5 5 #include <qpdf/QPDFWriter.hh>
6 6 #include <qpdf/QUtil.hh>
7   -#include <iostream>
8 7 #include <cstdio>
9 8 #include <cstdlib>
10 9 #include <cstring>
  10 +#include <iostream>
11 11  
12 12 static char const* whoami = nullptr;
13 13  
... ...
qpdf/test_driver.cc
  View file @d740c6c
... ... @@ -26,13 +26,13 @@
26 26 #include <qpdf/QPDFWriter.hh>
27 27 #include <qpdf/QTC.hh>
28 28 #include <qpdf/QUtil.hh>
29   -#include <iostream>
30 29 #include <climits>
31   -#include <map>
32   -#include <sstream>
33 30 #include <cstdio>
34 31 #include <cstdlib>
35 32 #include <cstring>
  33 +#include <iostream>
  34 +#include <map>
  35 +#include <sstream>
36 36  
37 37 #define QPDF_OBJECT_NOWARN
38 38 #include <qpdf/QPDFObject.hh>
... ...
qpdf/test_large_file.cc
  View file @d740c6c
... ... @@ -12,9 +12,9 @@
12 12 #include <qpdf/QPDFPageDocumentHelper.hh>
13 13 #include <qpdf/QPDFWriter.hh>
14 14 #include <qpdf/QUtil.hh>
15   -#include <iostream>
16 15 #include <cstdlib>
17 16 #include <cstring>
  17 +#include <iostream>
18 18  
19 19 // Run "test_large_file write small a.pdf" to get a PDF file that you
20 20 // can look at in a reader.
... ...
qpdf/test_pdf_doc_encoding.cc
  View file @d740c6c
1 1 #include <qpdf/QPDFObjectHandle.hh>
2 2 #include <qpdf/QUtil.hh>
3   -#include <iostream>
4 3 #include <cstdlib>
5 4 #include <cstring>
  5 +#include <iostream>
6 6  
7 7 static char const* whoami = nullptr;
8 8  
... ...
qpdf/test_pdf_unicode.cc
  View file @d740c6c
1 1 #include <qpdf/QPDFObjectHandle.hh>
2 2 #include <qpdf/QUtil.hh>
3   -#include <iostream>
4 3 #include <cstdlib>
5 4 #include <cstring>
  5 +#include <iostream>
6 6  
7 7 static char const* whoami = nullptr;
8 8  
... ...
qpdf/test_tokenizer.cc
  View file @d740c6c
... ... @@ -6,10 +6,10 @@
6 6 #include <qpdf/QPDFPageDocumentHelper.hh>
7 7 #include <qpdf/QPDFTokenizer.hh>
8 8 #include <qpdf/QUtil.hh>
9   -#include <iostream>
10 9 #include <cstdio>
11 10 #include <cstdlib>
12 11 #include <cstring>
  12 +#include <iostream>
13 13  
14 14 static char const* whoami = nullptr;
15 15  
... ... @@ -203,8 +203,7 @@ process(char const* filename, bool include_ignorable, size_t max_len)
203 203 Pl_Buffer plb("buffer");
204 204 page.pipeContents(&plb);
205 205 auto content_data = plb.getBufferSharedPointer();
206   - auto* bis =
207   - new BufferInputSource("content data", content_data.get());
  206 + auto* bis = new BufferInputSource("content data", content_data.get());
208 207 is = std::shared_ptr<InputSource>(bis);
209 208 dump_tokens(
210 209 is,
... ... @@ -220,8 +219,7 @@ process(char const* filename, bool include_ignorable, size_t max_len)
220 219 if (obj.isStream() && obj.getDict().getKey("/Type").isName() &&
221 220 obj.getDict().getKey("/Type").getName() == "/ObjStm") {
222 221 std::shared_ptr<Buffer> b = obj.getStreamData(qpdf_dl_specialized);
223   - auto* bis =
224   - new BufferInputSource("object stream data", b.get());
  222 + auto* bis = new BufferInputSource("object stream data", b.get());
225 223 is = std::shared_ptr<InputSource>(bis);
226 224 dump_tokens(
227 225 is,
... ...
qpdf/test_unicode_filenames.cc
  View file @d740c6c
... ... @@ -5,9 +5,9 @@
5 5 # include <windows.h>
6 6 #endif
7 7  
8   -#include <iostream>
9 8 #include <cstdio>
10 9 #include <cstdlib>
  10 +#include <iostream>
11 11  
12 12 static void
13 13 do_copy(FILE* in, FILE* out)
... ...
zlib-flate/zlib-flate.cc
  View file @d740c6c
... ... @@ -3,11 +3,11 @@
3 3 #include <qpdf/QPDF.hh>
4 4 #include <qpdf/QUtil.hh>
5 5  
6   -#include <fcntl.h>
7   -#include <iostream>
8 6 #include <cstdio>
9 7 #include <cstdlib>
10 8 #include <cstring>
  9 +#include <fcntl.h>
  10 +#include <iostream>
11 11  
12 12 static char const* whoami = nullptr;
13 13  
... ...