haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Guard against "Cannot read property '_dpiScale' of undefined" 

Seen from these three locations in "make perf-test".

Signed-off-by: Tor Lillqvist <tml@collabora.com>
Change-Id: I7f9fc4a073f583647e02427033fbd60c7c919a8e
pull/2836/head
Tor Lillqvist 2021-07-12 17:16:52 +03:00 committed by Tor Lillqvist
parent 5f46edc839
commit 5bc4be5d7d
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
loleaflet/src/layer/tile/CanvasTileLayer.js
View File

@ -3477,8 +3477,9 @@ L.CanvasTileLayer = L.Layer.extend({
// change previous selections
viewSelection.setPointSet(viewPointSet);
} else {
var scale = (this._painter ? this._painter._dpiScale : 1);
viewSelection = new CSelections(viewPointSet, this._canvasOverlay,
this._painter._dpiScale, this._selectionsDataDiv, this._map, true, viewId);
scale, this._selectionsDataDiv, this._map, true, viewId);
this._viewSelections[viewId].selection = viewSelection;
}
}
@ -5221,15 +5222,17 @@ L.CanvasTileLayer = L.Layer.extend({
},
_twipsToCssPixels: function (twips) {
var scale = (this._painter ? this._painter._dpiScale : 1);
return new L.Point(
(twips.x / this._tileWidthTwips) * (this._tileSize / this._painter._dpiScale),
(twips.y / this._tileHeightTwips) * (this._tileSize / this._painter._dpiScale));
(twips.x / this._tileWidthTwips) * (this._tileSize / scale),
(twips.y / this._tileHeightTwips) * (this._tileSize / scale));
},
_cssPixelsToTwips: function (pixels) {
var scale = (this._painter ? this._painter._dpiScale : 1);
return new L.Point(
((pixels.x * this._painter._dpiScale) / this._tileSize) * this._tileWidthTwips,
((pixels.y * this._painter._dpiScale) / this._tileSize) * this._tileHeightTwips);
((pixels.x * scale) / this._tileSize) * this._tileWidthTwips,
((pixels.y * scale) / this._tileSize) * this._tileHeightTwips);
},
_twipsToLatLng: function (twips, zoom) {