mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-19 17:21:50 +03:00
Code Issues Projects Releases Wiki Activity

fix couple of typos

Browse Source
This commit is contained in:
Mei-Hui Su 2016-01-14 12:42:02 -08:00
parent 3cfe8ecac2
commit e89d1f4c97
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drawer.js
View File

@ -395,7 +395,6 @@ $.Drawer.prototype = /** @lends OpenSeadragon.Drawer.prototype */{
this.canvas.width,
this.canvas.height
);
>>>>>>> a0a44dbeb5e3030e0acecf108efc19dbd53aaec2
this.context.restore();
},

3
src/tiledimage.js
View File

@ -147,7 +147,7 @@ $.TiledImage = function( options ) {
debugMode: $.DEFAULT_SETTINGS.debugMode,
crossOriginPolicy: $.DEFAULT_SETTINGS.crossOriginPolicy,
placeholderFillStyle: $.DEFAULT_SETTINGS.placeholderFillStyle,
opacity: $.DEFAULT_SETTINGS.opacity
opacity: $.DEFAULT_SETTINGS.opacity,
compositeOperation: $.DEFAULT_SETTINGS.compositeOperation
}, options );
@ -1342,7 +1342,6 @@ function drawTiles( tiledImage, lastDrawn ) {
sketchScale = tile.getScaleForEdgeSmoothing();
sketchTranslate = tile.getTranslationForEdgeSmoothing(sketchScale);
}
>>>>>>> a0a44dbeb5e3030e0acecf108efc19dbd53aaec2
if ( useSketch ) {
tiledImage._drawer._clear( true );