fix #3315 @0.5

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 c52cc69caf92615adc3d356c5439485072d071a4..dce8724bc33e23937eaf7be7289de9117442905d 100644 (file)
--- a/inc/ws/Util/html5/master/class.ws.html5.compiler.php
+++ b/inc/ws/Util/html5/master/class.ws.html5.compiler.php
@@ -282,7 +282,7 @@ class wsHTML5Compiler
         $firstJpeg = wsDocument::getDir($this->pages[1]['document_id']) . 'html/h150-' . $this->pages[1]['document_page'] . '.jpg';
 
         $imagesize = CubeIT_Image::getimagesize($firstJpeg);
-        $this->pdf2htmlRatio = round(($imagesize[0] * 0.48) / $this->width, 3);
+        $this->pdf2htmlRatio = round(($imagesize[0] * 0.48) / $this->width, 8);
 
         $this->linkScale = $this->cssScale = $this->z * min($this->optimalWidth / $this->width, $this->optimalHeight / $this->height);
         $this->cssOneScale = $this->z * min(($this->optimalWidth * 2) / $this->width, $this->optimalHeight / $this->height);
@@ -297,25 +297,23 @@ class wsHTML5Compiler
 
         $this->scale = 1;
 
-        if ($this->book->parametres->zoomMode == 1) {
-            $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssOneScale;
-        } else {
-            $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssScale;
-        }
+
         $this->numerotation = explode(',', $this->book->numerotation);
 
         if ($this->book->parametres->mobileNavigationType === 'mobilefirst') {
             $this->cssScale = $this->cssOneScale = 480 / $this->width;
-            $this->multiply = $this->pdf2htmlRatio;
-            $this->linkScale = $this->cssScale * $this->multiply;
-            $this->cssWidth = $this->width * $this->cssScale;
-            $this->cssHeight = $this->height * $this->cssScale;
-            $this->cssOneWidth = $this->cssWidth;
-            $this->cssOneHeight = $this->cssHeight;
-
+            $this->linkScale = $this->cssScale;
+            $this->cssOneWidth = $this->cssWidth = $this->width * $this->cssScale;
+            $this->cssOneHeight = $this->cssHeight = $this->height * $this->cssScale;
             $this->initMobileFirst();
         }
 
+        if ($this->book->parametres->zoomMode == 1 || $this->book->parametres->mobileNavigationType === 'mobilefirst') {
+            $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssOneScale;
+        } else {
+            $this->multiply = $this->pdf2htmlRatio * $this->scale * $this->cssScale;
+        }
+
         $this->initConfig();
         $this->log('Defined dimensions');
     }