diff options
| author | Jay Berkenbilt <jberkenbilt@users.noreply.github.com> | 2019-03-11 21:59:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-11 21:59:42 +0100 |
| commit | 62baad2264af6c249ecfe85d4cde4be22cd7808f (patch) | |
| tree | be6c52efa4cbdfe3c20fe689c41c5b3fd06cd252 | |
| parent | 71b7ed9f4f2c88fbdd0eb5a4796beb948fd8188c (diff) | |
| parent | de5c91f324a89ad06be03d3f12e88788eb921db4 (diff) | |
| download | qpdf-62baad2264af6c249ecfe85d4cde4be22cd7808f.tar.zst | |
Merge pull request #294 from ams-tschoening/two_ops_same_val
Two operands must evaluate to the same value.
| -rw-r--r-- | qpdf/qpdf.cc | 2 | ||||
| -rw-r--r-- | qpdf/test_driver.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpdf/qpdf.cc b/qpdf/qpdf.cc index 17484b3f..4ec0a48c 100644 --- a/qpdf/qpdf.cc +++ b/qpdf/qpdf.cc @@ -3836,7 +3836,7 @@ ImageOptimizer::makePipeline(std::string const& description, Pipeline* next) h_obj.isInteger() ? h_obj.getIntValue() : h_obj.getNumericValue()); std::string colorspace = (colorspace_obj.isName() ? colorspace_obj.getName() : - ""); + std::string()); int components = 0; J_COLOR_SPACE cs = JCS_UNKNOWN; if (colorspace == "/DeviceRGB") diff --git a/qpdf/test_driver.cc b/qpdf/test_driver.cc index 462a8a23..d3abbe46 100644 --- a/qpdf/test_driver.cc +++ b/qpdf/test_driver.cc @@ -1631,7 +1631,7 @@ void runtest(int n, char const* filename1, char const* arg2) QPDFFormFieldObjectHelper parent(node.getParent()); std::cout << " Parent: " << (parent.isNull() - ? "none" + ? std::string("none") : parent.getObjectHandle().unparse()) << std::endl; node = parent; |