From 981f524738ea6abc65e101b2a87e7c0ebda5552b Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 15 Nov 2016 17:44:26 +0000 Subject: [PATCH] =?utf8?q?La=20qualit=C3=A9=20de=20la=20conversion=20"?= =?utf8?q?=C3=A9craser=20les=20graphismes"=20=C3=A9tait=20tr=C3=A8s=20bass?= =?utf8?q?e=20#917?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- inc/ws/Metier/class.ws.document.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php index 842481dd5..9dd6caf95 100644 --- a/inc/ws/Metier/class.ws.document.php +++ b/inc/ws/Metier/class.ws.document.php @@ -267,7 +267,6 @@ class wsDocument extends cubeMetier { } - return $res; } @@ -373,7 +372,7 @@ class wsDocument extends cubeMetier { $this->addToLog($fwstk); */ } - public function getResolutionRatio(){ + public function getResolutionRatio() { $a4surface = 500990; // en pt² $docSurface = $this->generalInfos['size'][0] * $this->generalInfos['size'][1]; // en pt² // to have the same surface resulting in px, we have to sqrt the ratio between the two surfaces defined above @@ -593,7 +592,7 @@ class wsDocument extends cubeMetier { public function makeHTML5Files($page) { // Then make HD background shots $resolutions = array(300 => 85, 150 => 85); - $rratio=$this->getResolutionRatio(); + $rratio = $this->getResolutionRatio(); foreach ($resolutions as $r => $q) { $this->makeShotPNM($page, 'html/h' . $r . '-', $r * $rratio, $q, 4, null, false); $this->makeShotPNM($page, 'html/t' . $r . '-', $r * $rratio, $q, 4, null, true); @@ -794,13 +793,11 @@ class wsDocument extends cubeMetier { } elseif ($method == self::POLY2BITMAP) { // Raster graphics, keep texts $pdf2swf->setArg('set poly2bitmap'); - $multiply = self::$resolution2multiply[$resolution]; - $pdf2swf->setArg('set multiply', $multiply); + $pdf2swf->setArg('set multiply', $this->_findMultiply($resolution)); } elseif ($method == self::BITMAP) { // Raster all $pdf2swf->setArg('set bitmap'); - $multiply = self::$resolution2multiply[$resolution]; - $pdf2swf->setArg('set multiply', $multiply); + $pdf2swf->setArg('set multiply', $this->_findMultiply($resolution)); } // $pdf2swf->setManualArg('-v'); $pdf2swf->setArg('T', $flashversion); @@ -842,6 +839,11 @@ class wsDocument extends cubeMetier { } } + protected function _findMultiply($resolution) { + $resolution /= $this->getResolutionRatio(); + return self::$resolution2multiply[$resolution]; + } + protected function makeAS3($page) { $swffile = $this->out . 'p' . $page . '.swf'; -- 2.39.5