IWMBrowser/iwmlib
IWMBrowser/iwmlib
4
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Merge branch 'master' of gitea.iwm-tuebingen.de:IWMBrowser/iwmlib

Browse Source 
# Conflicts:
#	dist/iwmlib.pixi.js
This commit is contained in:
Sebastian Kupke 2019-09-19 16:47:44 +02:00
commit b09eb63785
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/iwmlib.pixi.js vendored
View File

@ -8916,8 +8916,8 @@
if (event.data.success) { if (event.data.success) {
let { url, col, row, buffer } = event.data; let { url, col, row, buffer } = event.data;
//console.log("WorkerTileLoader.loaded", url, buffer) //console.log("WorkerTileLoader.loaded", url, buffer)
let CompressedImage = PIXI.compressedTextures.CompressedImage; //let CompressedImage = PIXI.compressedTextures.CompressedImage
let compressed = CompressedImage.loadFromArrayBuffer(buffer, url); let compressed = PIXI.compressedTextures.loadFromArrayBuffer(buffer, url);
let base = new PIXI.BaseTexture(compressed); let base = new PIXI.BaseTexture(compressed);
let texture = new PIXI.Texture(base); let texture = new PIXI.Texture(base);
this._textureAvailable(url, col, row, texture); this._textureAvailable(url, col, row, texture);

4
lib/pixi/deepzoom/loader.js
View File

@ -324,8 +324,8 @@ export class WorkerTileLoader extends TileLoader {
if (event.data.success) { if (event.data.success) {
let { url, col, row, buffer } = event.data let { url, col, row, buffer } = event.data
//console.log("WorkerTileLoader.loaded", url, buffer) //console.log("WorkerTileLoader.loaded", url, buffer)
let CompressedImage = PIXI.compressedTextures.CompressedImage //let CompressedImage = PIXI.compressedTextures.CompressedImage
let compressed = CompressedImage.loadFromArrayBuffer(buffer, url) let compressed = PIXI.compressedTextures.loadFromArrayBuffer(buffer, url)
let base = new PIXI.BaseTexture(compressed) let base = new PIXI.BaseTexture(compressed)
let texture = new PIXI.Texture(base) let texture = new PIXI.Texture(base)
this._textureAvailable(url, col, row, texture) this._textureAvailable(url, col, row, texture)