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

Revert to usedClip

Browse Source
This commit is contained in:
Philip Giuliani 2015-04-13 19:02:04 +02:00
parent 425acc38f9
commit 3ce7024e97
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tiledimage.js
View File

@ -1160,23 +1160,24 @@ function drawTiles( tiledImage, lastDrawn ) {
tileSource, tileSource,
contextSaved = false; contextSaved = false;
var usedClip = false;
if ( tiledImage._clip ) { if ( tiledImage._clip ) {
tiledImage._drawer.saveContext(); tiledImage._drawer.saveContext();
contextSaved = true;
var box = tiledImage.imageToViewportRectangle(tiledImage._clip, true); var box = tiledImage.imageToViewportRectangle(tiledImage._clip, true);
var clipRect = tiledImage._drawer.viewportToDrawerRectangle(box); var clipRect = tiledImage._drawer.viewportToDrawerRectangle(box);
tiledImage._drawer.setClip(clipRect); tiledImage._drawer.setClip(clipRect);
usedClip = true;
} }
if ( tiledImage.placeholderFillStyle && lastDrawn.length === 0 ) { if ( tiledImage.placeholderFillStyle && lastDrawn.length === 0 ) {
if ( !contextSaved ) { tiledImage._drawer.saveContext();
tiledImage._drawer.saveContext();
contextSaved = true;
}
var placeholderRect = tiledImage._drawer.viewportToDrawerRectangle(tiledImage.getBounds(true)); var placeholderRect = tiledImage._drawer.viewportToDrawerRectangle(tiledImage.getBounds(true));
tiledImage._drawer.drawPlaceholder(placeholderRect, tiledImage.placeholderFillStyle); tiledImage._drawer.drawPlaceholder(placeholderRect, tiledImage.placeholderFillStyle);
tiledImage._drawer.restoreContext();
} }
for ( i = lastDrawn.length - 1; i >= 0; i-- ) { for ( i = lastDrawn.length - 1; i >= 0; i-- ) {
@ -1211,7 +1212,7 @@ function drawTiles( tiledImage, lastDrawn ) {
} }
} }
if ( contextSaved ) { if ( usedClip ) {
tiledImage._drawer.restoreContext(); tiledImage._drawer.restoreContext();
} }
} }