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

dont compute NaN for opacity because FF doesnt like that, per macreery's branch, thanks

Browse Source
This commit is contained in:
thatcher 2013-02-13 17:20:05 -05:00
parent 27d2898818
commit d8a3ccf5e8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -6,7 +6,7 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 9 BUILD_MINOR: 9
BUILD_ID: 117 BUILD_ID: 118
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

4
openseadragon.js
View File

@ -1,7 +1,7 @@
/*globals OpenSeadragon*/ /*globals OpenSeadragon*/
/** /**
* @version OpenSeadragon 0.9.117 * @version OpenSeadragon 0.9.118
* *
* @fileOverview * @fileOverview
* <h2> * <h2>
@ -9309,7 +9309,7 @@ function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){
} }
deltaTime = currentTime - tile.blendStart; deltaTime = currentTime - tile.blendStart;
opacity = Math.min( 1, deltaTime / blendTimeMillis ); opacity = Math.min( 1, deltaTime / ( blendTimeMillis || 1 ) );
if ( drawer.alwaysBlend ) { if ( drawer.alwaysBlend ) {
opacity *= levelOpacity; opacity *= levelOpacity;

2
src/drawer.js
View File

@ -784,7 +784,7 @@ function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){
} }
deltaTime = currentTime - tile.blendStart; deltaTime = currentTime - tile.blendStart;
opacity = Math.min( 1, deltaTime / blendTimeMillis ); opacity = Math.min( 1, deltaTime / ( blendTimeMillis || 1 ) );
if ( drawer.alwaysBlend ) { if ( drawer.alwaysBlend ) {
opacity *= levelOpacity; opacity *= levelOpacity;