diff options
Diffstat (limited to 'libtests')
| -rw-r--r-- | libtests/arg_parser.cc | 5 | ||||
| -rw-r--r-- | libtests/buffer.cc | 32 | ||||
| -rw-r--r-- | libtests/dct_compress.cc | 10 | ||||
| -rw-r--r-- | libtests/json_parse.cc | 2 | ||||
| -rw-r--r-- | libtests/random.cc | 6 |
5 files changed, 40 insertions, 15 deletions
diff --git a/libtests/arg_parser.cc b/libtests/arg_parser.cc index fde00520..ad9d85e9 100644 --- a/libtests/arg_parser.cc +++ b/libtests/arg_parser.cc @@ -28,12 +28,11 @@ class ArgParser void output(std::string const&); QPDFArgParser ap; - int quacks; + int quacks{0}; }; ArgParser::ArgParser(int argc, char* argv[]) : - ap(QPDFArgParser(argc, argv, "TEST_ARG_PARSER")), - quacks(0) + ap(QPDFArgParser(argc, argv, "TEST_ARG_PARSER")) { initOptions(); } diff --git a/libtests/buffer.cc b/libtests/buffer.cc index 86a52899..e62a37ca 100644 --- a/libtests/buffer.cc +++ b/libtests/buffer.cc @@ -19,7 +19,34 @@ int main() { { - // Test that buffers can be copied by value. + // Test that buffers can be copied by value using Buffer::copy. + Buffer bc1(2); + unsigned char* bc1p = bc1.getBuffer(); + bc1p[0] = 'Q'; + bc1p[1] = 'W'; + Buffer bc2(bc1.copy()); + bc1p[0] = 'R'; + unsigned char* bc2p = bc2.getBuffer(); + assert(bc2p != bc1p); + assert(bc2p[0] == 'Q'); + assert(bc2p[1] == 'W'); + bc2 = bc1.copy(); + bc2p = bc2.getBuffer(); + assert(bc2p != bc1p); + assert(bc2p[0] == 'R'); + assert(bc2p[1] == 'W'); + } + +#ifdef _MSC_VER +# pragma warning(disable : 4996) +#endif +#if (defined(__GNUC__) || defined(__clang__)) +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + { + // Test that buffers can be copied by value using copy construction / assignment. + Buffer::setTestMode(); Buffer bc1(2); unsigned char* bc1p = bc1.getBuffer(); bc1p[0] = 'Q'; @@ -36,6 +63,9 @@ main() assert(bc2p[0] == 'R'); assert(bc2p[1] == 'W'); } +#if (defined(__GNUC__) || defined(__clang__)) +# pragma GCC diagnostic pop +#endif { // Test that buffers can be moved. diff --git a/libtests/dct_compress.cc b/libtests/dct_compress.cc index 3f7c86a1..8f7e0913 100644 --- a/libtests/dct_compress.cc +++ b/libtests/dct_compress.cc @@ -10,21 +10,17 @@ static void usage() { - std::cerr << "Usage: dct_compress infile outfile width height" - << " {rgb|cmyk|gray}" << std::endl; + std::cerr << "Usage: dct_compress infile outfile width height {rgb|cmyk|gray}" << std::endl; exit(2); } class Callback: public Pl_DCT::CompressConfig { public: - Callback() : - called(false) - { - } + Callback() = default; ~Callback() override = default; void apply(jpeg_compress_struct*) override; - bool called; + bool called{false}; }; void diff --git a/libtests/json_parse.cc b/libtests/json_parse.cc index 35abb68f..757b698b 100644 --- a/libtests/json_parse.cc +++ b/libtests/json_parse.cc @@ -10,7 +10,7 @@ namespace class Reactor: public JSON::Reactor { public: - virtual ~Reactor() = default; + ~Reactor() override = default; void dictionaryStart() override; void arrayStart() override; void containerEnd(JSON const& value) override; diff --git a/libtests/random.cc b/libtests/random.cc index 899c264c..afd2ed6c 100644 --- a/libtests/random.cc +++ b/libtests/random.cc @@ -6,10 +6,10 @@ class BogusRandomDataProvider: public RandomDataProvider { public: - virtual ~BogusRandomDataProvider() = default; + ~BogusRandomDataProvider() override = default; BogusRandomDataProvider() = default; - virtual void - provideRandomData(unsigned char* data, size_t len) + void + provideRandomData(unsigned char* data, size_t len) override { for (size_t i = 0; i < len; ++i) { data[i] = static_cast<unsigned char>(i & 0xff); |