octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2025-01-03 15:17:29 +00:00
Code Issues Releases Wiki Activity

Fix image optimization evaluation

Browse Source 
Don't attempt to pass data through a JPEG filter if we are unable to
filter the data.
This commit is contained in:
Jay Berkenbilt 2019-01-05 22:36:05 -05:00
parent ab536a4e55
commit 5c682f6d1e
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qpdf/qpdf.cc
View File

@ -3548,16 +3548,7 @@ ImageOptimizer::makePipeline(std::string const& description, Pipeline* next)
bool bool
ImageOptimizer::evaluate(std::string const& description) ImageOptimizer::evaluate(std::string const& description)
{ {
Pl_Discard d; if (! image.pipeStreamData(0, 0, qpdf_dl_specialized, true))
Pl_Count c("count", &d);
PointerHolder<Pipeline> p = makePipeline(description, &c);
if (p.getPointer() == 0)
{
// message issued by makePipeline
return false;
}
if (! image.pipeStreamData(p.getPointer(), 0, qpdf_dl_specialized,
true, false))
{ {
QTC::TC("qpdf", "qpdf image optimize no pipeline"); QTC::TC("qpdf", "qpdf image optimize no pipeline");
if (o.verbose) if (o.verbose)
@ -3569,6 +3560,18 @@ ImageOptimizer::evaluate(std::string const& description)
} }
return false; return false;
} }
Pl_Discard d;
Pl_Count c("count", &d);
PointerHolder<Pipeline> p = makePipeline(description, &c);
if (p.getPointer() == 0)
{
// message issued by makePipeline
return false;
}
if (! image.pipeStreamData(p.getPointer(), 0, qpdf_dl_specialized))
{
return false;
}
long long orig_length = image.getDict().getKey("/Length").getIntValue(); long long orig_length = image.getDict().getKey("/Length").getIntValue();
if (c.getCount() >= orig_length) if (c.getCount() >= orig_length)
{ {