Merge pull request #1868 from abrlam/master

tileSize is no longer hard corded in Zoomify Tile Source
This commit is contained in:
Ian Gilman 2020-08-14 10:17:12 -07:00 committed by GitHub
commit 6357aab370
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions

View File

@ -7,6 +7,7 @@ OPENSEADRAGON CHANGELOG
* Documentation fix (#1814 @kenanchristian) * Documentation fix (#1814 @kenanchristian)
* Better cleanup on destruction, to avoid memory leaks (#1832 @JoFrMueller) * Better cleanup on destruction, to avoid memory leaks (#1832 @JoFrMueller)
* Miscellaneous code cleanup (#1840 @msalsbery) * Miscellaneous code cleanup (#1840 @msalsbery)
* tileSize is no longer hard corded in Zoomify Tile Source (#1704)
2.4.2: 2.4.2:

View File

@ -18,7 +18,7 @@
* tilesUrl: "/test/data/zoomify/" * tilesUrl: "/test/data/zoomify/"
* } * }
* *
* The tileSize is currently hardcoded to 256 (the usual Zoomify default). The tileUrl must the path to the image _directory_. * The tileSize is set to 256 (the usual Zoomify default) when it is not defined. The tileUrl must the path to the image _directory_.
* *
* 2) Loading image metadata from xml file: (CURRENTLY NOT SUPPORTED) * 2) Loading image metadata from xml file: (CURRENTLY NOT SUPPORTED)
* *
@ -44,7 +44,9 @@
* @param {String} tilesUrl * @param {String} tilesUrl
*/ */
$.ZoomifyTileSource = function(options) { $.ZoomifyTileSource = function(options) {
options.tileSize = 256; if(typeof options.tileSize === 'undefined'){
options.tileSize = 256;
}
var currentImageSize = { var currentImageSize = {
x: options.width, x: options.width,