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
parent 5556cc720c 735d947126
commit b09eb63785
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/iwmlib.pixi.js
Vendored
+2 -2
View File
@@ -8916,8 +8916,8 @@
if (event.data.success) {
let { url, col, row, buffer } = event.data;
//console.log("WorkerTileLoader.loaded", url, buffer)
let CompressedImage = PIXI.compressedTextures.CompressedImage;
let compressed = CompressedImage.loadFromArrayBuffer(buffer, url);
//let CompressedImage = PIXI.compressedTextures.CompressedImage
let compressed = PIXI.compressedTextures.loadFromArrayBuffer(buffer, url);
let base = new PIXI.BaseTexture(compressed);
let texture = new PIXI.Texture(base);
this._textureAvailable(url, col, row, texture);
lib/pixi/deepzoom/loader.js
+2 -2
View File
@@ -324,8 +324,8 @@ export class WorkerTileLoader extends TileLoader {
if (event.data.success) {
let { url, col, row, buffer } = event.data
//console.log("WorkerTileLoader.loaded", url, buffer)
let CompressedImage = PIXI.compressedTextures.CompressedImage
let compressed = CompressedImage.loadFromArrayBuffer(buffer, url)
//let CompressedImage = PIXI.compressedTextures.CompressedImage
let compressed = PIXI.compressedTextures.loadFromArrayBuffer(buffer, url)
let base = new PIXI.BaseTexture(compressed)
let texture = new PIXI.Texture(base)
this._textureAvailable(url, col, row, texture)