Fixed some code

This commit is contained in:
Toni Munder 2015-09-15 20:52:44 -07:00
parent 484ae63db1
commit a2ee81d7cb
2 changed files with 6 additions and 2 deletions

View File

@ -265,6 +265,8 @@ $.Tile.prototype = /** @lends OpenSeadragon.Tile.prototype */{
return; return;
} }
context.save();
context.globalAlpha = this.opacity; context.globalAlpha = this.opacity;
//if we are supposed to be rendering fully opaque rectangle, //if we are supposed to be rendering fully opaque rectangle,
@ -298,6 +300,8 @@ $.Tile.prototype = /** @lends OpenSeadragon.Tile.prototype */{
size.x * $.pixelDensityRatio, size.x * $.pixelDensityRatio,
size.y * $.pixelDensityRatio size.y * $.pixelDensityRatio
); );
context.restore();
}, },
/** /**

View File

@ -1152,7 +1152,7 @@ function blendTile( tiledImage, tile, x, y, level, levelOpacity, currentTime ){
if ( opacity == 1 ) { if ( opacity == 1 ) {
setCoverage( tiledImage.coverage, level, x, y, true ); setCoverage( tiledImage.coverage, level, x, y, true );
this._hasOpaqueTile = true; tiledImage._hasOpaqueTile = true;
} else if ( deltaTime < blendTimeMillis ) { } else if ( deltaTime < blendTimeMillis ) {
return true; return true;
} }
@ -1301,7 +1301,7 @@ function drawTiles( tiledImage, lastDrawn ) {
usedClip = true; usedClip = true;
} }
if ( tiledImage.placeholderFillStyle && this._hasOpaqueTile === false ) { if ( tiledImage.placeholderFillStyle && tiledImage._hasOpaqueTile === false ) {
var placeholderRect = tiledImage._drawer.viewportToDrawerRectangle(tiledImage.getBounds(true)); var placeholderRect = tiledImage._drawer.viewportToDrawerRectangle(tiledImage.getBounds(true));
var fillStyle = null; var fillStyle = null;