OpenSystemsDevelopment / qpdf

Commit 62baad2264af6c249ecfe85d4cde4be22cd7808f

Authored by Jay Berkenbilt
Committed by GitHub
2 parents 71b7ed9f de5c91f3

Merge pull request #294 from ams-tschoening/two_ops_same_val 

Two operands must evaluate to the same value.
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
qpdf/qpdf.cc
  View file @62baad2
@@ -3836,7 +3836,7 @@ ImageOptimizer::makePipeline(std::string const& description, Pipeline* next) @@ -3836,7 +3836,7 @@ ImageOptimizer::makePipeline(std::string const& description, Pipeline* next)
3836 h_obj.isInteger() ? h_obj.getIntValue() : h_obj.getNumericValue()); 3836 h_obj.isInteger() ? h_obj.getIntValue() : h_obj.getNumericValue());
3837 std::string colorspace = (colorspace_obj.isName() ? 3837 std::string colorspace = (colorspace_obj.isName() ?
3838 colorspace_obj.getName() : 3838 colorspace_obj.getName() :
3839 - ""); 3839 + std::string());
3840 int components = 0; 3840 int components = 0;
3841 J_COLOR_SPACE cs = JCS_UNKNOWN; 3841 J_COLOR_SPACE cs = JCS_UNKNOWN;
3842 if (colorspace == "/DeviceRGB") 3842 if (colorspace == "/DeviceRGB")
qpdf/test_driver.cc
  View file @62baad2
@@ -1631,7 +1631,7 @@ void runtest(int n, char const* filename1, char const* arg2) @@ -1631,7 +1631,7 @@ void runtest(int n, char const* filename1, char const* arg2)
1631 QPDFFormFieldObjectHelper parent(node.getParent()); 1631 QPDFFormFieldObjectHelper parent(node.getParent());
1632 std::cout << " Parent: " 1632 std::cout << " Parent: "
1633 << (parent.isNull() 1633 << (parent.isNull()
1634 - ? "none" 1634 + ? std::string("none")
1635 : parent.getObjectHandle().unparse()) 1635 : parent.getObjectHandle().unparse())
1636 << std::endl; 1636 << std::endl;
1637 node = parent; 1637 node = parent;