fix IIP resize, fix viewport resize
This commit is contained in:
@@ -148,9 +148,6 @@ export class IIPHandler implements IOscHandler, IResetHandler {
|
|||||||
|
|
||||||
// fallthrough for SequenceType.FILE & SequenceType.FILEEND
|
// fallthrough for SequenceType.FILE & SequenceType.FILEEND
|
||||||
|
|
||||||
let w = 0;
|
|
||||||
let h = 0;
|
|
||||||
|
|
||||||
// early exit condition chain
|
// early exit condition chain
|
||||||
let cond: number | boolean;
|
let cond: number | boolean;
|
||||||
let metrics = UNSUPPORTED_TYPE;
|
let metrics = UNSUPPORTED_TYPE;
|
||||||
@@ -158,12 +155,7 @@ export class IIPHandler implements IOscHandler, IResetHandler {
|
|||||||
if (cond = !this._dec.end()) {
|
if (cond = !this._dec.end()) {
|
||||||
metrics = imageType(this._dec.data8);
|
metrics = imageType(this._dec.data8);
|
||||||
if (cond = metrics.mime !== 'unsupported') {
|
if (cond = metrics.mime !== 'unsupported') {
|
||||||
w = metrics.width;
|
if (!(cond = metrics.width && metrics.height && metrics.width * metrics.height < this._opts.pixelLimit)) {
|
||||||
h = metrics.height;
|
|
||||||
if (cond = w && h && w * h < this._opts.pixelLimit) {
|
|
||||||
[w, h] = this._resize(w, h);
|
|
||||||
cond = w && h && w * h < this._opts.pixelLimit;
|
|
||||||
} else {
|
|
||||||
console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);
|
console.warn(`IIP: image dimension issue ${metrics.width}x${metrics.height}`);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -194,6 +186,7 @@ export class IIPHandler implements IOscHandler, IResetHandler {
|
|||||||
this._dec.release();
|
this._dec.release();
|
||||||
return createImageBitmap(bmSrc)
|
return createImageBitmap(bmSrc)
|
||||||
.then(bm => {
|
.then(bm => {
|
||||||
|
const [w, h] = this._resize(metrics.width, metrics.height);
|
||||||
this._storage.addImage(new Drawable(bm), imgBlob, metrics, w / metrics.width, h / metrics.height);
|
this._storage.addImage(new Drawable(bm), imgBlob, metrics, w / metrics.width, h / metrics.height);
|
||||||
return true;
|
return true;
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -455,7 +455,7 @@ export class ImageStorage implements IDisposable {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// found an image tile at oldCol, check if it qualifies for right exapansion
|
// found an image tile at oldCol, check if it qualifies for right exapansion
|
||||||
const tilesPerRow = Math.ceil((imgSpec.src.width) / imgSpec.cellSize.width);
|
const tilesPerRow = Math.ceil(imgSpec.src.width * imgSpec.prescaleX / imgSpec.cellSize.width);
|
||||||
if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {
|
if ((e.tileId % tilesPerRow) + 1 >= tilesPerRow) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user