From: vincent@cubedesigners.com <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 27 Sep 2019 17:55:11 +0000 (+0000)
Subject: fix #3084
X-Git-Url: http://git.cubedesigners.com/?a=commitdiff_plain;h=0a9606b6791f324e33645add0f7abf5a36a2c530;p=cubeextranet.git

fix #3084
---

diff --git a/inc/ws/Metier/class.ws.document.php b/inc/ws/Metier/class.ws.document.php
index 0941132da..7ad0f52c5 100644
--- a/inc/ws/Metier/class.ws.document.php
+++ b/inc/ws/Metier/class.ws.document.php
@@ -435,7 +435,7 @@ class wsDocument extends cubeMetier
 
     public function getMobileFirstRatio()
     {
-        return 0.48 * (620 / $this->generalInfos['size'][0]);
+        return 620 / $this->generalInfos['size'][0];
     }
 
     public function makeMiniShot($page)
@@ -663,7 +663,7 @@ class wsDocument extends cubeMetier
         $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);
+            $this->makeShotPNM($page, 'html/t' . $r . '-', $r * $rratio, $q);
         }
         $this->makeSVGFile($page);
     }
@@ -675,7 +675,7 @@ class wsDocument extends cubeMetier
         $rratio = $this->getMobileFirstRatio();
         foreach ($resolutions as $r => $q) {
             $this->makeShotPNM($page, 'mf/h' . $r . '-', $r * $rratio, $q, 4, null, false);
-            $this->makeShotPNM($page, 'mf/t' . $r . '-', $r * $rratio, $q, 4, null, true);
+            $this->makeShotPNM($page, 'mf/t' . $r . '-', $r * $rratio, $q);
         }
     }
 
diff --git a/inc/ws/Util/html5/master/class.ws.html5.compiler.php b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
index 2da83b6af..b7acac90a 100644
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -294,6 +294,7 @@ class wsHTML5Compiler
         $this->cssSVGScale = 1;
 
         $this->scale = 1;
+
         if ($this->book->parametres->zoomMode == 1) {
             $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssOneScale;
         } else {
@@ -302,6 +303,12 @@ class wsHTML5Compiler
         $this->numerotation = explode(',', $this->book->numerotation);
 
         if ($this->book->parametres->mobileNavigationType === 'mobilefirst') {
+            $this->cssScale = $this->cssOneScale = 1;
+            $this->cssWidth = $this->width;
+            $this->cssHeight = $this->height;
+            $this->cssOneWidth = $this->width;
+            $this->cssOneHeight = $this->height;
+            $this->multiply = 1;
             $this->initMobileFirst();
         }