Merge branch 'master' into prevent

This commit is contained in:
Ian Gilman 2017-08-07 10:51:53 -07:00
commit e4a3e0e5ef
2 changed files with 13 additions and 1 deletions

View File

@ -360,7 +360,8 @@ $.TileSource.prototype = {
if (point.x >= 1) {
x = this.getNumTiles(level).x - 1;
}
if (point.y >= 1 / this.aspectRatio) {
var EPSILON = 1e-16;
if (point.y >= 1 / this.aspectRatio - EPSILON) {
y = this.getNumTiles(level).y - 1;
}

View File

@ -96,6 +96,17 @@
maxLevel: 0,
});
assertTileAtPoint(0, new OpenSeadragon.Point(1, 1009 / 1006), new OpenSeadragon.Point(0, 0));
// Test for issue #1276
tileSource = new OpenSeadragon.TileSource({
width: 4036,
height: 1239,
tileWidth: 4036,
tileHeight: 1239,
tileOverlap: 0,
maxLevel: 0,
});
assertTileAtPoint(0, new OpenSeadragon.Point(1, 1239 / 4036), new OpenSeadragon.Point(0, 0));
});
}());