mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 21:26:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from Ventero/disprect

Browse Source 
Use correct option name (displayRects, not dispRects) in DziTileSource.
This commit is contained in:
iangilman 2013-01-24 10:38:01 -08:00
commit 718082998b
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openseadragon.js
View File

@ -5663,7 +5663,7 @@ $.DziTileSource = function( width, height, tileSize, tileOverlap, tilesUrl, file
tileOverlap: arguments[ 3 ], tileOverlap: arguments[ 3 ],
tilesUrl: arguments[ 4 ], tilesUrl: arguments[ 4 ],
fileFormat: arguments[ 5 ], fileFormat: arguments[ 5 ],
dispRects: arguments[ 6 ] displayRects: arguments[ 6 ]
}; };
} }
@ -5914,7 +5914,7 @@ function configureFromObject( tileSource, configuration ){
height = parseInt( sizeData.Height ), height = parseInt( sizeData.Height ),
tileSize = parseInt( imageData.TileSize ), tileSize = parseInt( imageData.TileSize ),
tileOverlap = parseInt( imageData.Overlap ), tileOverlap = parseInt( imageData.Overlap ),
dispRects = [], displayRects = [],
rectData, rectData,
i; i;
@ -5934,7 +5934,7 @@ function configureFromObject( tileSource, configuration ){
for ( i = 0; i < dispRectData.length; i++ ) { for ( i = 0; i < dispRectData.length; i++ ) {
rectData = dispRectData[ i ].Rect; rectData = dispRectData[ i ].Rect;
dispRects.push( new $.DisplayRect( displayRects.push( new $.DisplayRect(
parseInt( rectData.X ), parseInt( rectData.X ),
parseInt( rectData.Y ), parseInt( rectData.Y ),
parseInt( rectData.Width ), parseInt( rectData.Width ),
@ -5954,7 +5954,7 @@ function configureFromObject( tileSource, configuration ){
maxLevel: null, /* maxLevel */ maxLevel: null, /* maxLevel */
tilesUrl: tilesUrl, /* tilesUrl */ tilesUrl: tilesUrl, /* tilesUrl */
fileFormat: fileFormat, /* fileFormat */ fileFormat: fileFormat, /* fileFormat */
dispRects: dispRects /* dispRects */ displayRects: displayRects /* displayRects */
}; };
}; };

8
src/dzitilesource.js
View File

@ -32,7 +32,7 @@ $.DziTileSource = function( width, height, tileSize, tileOverlap, tilesUrl, file
tileOverlap: arguments[ 3 ], tileOverlap: arguments[ 3 ],
tilesUrl: arguments[ 4 ], tilesUrl: arguments[ 4 ],
fileFormat: arguments[ 5 ], fileFormat: arguments[ 5 ],
dispRects: arguments[ 6 ] displayRects: arguments[ 6 ]
}; };
} }
@ -283,7 +283,7 @@ function configureFromObject( tileSource, configuration ){
height = parseInt( sizeData.Height ), height = parseInt( sizeData.Height ),
tileSize = parseInt( imageData.TileSize ), tileSize = parseInt( imageData.TileSize ),
tileOverlap = parseInt( imageData.Overlap ), tileOverlap = parseInt( imageData.Overlap ),
dispRects = [], displayRects = [],
rectData, rectData,
i; i;
@ -303,7 +303,7 @@ function configureFromObject( tileSource, configuration ){
for ( i = 0; i < dispRectData.length; i++ ) { for ( i = 0; i < dispRectData.length; i++ ) {
rectData = dispRectData[ i ].Rect; rectData = dispRectData[ i ].Rect;
dispRects.push( new $.DisplayRect( displayRects.push( new $.DisplayRect(
parseInt( rectData.X ), parseInt( rectData.X ),
parseInt( rectData.Y ), parseInt( rectData.Y ),
parseInt( rectData.Width ), parseInt( rectData.Width ),
@ -323,7 +323,7 @@ function configureFromObject( tileSource, configuration ){
maxLevel: null, /* maxLevel */ maxLevel: null, /* maxLevel */
tilesUrl: tilesUrl, /* tilesUrl */ tilesUrl: tilesUrl, /* tilesUrl */
fileFormat: fileFormat, /* fileFormat */ fileFormat: fileFormat, /* fileFormat */
dispRects: dispRects /* dispRects */ displayRects: displayRects /* displayRects */
}; };
}; };