summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2016-10-22 20:06:26 +0200
committerMichael Meeks <michael.meeks@collabora.com>2016-10-27 11:02:12 +0000
commit873929d14aa4013eb3dac216db9b828ff01e8d8f (patch)
tree8244f85e4b51c2032e68a6b84e9cef028b116562
parentfac78d1d350184319d91d4f7d15bb3f22dccf0da (diff)
tdf#99723: target ratio must be reached
to be sure we can avoid decompressing/recompressing Regression from https://cgit.freedesktop.org/libreoffice/core/commit/?id=76ec54e8c9f3580450bca85236a4f5af0c328588 Change-Id: Iacd7b2419ea85756f936b17f04c4e495d15e5b81 Reviewed-on: https://gerrit.libreoffice.org/30163 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> (cherry picked from commit 88fb9d8f0aae0030fac75156f78818affae4298f) Reviewed-on: https://gerrit.libreoffice.org/30265 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Michael Meeks <michael.meeks@collabora.com>
-rw-r--r--vcl/source/gdi/pdfextoutdevdata.cxx6
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 34d0c1b7a9b1..1a58c90a73dc 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.cxx
@@ -830,14 +830,18 @@ bool PDFExtOutDevData::HasAdequateCompression( const Graphic &rGraphic,
{ 80, 1500 }, { 75, 1700 }
};
sal_Int32 nTargetRatio = 10000;
+ bool bIsTargetRatioReached = false;
for (auto & rRatio : aRatios)
{
if ( mnCompressionQuality > rRatio.mnQuality )
+ {
+ bIsTargetRatioReached = true;
break;
+ }
nTargetRatio = rRatio.mnRatio;
}
- return nCurrentRatio > nTargetRatio;
+ return ((nCurrentRatio > nTargetRatio) && bIsTargetRatioReached);
}
}