Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[mobile] fix bug 57315

Browse source
This commit is contained in:
Maxim Kadushkin 2022-05-27 00:50:44 +03:00
parent f12cc5c35e
commit 7f90a8f508
3 changed files with 31 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/documenteditor/mobile/src/store/textSettings.js
View file

@ -136,9 +136,7 @@ export class storeTextSettings {
this.binaryFormat = null; this.binaryFormat = null;
this.data = null; this.data = null;
this.width = 0; this.width = 0;
this.height = 0;
this.heightOne = 0; this.heightOne = 0;
this.count = 0;
this.load = function(url, callback) { this.load = function(url, callback) {
if (!callback) if (!callback)
@ -179,10 +177,14 @@ export class storeTextSettings {
var binaryAlpha = new Uint8Array(arrayBuffer); var binaryAlpha = new Uint8Array(arrayBuffer);
this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0); this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0);
this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0); this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0);
this.count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0); let count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0);
this.height = this.count * this.heightOne; let height = count * this.heightOne;
this.data = new Uint8ClampedArray(4 * this.width * this.height); // this.data = new Uint8ClampedArray(4 * this.width * height);
// TODO: limit array size. bug 57315
if ( height > 100000 )
height = Math.floor(100000 / 56) * 56;
this.data = new Uint8ClampedArray(4 * this.width * height);
var binaryIndex = 12; var binaryIndex = 12;
var binaryLen = binaryAlpha.length; var binaryLen = binaryAlpha.length;
@ -251,6 +253,12 @@ export class storeTextSettings {
this.spriteThumbs = new CThumbnailLoader(); this.spriteThumbs = new CThumbnailLoader();
this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => { this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => {
this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1;
// if (!this.spriteThumbs.data)
{
this.spriteThumbs.openBinary(this.spriteThumbs.binaryFormat);
delete this.spriteThumbs.binaryFormat;
}
}); });
} }

14
apps/presentationeditor/mobile/src/store/textSettings.js
View file

@ -140,9 +140,9 @@ export class storeTextSettings {
this.binaryFormat = null; this.binaryFormat = null;
this.data = null; this.data = null;
this.width = 0; this.width = 0;
this.height = 0; // this.height = 0;
this.heightOne = 0; this.heightOne = 0;
this.count = 0; // this.count = 0;
this.load = function(url, callback) { this.load = function(url, callback) {
if (!callback) if (!callback)
@ -183,10 +183,12 @@ export class storeTextSettings {
var binaryAlpha = new Uint8Array(arrayBuffer); var binaryAlpha = new Uint8Array(arrayBuffer);
this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0); this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0);
this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0); this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0);
this.count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0); let count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0);
this.height = this.count * this.heightOne; let height = count * this.heightOne;
this.data = new Uint8ClampedArray(4 * this.width * this.height); // this.data = new Uint8ClampedArray(4 * this.width * height);
if ( height > 100000 ) height = Math.floor(100000 / 56) * 56;
this.data = new Uint8ClampedArray(4 * this.width * height);
var binaryIndex = 12; var binaryIndex = 12;
var binaryLen = binaryAlpha.length; var binaryLen = binaryAlpha.length;
@ -255,6 +257,8 @@ export class storeTextSettings {
this.spriteThumbs = new CThumbnailLoader(); this.spriteThumbs = new CThumbnailLoader();
this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => { this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => {
this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1;
this.spriteThumbs.openBinary(this.spriteThumbs.binaryFormat);
delete this.spriteThumbs.binaryFormat;
}); });
} }

14
apps/spreadsheeteditor/mobile/src/store/textSettings.js
View file

@ -140,9 +140,9 @@ export class storeTextSettings {
this.binaryFormat = null; this.binaryFormat = null;
this.data = null; this.data = null;
this.width = 0; this.width = 0;
this.height = 0; // this.height = 0;
this.heightOne = 0; this.heightOne = 0;
this.count = 0; // this.count = 0;
this.load = function(url, callback) { this.load = function(url, callback) {
if (!callback) if (!callback)
@ -183,10 +183,12 @@ export class storeTextSettings {
var binaryAlpha = new Uint8Array(arrayBuffer); var binaryAlpha = new Uint8Array(arrayBuffer);
this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0); this.width = (binaryAlpha[0] << 24) | (binaryAlpha[1] << 16) | (binaryAlpha[2] << 8) | (binaryAlpha[3] << 0);
this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0); this.heightOne = (binaryAlpha[4] << 24) | (binaryAlpha[5] << 16) | (binaryAlpha[6] << 8) | (binaryAlpha[7] << 0);
this.count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0); let count = (binaryAlpha[8] << 24) | (binaryAlpha[9] << 16) | (binaryAlpha[10] << 8) | (binaryAlpha[11] << 0);
this.height = this.count * this.heightOne; let height = count * this.heightOne;
this.data = new Uint8ClampedArray(4 * this.width * this.height); // this.data = new Uint8ClampedArray(4 * this.width * this.height);
if ( height > 100000 ) height = Math.floor(100000 / 56) * 56;
this.data = new Uint8ClampedArray(4 * this.width * height);
var binaryIndex = 12; var binaryIndex = 12;
var binaryLen = binaryAlpha.length; var binaryLen = binaryAlpha.length;
@ -255,6 +257,8 @@ export class storeTextSettings {
this.spriteThumbs = new CThumbnailLoader(); this.spriteThumbs = new CThumbnailLoader();
this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => { this.spriteThumbs.load(this.thumbs[this.thumbIdx].path, () => {
this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1; this.spriteCols = Math.floor(this.spriteThumbs.width / (this.thumbs[this.thumbIdx].width)) || 1;
this.spriteThumbs.openBinary(this.spriteThumbs.binaryFormat);
delete this.spriteThumbs.binaryFormat;
}); });
} }