wait #4707 @1

diff --git a/js/libs/fluidbook/fluidbook.loader.js b/js/libs/fluidbook/fluidbook.loader.js
index 148e90db581b2337f7196c3e1a910661865ccb4d..5729477ee00e7a6e069603eb594569588d5468e5 100644 (file)
--- a/js/libs/fluidbook/fluidbook.loader.js
+++ b/js/libs/fluidbook/fluidbook.loader.js
@@ -691,20 +691,27 @@ FluidbookLoader.prototype = {
         }
         var $this = this;
 
-        var z = this.fluidbook.resize.bookScale * 1.15;
-        var mz = this.fluidbook.resize.bookScale * this.fluidbook.zoom.max;
+        var upscale = this.fluidbook.settings.svgToCanvasUpscale !== undefined ? this.fluidbook.settings.svgToCanvasUpscale : 1;
+
+        var z = this.fluidbook.resize.bookScale * upscale;
+        var mz = this.fluidbook.resize.bookScale * this.fluidbook.zoom.max * upscale;
 
-        var w = this.fluidbook.settings.width * z;
-        var h = this.fluidbook.settings.height * z;
-        var wz = this.fluidbook.settings.width * mz;
-        var hz = this.fluidbook.settings.height * mz;
 
         $('canvas[data-page]').each(function () {
             if ($this.fluidbook.zoom.zoom === 1 && $(this).hasClass('z')) {
                 return;
             }
-            var canvas = $(this).get(0);
+
             var page = $(this).data('page');
+            var dim=$this.getPageDimensions(page);
+
+            var w =  dim.width* z;
+            var h = dim.height * z;
+            var wz = dim.width * mz;
+            var hz = dim.height * mz;
+
+            var canvas = $(this).get(0);
+
 
             if ($(this).data('bookScale') === z) {
                 return;