bfg-common 1.5.521 → 1.5.523

package/public/spice-console/lib/images/bitmap.js

@@ -1,203 +1,203 @@
-/*
-    Copyright (c) 2016 eyeOS
-
-    This file is part of Open365.
-
-    Open365 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-wdi.BMP2 = $.spcExtend(wdi.SpiceObject, {
-	objectSize: 0,
-	mapper: [0, 1, 1, 4, 4, 8, 16, 24, 32, 32],
-
-	init: function(imageData) {
-		var type = this.bytesToInt8(imageData);
-		var flags = this.bytesToInt8(imageData); // bit 1 => normal, bit 2 => palette cache (...)
-		var width = this.bytesToInt32(imageData); // width in pixels
-		var height = this.bytesToInt32(imageData); // height in pixels
-		var stride = this.bytesToInt32(imageData); // width in bytes including padding
-		var len;
-		var bpp = this.mapper[type];
-		var i;
-
-
-		var paletteSize = 0, unique, paletteData, numEnts = 0;
-		if (bpp <= 8 && bpp > 0) {
-			var palette = [];
-			if (flags & 1) {
-				var paletteOffset = this.bytesToInt32(imageData); // From the begininig of the spice packet?
-				len = imageData.length;
-				paletteSize = 4*Math.pow(2,bpp);
-				var paletteDataSize = paletteSize + 8 + 2; //palette + unique(64b) + numEnts (16b)
-				len -= paletteDataSize;
-				paletteData = imageData.splice(len, paletteDataSize);
-				unique = this.bytesToInt64(paletteData);
-				numEnts = this.bytesToInt16(paletteData);
-				var queue;
-
-				for (i = 0; i < numEnts*4; i+=4) {
-					queue = new wdi.Queue();
-					queue.setData(paletteData.slice(i, i+4));
-					palette.push(new wdi.SpiceColor().demarshall(queue));
-				}
-				wdi.ImageCache.addPalette(unique, palette);
-			} else {
-				//get palette from cache
-				unique = this.bytesToInt64(imageData);
-				len = imageData.length;
-				palette = wdi.ImageCache.getPalette(unique);
-				var spiceColors;
-				paletteData = [];
-				numEnts = palette.length;
-				for (i =0; i < numEnts; i++ ) {
-					spiceColors = palette[i].marshall();
-					spiceColors.push(0);
-					paletteData = paletteData.concat(spiceColors);
-				}
-
-			}
-			// imageData = paletteData.concat(imageData);
-
-		} else {
-			// Removing 4 bytes from the image data to fix index out of range error.
-			var unknown = this.bytesToInt32(imageData);
-		}
-
-		this.setContent({
-			imageSize: len,
-			width: width,
-			height: height,
-			bpp: bpp,
-			imageData: imageData,
-			paletteSize: numEnts * 4,
-			palette: palette,
-			stride: stride,
-			flags: flags,
-			type: type
-		});
-	},
-
-	setContent: function(c) {
-		this.imageSize = c.imageSize;
-		this.width = c.width;
-		this.height = c.height;
-		this.bpp = c.bpp;
-		this.imageData = c.imageData;
-		this.palette = c.palette;
-		this.offset = c.paletteSize + 0x36; //0x36 === Current harcoded header size (BMP + DIB)
-		this.size = this.offset + this.imageSize;
-		this.stride = c.stride;
-		this.flags = c.flags;
-		// this.type = c.type;
-		// console.log(`тип не 9, тип: ${c.type}`)
-		this.type = 9;
-	},
-
-	marshall: function(context) {
-		var type = this.type;
-		var palette = this.palette;
-        var width = this.width;
-        var height = this.height;
-		var stride = this.stride;
-		var data = this.imageData;
-		var flags = this.flags;
-		var size = data.length;
-
-		var pixelsStride = stride * 8/this.bpp;
-		var bytesStride = pixelsStride * 4;
-		var buf = new ArrayBuffer(bytesStride * height);
-		var buf8 = new Uint8ClampedArray(buf);
-		var buf32 = new Uint32Array(buf);
-		var topdown = data[1];
-
-		var oct, i, pos, buffPos, spiceColor;
-		var b;
-		if (palette) {
-			buffPos = 0
-			if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_1BIT_BE) {
-				spiceColor = palette[1];
-				var foreColor = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
-
-				spiceColor = palette[0];
-				var backColor = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
-
-				var PLT1_MASK = [1, 2, 4, 8, 16, 32, 64, 128];
-
-				for (pos = 0; pos < size; pos++) {
-					oct = data[pos];
-
-					for (i = 7; i >= 0; i--) {
-						if (oct & PLT1_MASK[i]) {
-							buf32[buffPos++] = foreColor;
-						} else {
-							buf32[buffPos++] = backColor;
-						}
-					}
-				}
-			} else if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_4BIT_BE) {
-				for (pos = 0; pos < size; pos++) {
-					oct = data[pos];
-					spiceColor = palette[oct >>> 4];
-					buf32[buffPos++] = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
-					spiceColor = palette[oct & 0x0f];
-					buf32[buffPos++] = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
-				}
-			}
-
-		} else {
-			if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_32BIT || type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_RGBA) {
-				for (pos = 0; pos < size; pos += 4) {
-					let b,g,r
-					b = data[pos];
-					g = data[pos+1];
-					r = data[pos+2];
-
-					data[pos] = r;
-					data[pos + 1] = g;
-					data[pos + 2] = b;
-					data[pos + 3] = 255;
-				}
-			} else if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_24BIT) {
-				for (pos = 0; pos < size; pos+=3) {
-					b = data[pos];
-					data[pos] = data[pos+2];
-					data[pos+2] = b;
-				}
-			}
-			buf8 = new Uint8ClampedArray(data);
-		}
-
-		var ret = new ImageData(buf8, pixelsStride, height);
-
-		var tmpCanvas = wdi.graphics.getNewTmpCanvas(width, height);
-		tmpCanvas.getContext('2d').putImageData(ret, 0, 0, 0, 0, width, height);
-		ret = tmpCanvas;
-
-		if(flags&4 === 0) {
-			ret = wdi.RasterOperation.flip(ret);
-		}
-
-		return ret;
-
-	}
-});
-function intToByteArray(value) {
-	// Создаем массив из одного байта
-	let byteArray = new Uint8Array(1);
-
-	// Устанавливаем значение в массиве байтов
-	byteArray[0] = value & 0xFF; // Маскирование, чтобы значение поместилось в один байт
-
-	return byteArray;
-}
+/*
+    Copyright (c) 2016 eyeOS
+
+    This file is part of Open365.
+
+    Open365 is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+wdi.BMP2 = $.spcExtend(wdi.SpiceObject, {
+	objectSize: 0,
+	mapper: [0, 1, 1, 4, 4, 8, 16, 24, 32, 32],
+
+	init: function(imageData) {
+		var type = this.bytesToInt8(imageData);
+		var flags = this.bytesToInt8(imageData); // bit 1 => normal, bit 2 => palette cache (...)
+		var width = this.bytesToInt32(imageData); // width in pixels
+		var height = this.bytesToInt32(imageData); // height in pixels
+		var stride = this.bytesToInt32(imageData); // width in bytes including padding
+		var len;
+		var bpp = this.mapper[type];
+		var i;
+
+
+		var paletteSize = 0, unique, paletteData, numEnts = 0;
+		if (bpp <= 8 && bpp > 0) {
+			var palette = [];
+			if (flags & 1) {
+				var paletteOffset = this.bytesToInt32(imageData); // From the begininig of the spice packet?
+				len = imageData.length;
+				paletteSize = 4*Math.pow(2,bpp);
+				var paletteDataSize = paletteSize + 8 + 2; //palette + unique(64b) + numEnts (16b)
+				len -= paletteDataSize;
+				paletteData = imageData.splice(len, paletteDataSize);
+				unique = this.bytesToInt64(paletteData);
+				numEnts = this.bytesToInt16(paletteData);
+				var queue;
+
+				for (i = 0; i < numEnts*4; i+=4) {
+					queue = new wdi.Queue();
+					queue.setData(paletteData.slice(i, i+4));
+					palette.push(new wdi.SpiceColor().demarshall(queue));
+				}
+				wdi.ImageCache.addPalette(unique, palette);
+			} else {
+				//get palette from cache
+				unique = this.bytesToInt64(imageData);
+				len = imageData.length;
+				palette = wdi.ImageCache.getPalette(unique);
+				var spiceColors;
+				paletteData = [];
+				numEnts = palette.length;
+				for (i =0; i < numEnts; i++ ) {
+					spiceColors = palette[i].marshall();
+					spiceColors.push(0);
+					paletteData = paletteData.concat(spiceColors);
+				}
+
+			}
+			// imageData = paletteData.concat(imageData);
+
+		} else {
+			// Removing 4 bytes from the image data to fix index out of range error.
+			var unknown = this.bytesToInt32(imageData);
+		}
+
+		this.setContent({
+			imageSize: len,
+			width: width,
+			height: height,
+			bpp: bpp,
+			imageData: imageData,
+			paletteSize: numEnts * 4,
+			palette: palette,
+			stride: stride,
+			flags: flags,
+			type: type
+		});
+	},
+
+	setContent: function(c) {
+		this.imageSize = c.imageSize;
+		this.width = c.width;
+		this.height = c.height;
+		this.bpp = c.bpp;
+		this.imageData = c.imageData;
+		this.palette = c.palette;
+		this.offset = c.paletteSize + 0x36; //0x36 === Current harcoded header size (BMP + DIB)
+		this.size = this.offset + this.imageSize;
+		this.stride = c.stride;
+		this.flags = c.flags;
+		// this.type = c.type;
+		// console.log(`тип не 9, тип: ${c.type}`)
+		this.type = 9;
+	},
+
+	marshall: function(context) {
+		var type = this.type;
+		var palette = this.palette;
+        var width = this.width;
+        var height = this.height;
+		var stride = this.stride;
+		var data = this.imageData;
+		var flags = this.flags;
+		var size = data.length;
+
+		var pixelsStride = stride * 8/this.bpp;
+		var bytesStride = pixelsStride * 4;
+		var buf = new ArrayBuffer(bytesStride * height);
+		var buf8 = new Uint8ClampedArray(buf);
+		var buf32 = new Uint32Array(buf);
+		var topdown = data[1];
+
+		var oct, i, pos, buffPos, spiceColor;
+		var b;
+		if (palette) {
+			buffPos = 0
+			if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_1BIT_BE) {
+				spiceColor = palette[1];
+				var foreColor = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
+
+				spiceColor = palette[0];
+				var backColor = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
+
+				var PLT1_MASK = [1, 2, 4, 8, 16, 32, 64, 128];
+
+				for (pos = 0; pos < size; pos++) {
+					oct = data[pos];
+
+					for (i = 7; i >= 0; i--) {
+						if (oct & PLT1_MASK[i]) {
+							buf32[buffPos++] = foreColor;
+						} else {
+							buf32[buffPos++] = backColor;
+						}
+					}
+				}
+			} else if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_4BIT_BE) {
+				for (pos = 0; pos < size; pos++) {
+					oct = data[pos];
+					spiceColor = palette[oct >>> 4];
+					buf32[buffPos++] = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
+					spiceColor = palette[oct & 0x0f];
+					buf32[buffPos++] = spiceColor.r << 24 | spiceColor.g << 16 | spiceColor.b << 8 | 255;
+				}
+			}
+
+		} else {
+			if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_32BIT || type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_RGBA) {
+				for (pos = 0; pos < size; pos += 4) {
+					let b,g,r
+					b = data[pos];
+					g = data[pos+1];
+					r = data[pos+2];
+
+					data[pos] = r;
+					data[pos + 1] = g;
+					data[pos + 2] = b;
+					data[pos + 3] = 255;
+				}
+			} else if (type === wdi.SpiceBitmapFmt.SPICE_BITMAP_FMT_24BIT) {
+				for (pos = 0; pos < size; pos+=3) {
+					b = data[pos];
+					data[pos] = data[pos+2];
+					data[pos+2] = b;
+				}
+			}
+			buf8 = new Uint8ClampedArray(data);
+		}
+
+		var ret = new ImageData(buf8, pixelsStride, height);
+
+		var tmpCanvas = wdi.graphics.getNewTmpCanvas(width, height);
+		tmpCanvas.getContext('2d').putImageData(ret, 0, 0, 0, 0, width, height);
+		ret = tmpCanvas;
+
+		if(flags&4 === 0) {
+			ret = wdi.RasterOperation.flip(ret);
+		}
+
+		return ret;
+
+	}
+});
+function intToByteArray(value) {
+	// Создаем массив из одного байта
+	let byteArray = new Uint8Array(1);
+
+	// Устанавливаем значение в массиве байтов
+	byteArray[0] = value & 0xFF; // Маскирование, чтобы значение поместилось в один байт
+
+	return byteArray;
+}