@loaders.gl/images 3.1.0-alpha.4 → 3.1.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundle.d.ts +2 -0
- package/dist/bundle.d.ts.map +1 -0
- package/dist/bundle.js +5 -0
- package/dist/dist.min.js +2 -2
- package/dist/dist.min.js.map +7 -1
- package/dist/es5/bundle.js +1 -1
- package/dist/es5/bundle.js.map +1 -1
- package/dist/es5/image-loader.js +6 -8
- package/dist/es5/image-loader.js.map +1 -1
- package/dist/es5/image-writer.js +1 -1
- package/dist/es5/image-writer.js.map +1 -1
- package/dist/es5/index.js +11 -11
- package/dist/es5/lib/category-api/binary-image-api.js +22 -22
- package/dist/es5/lib/category-api/binary-image-api.js.map +1 -1
- package/dist/es5/lib/category-api/image-format.js +7 -5
- package/dist/es5/lib/category-api/image-format.js.map +1 -1
- package/dist/es5/lib/category-api/image-type.js +7 -5
- package/dist/es5/lib/category-api/image-type.js.map +1 -1
- package/dist/es5/lib/category-api/parsed-image-api.js +4 -8
- package/dist/es5/lib/category-api/parsed-image-api.js.map +1 -1
- package/dist/es5/lib/encoders/encode-image.js +45 -97
- package/dist/es5/lib/encoders/encode-image.js.map +1 -1
- package/dist/es5/lib/parsers/parse-image.js +31 -66
- package/dist/es5/lib/parsers/parse-image.js.map +1 -1
- package/dist/es5/lib/parsers/parse-to-image-bitmap.js +26 -98
- package/dist/es5/lib/parsers/parse-to-image-bitmap.js.map +1 -1
- package/dist/es5/lib/parsers/parse-to-image.js +27 -93
- package/dist/es5/lib/parsers/parse-to-image.js.map +1 -1
- package/dist/es5/lib/parsers/parse-to-node-image.js +7 -35
- package/dist/es5/lib/parsers/parse-to-node-image.js.map +1 -1
- package/dist/es5/lib/parsers/svg-utils.js +5 -5
- package/dist/es5/lib/parsers/svg-utils.js.map +1 -1
- package/dist/es5/lib/texture-api/async-deep-map.js +27 -156
- package/dist/es5/lib/texture-api/async-deep-map.js.map +1 -1
- package/dist/es5/lib/texture-api/deep-load.js +6 -67
- package/dist/es5/lib/texture-api/deep-load.js.map +1 -1
- package/dist/es5/lib/texture-api/generate-url.js +7 -11
- package/dist/es5/lib/texture-api/generate-url.js.map +1 -1
- package/dist/es5/lib/texture-api/load-image.js +39 -143
- package/dist/es5/lib/texture-api/load-image.js.map +1 -1
- package/dist/es5/lib/utils/version.js +1 -1
- package/dist/es5/lib/utils/version.js.map +1 -1
- package/dist/esm/lib/category-api/image-type.js +1 -1
- package/dist/esm/lib/category-api/image-type.js.map +1 -1
- package/dist/esm/lib/parsers/parse-to-image.js +1 -1
- package/dist/esm/lib/parsers/parse-to-image.js.map +1 -1
- package/dist/esm/lib/parsers/svg-utils.js +1 -1
- package/dist/esm/lib/parsers/svg-utils.js.map +1 -1
- package/dist/esm/lib/texture-api/generate-url.js +1 -1
- package/dist/esm/lib/texture-api/generate-url.js.map +1 -1
- package/dist/esm/lib/utils/version.js +1 -1
- package/dist/esm/lib/utils/version.js.map +1 -1
- package/dist/image-loader.d.ts +26 -0
- package/dist/image-loader.d.ts.map +1 -0
- package/dist/image-loader.js +43 -0
- package/dist/image-writer.d.ts +16 -0
- package/dist/image-writer.d.ts.map +1 -0
- package/dist/image-writer.js +20 -0
- package/dist/index.d.ts +10 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +27 -0
- package/dist/lib/category-api/binary-image-api.d.ts +19 -0
- package/dist/lib/category-api/binary-image-api.d.ts.map +1 -0
- package/dist/lib/category-api/binary-image-api.js +141 -0
- package/dist/lib/category-api/image-format.d.ts +5 -0
- package/dist/lib/category-api/image-format.d.ts.map +1 -0
- package/dist/lib/category-api/image-format.js +63 -0
- package/dist/lib/category-api/image-type.d.ts +12 -0
- package/dist/lib/category-api/image-type.d.ts.map +1 -0
- package/dist/lib/category-api/image-type.js +48 -0
- package/dist/lib/category-api/parsed-image-api.d.ts +10 -0
- package/dist/lib/category-api/parsed-image-api.d.ts.map +1 -0
- package/dist/lib/category-api/parsed-image-api.js +69 -0
- package/dist/lib/encoders/encode-image.d.ts +12 -0
- package/dist/lib/encoders/encode-image.d.ts.map +1 -0
- package/dist/lib/encoders/encode-image.js +82 -0
- package/dist/lib/parsers/parse-image.d.ts +5 -0
- package/dist/lib/parsers/parse-image.d.ts.map +1 -0
- package/dist/lib/parsers/parse-image.js +57 -0
- package/dist/lib/parsers/parse-to-image-bitmap.d.ts +10 -0
- package/dist/lib/parsers/parse-to-image-bitmap.d.ts.map +1 -0
- package/dist/lib/parsers/parse-to-image-bitmap.js +61 -0
- package/dist/lib/parsers/parse-to-image.d.ts +4 -0
- package/dist/lib/parsers/parse-to-image.d.ts.map +1 -0
- package/dist/lib/parsers/parse-to-image.js +47 -0
- package/dist/lib/parsers/parse-to-node-image.d.ts +4 -0
- package/dist/lib/parsers/parse-to-node-image.d.ts.map +1 -0
- package/dist/lib/parsers/parse-to-node-image.js +14 -0
- package/dist/lib/parsers/svg-utils.d.ts +4 -0
- package/dist/lib/parsers/svg-utils.d.ts.map +1 -0
- package/dist/lib/parsers/svg-utils.js +42 -0
- package/dist/lib/texture-api/async-deep-map.d.ts +3 -0
- package/dist/lib/texture-api/async-deep-map.d.ts.map +1 -0
- package/dist/lib/texture-api/async-deep-map.js +56 -0
- package/dist/lib/texture-api/deep-load.d.ts +3 -0
- package/dist/lib/texture-api/deep-load.d.ts.map +1 -0
- package/dist/lib/texture-api/deep-load.js +15 -0
- package/dist/lib/texture-api/generate-url.d.ts +2 -0
- package/dist/lib/texture-api/generate-url.d.ts.map +1 -0
- package/dist/lib/texture-api/generate-url.js +20 -0
- package/dist/lib/texture-api/load-image.d.ts +7 -0
- package/dist/lib/texture-api/load-image.d.ts.map +1 -0
- package/dist/lib/texture-api/load-image.js +47 -0
- package/dist/lib/utils/version.d.ts +2 -0
- package/dist/lib/utils/version.d.ts.map +1 -0
- package/dist/lib/utils/version.js +7 -0
- package/dist/types.d.ts +18 -0
- package/dist/types.d.ts.map +1 -0
- package/dist/types.js +2 -0
- package/package.json +5 -6
|
@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.getBinaryImageMetadata = getBinaryImageMetadata;
|
|
7
7
|
exports.getBmpMetadata = getBmpMetadata;
|
|
8
|
-
|
|
9
|
-
|
|
8
|
+
const BIG_ENDIAN = false;
|
|
9
|
+
const LITTLE_ENDIAN = true;
|
|
10
10
|
|
|
11
11
|
function getBinaryImageMetadata(binaryData) {
|
|
12
|
-
|
|
12
|
+
const dataView = toDataView(binaryData);
|
|
13
13
|
return getPngMetadata(dataView) || getJpegMetadata(dataView) || getGifMetadata(dataView) || getBmpMetadata(dataView);
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
function getPngMetadata(binaryData) {
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
const dataView = toDataView(binaryData);
|
|
18
|
+
const isPng = dataView.byteLength >= 24 && dataView.getUint32(0, BIG_ENDIAN) === 0x89504e47;
|
|
19
19
|
|
|
20
20
|
if (!isPng) {
|
|
21
21
|
return null;
|
|
@@ -29,8 +29,8 @@ function getPngMetadata(binaryData) {
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
function getGifMetadata(binaryData) {
|
|
32
|
-
|
|
33
|
-
|
|
32
|
+
const dataView = toDataView(binaryData);
|
|
33
|
+
const isGif = dataView.byteLength >= 10 && dataView.getUint32(0, BIG_ENDIAN) === 0x47494638;
|
|
34
34
|
|
|
35
35
|
if (!isGif) {
|
|
36
36
|
return null;
|
|
@@ -44,8 +44,8 @@ function getGifMetadata(binaryData) {
|
|
|
44
44
|
}
|
|
45
45
|
|
|
46
46
|
function getBmpMetadata(binaryData) {
|
|
47
|
-
|
|
48
|
-
|
|
47
|
+
const dataView = toDataView(binaryData);
|
|
48
|
+
const isBmp = dataView.byteLength >= 14 && dataView.getUint16(0, BIG_ENDIAN) === 0x424d && dataView.getUint32(2, LITTLE_ENDIAN) === dataView.byteLength;
|
|
49
49
|
|
|
50
50
|
if (!isBmp) {
|
|
51
51
|
return null;
|
|
@@ -59,21 +59,21 @@ function getBmpMetadata(binaryData) {
|
|
|
59
59
|
}
|
|
60
60
|
|
|
61
61
|
function getJpegMetadata(binaryData) {
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
const dataView = toDataView(binaryData);
|
|
63
|
+
const isJpeg = dataView.byteLength >= 3 && dataView.getUint16(0, BIG_ENDIAN) === 0xffd8 && dataView.getUint8(2) === 0xff;
|
|
64
64
|
|
|
65
65
|
if (!isJpeg) {
|
|
66
66
|
return null;
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
69
|
+
const {
|
|
70
|
+
tableMarkers,
|
|
71
|
+
sofMarkers
|
|
72
|
+
} = getJpegMarkers();
|
|
73
|
+
let i = 2;
|
|
74
74
|
|
|
75
75
|
while (i + 9 < dataView.byteLength) {
|
|
76
|
-
|
|
76
|
+
const marker = dataView.getUint16(i, BIG_ENDIAN);
|
|
77
77
|
|
|
78
78
|
if (sofMarkers.has(marker)) {
|
|
79
79
|
return {
|
|
@@ -95,16 +95,16 @@ function getJpegMetadata(binaryData) {
|
|
|
95
95
|
}
|
|
96
96
|
|
|
97
97
|
function getJpegMarkers() {
|
|
98
|
-
|
|
98
|
+
const tableMarkers = new Set([0xffdb, 0xffc4, 0xffcc, 0xffdd, 0xfffe]);
|
|
99
99
|
|
|
100
|
-
for (
|
|
100
|
+
for (let i = 0xffe0; i < 0xfff0; ++i) {
|
|
101
101
|
tableMarkers.add(i);
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
|
|
104
|
+
const sofMarkers = new Set([0xffc0, 0xffc1, 0xffc2, 0xffc3, 0xffc5, 0xffc6, 0xffc7, 0xffc9, 0xffca, 0xffcb, 0xffcd, 0xffce, 0xffcf, 0xffde]);
|
|
105
105
|
return {
|
|
106
|
-
tableMarkers
|
|
107
|
-
sofMarkers
|
|
106
|
+
tableMarkers,
|
|
107
|
+
sofMarkers
|
|
108
108
|
};
|
|
109
109
|
}
|
|
110
110
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/category-api/binary-image-api.ts"],"names":["BIG_ENDIAN","LITTLE_ENDIAN","getBinaryImageMetadata","binaryData","dataView","toDataView","getPngMetadata","getJpegMetadata","getGifMetadata","getBmpMetadata","isPng","byteLength","getUint32","mimeType","width","height","isGif","getUint16","isBmp","isJpeg","getUint8","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/category-api/binary-image-api.ts"],"names":["BIG_ENDIAN","LITTLE_ENDIAN","getBinaryImageMetadata","binaryData","dataView","toDataView","getPngMetadata","getJpegMetadata","getGifMetadata","getBmpMetadata","isPng","byteLength","getUint32","mimeType","width","height","isGif","getUint16","isBmp","isJpeg","getUint8","tableMarkers","sofMarkers","getJpegMarkers","i","marker","has","Set","add","data","DataView","ArrayBuffer","isView","buffer","Error"],"mappings":"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","sourcesContent":["// Attributions\n// * Based on binary-gltf-utils under MIT license: Copyright (c) 2016-17 Karl Cheng\n\n// TODO: make these functions work for Node.js buffers?\n// Quarantine references to Buffer to prevent bundler from adding big polyfills\n// import {bufferToArrayBuffer} from '../node/buffer-to-array-buffer';\n// TODO - this should be handled in @loaders.gl/polyfills\n\n/** MIME type, width and height extracted from binary compressed image data */\nexport type BinaryImageMetadata = {\n mimeType: string;\n width: number;\n height: number;\n};\n\nconst BIG_ENDIAN = false;\nconst LITTLE_ENDIAN = true;\n\n/**\n * Extracts `{mimeType, width and height}` from a memory buffer containing a known image format\n * Currently supports `image/png`, `image/jpeg`, `image/bmp` and `image/gif`.\n * @param binaryData image file memory to parse\n * @returns metadata or null if memory is not a valid image file format layout.\n */\nexport function getBinaryImageMetadata(\n binaryData: DataView | ArrayBuffer\n): BinaryImageMetadata | null {\n const dataView = toDataView(binaryData);\n return (\n getPngMetadata(dataView) ||\n getJpegMetadata(dataView) ||\n getGifMetadata(dataView) ||\n getBmpMetadata(dataView)\n );\n}\n\n// PNG\n\nfunction getPngMetadata(binaryData) {\n const dataView = toDataView(binaryData);\n // Check file contains the first 4 bytes of the PNG signature.\n const isPng = dataView.byteLength >= 24 && dataView.getUint32(0, BIG_ENDIAN) === 0x89504e47;\n if (!isPng) {\n return null;\n }\n\n // Extract size from a binary PNG file\n return {\n mimeType: 'image/png',\n width: dataView.getUint32(16, BIG_ENDIAN),\n height: dataView.getUint32(20, BIG_ENDIAN)\n };\n}\n\n// GIF\n\n// Extract size from a binary GIF file\n// TODO: GIF is not this simple\nfunction getGifMetadata(binaryData) {\n const dataView = toDataView(binaryData);\n // Check first 4 bytes of the GIF signature (\"GIF8\").\n const isGif = dataView.byteLength >= 10 && dataView.getUint32(0, BIG_ENDIAN) === 0x47494638;\n if (!isGif) {\n return null;\n }\n\n // GIF is little endian.\n return {\n mimeType: 'image/gif',\n width: dataView.getUint16(6, LITTLE_ENDIAN),\n height: dataView.getUint16(8, LITTLE_ENDIAN)\n };\n}\n\n// BMP\n\n// TODO: BMP is not this simple\nexport function getBmpMetadata(binaryData) {\n const dataView = toDataView(binaryData);\n // Check magic number is valid (first 2 characters should be \"BM\").\n // The mandatory bitmap file header is 14 bytes long.\n const isBmp =\n dataView.byteLength >= 14 &&\n dataView.getUint16(0, BIG_ENDIAN) === 0x424d &&\n dataView.getUint32(2, LITTLE_ENDIAN) === dataView.byteLength;\n\n if (!isBmp) {\n return null;\n }\n\n // BMP is little endian.\n return {\n mimeType: 'image/bmp',\n width: dataView.getUint32(18, LITTLE_ENDIAN),\n height: dataView.getUint32(22, LITTLE_ENDIAN)\n };\n}\n\n// JPEG\n\n// Extract width and height from a binary JPEG file\nfunction getJpegMetadata(binaryData) {\n const dataView = toDataView(binaryData);\n // Check file contains the JPEG \"start of image\" (SOI) marker\n // followed by another marker.\n const isJpeg =\n dataView.byteLength >= 3 &&\n dataView.getUint16(0, BIG_ENDIAN) === 0xffd8 &&\n dataView.getUint8(2) === 0xff;\n\n if (!isJpeg) {\n return null;\n }\n\n const {tableMarkers, sofMarkers} = getJpegMarkers();\n\n // Exclude the two byte SOI marker.\n let i = 2;\n while (i + 9 < dataView.byteLength) {\n const marker = dataView.getUint16(i, BIG_ENDIAN);\n\n // The frame that contains the width and height of the JPEG image.\n if (sofMarkers.has(marker)) {\n return {\n mimeType: 'image/jpeg',\n height: dataView.getUint16(i + 5, BIG_ENDIAN), // Number of lines\n width: dataView.getUint16(i + 7, BIG_ENDIAN) // Number of pixels per line\n };\n }\n\n // Miscellaneous tables/data preceding the frame header.\n if (!tableMarkers.has(marker)) {\n return null;\n }\n\n // Length includes size of length parameter but not the two byte header.\n i += 2;\n i += dataView.getUint16(i, BIG_ENDIAN);\n }\n\n return null;\n}\n\nfunction getJpegMarkers() {\n // Tables/misc header markers.\n // DQT, DHT, DAC, DRI, COM, APP_n\n const tableMarkers = new Set([0xffdb, 0xffc4, 0xffcc, 0xffdd, 0xfffe]);\n for (let i = 0xffe0; i < 0xfff0; ++i) {\n tableMarkers.add(i);\n }\n\n // SOF markers and DHP marker.\n // These markers are after tables/misc data.\n const sofMarkers = new Set([\n 0xffc0, 0xffc1, 0xffc2, 0xffc3, 0xffc5, 0xffc6, 0xffc7, 0xffc9, 0xffca, 0xffcb, 0xffcd, 0xffce,\n 0xffcf, 0xffde\n ]);\n\n return {tableMarkers, sofMarkers};\n}\n\n// TODO - move into image module?\nfunction toDataView(data) {\n if (data instanceof DataView) {\n return data;\n }\n if (ArrayBuffer.isView(data)) {\n return new DataView(data.buffer);\n }\n\n // TODO: make these functions work for Node.js buffers?\n // if (bufferToArrayBuffer) {\n // data = bufferToArrayBuffer(data);\n // }\n\n // Careful - Node Buffers will look like ArrayBuffers (keep after isBuffer)\n if (data instanceof ArrayBuffer) {\n return new DataView(data);\n }\n throw new Error('toDataView');\n}\n"],"file":"binary-image-api.js"}
|
|
@@ -7,8 +7,8 @@ exports._isImageFormatSupported = _isImageFormatSupported;
|
|
|
7
7
|
|
|
8
8
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
9
9
|
|
|
10
|
-
|
|
11
|
-
|
|
10
|
+
const NODE_FORMAT_SUPPORT = ['image/png', 'image/jpeg', 'image/gif'];
|
|
11
|
+
const mimeTypeSupported = {};
|
|
12
12
|
|
|
13
13
|
function _isImageFormatSupported(mimeType) {
|
|
14
14
|
if (mimeTypeSupported[mimeType] === undefined) {
|
|
@@ -28,7 +28,9 @@ function checkFormatSupport(mimeType) {
|
|
|
28
28
|
|
|
29
29
|
default:
|
|
30
30
|
if (!_loaderUtils.isBrowser) {
|
|
31
|
-
|
|
31
|
+
const {
|
|
32
|
+
_parseImageNode
|
|
33
|
+
} = globalThis;
|
|
32
34
|
return Boolean(_parseImageNode) && NODE_FORMAT_SUPPORT.includes(mimeType);
|
|
33
35
|
}
|
|
34
36
|
|
|
@@ -42,9 +44,9 @@ function checkWebPSupport() {
|
|
|
42
44
|
}
|
|
43
45
|
|
|
44
46
|
try {
|
|
45
|
-
|
|
47
|
+
const element = document.createElement('canvas');
|
|
46
48
|
return element.toDataURL('image/webp').indexOf('data:image/webp') === 0;
|
|
47
|
-
} catch
|
|
49
|
+
} catch {
|
|
48
50
|
return false;
|
|
49
51
|
}
|
|
50
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/category-api/image-format.ts"],"names":["NODE_FORMAT_SUPPORT","mimeTypeSupported","_isImageFormatSupported","mimeType","undefined","checkFormatSupport","checkWebPSupport","isBrowser","_parseImageNode","globalThis","Boolean","includes","element","document","createElement","toDataURL","indexOf"],"mappings":";;;;;;;AAAA;;AAGA,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/category-api/image-format.ts"],"names":["NODE_FORMAT_SUPPORT","mimeTypeSupported","_isImageFormatSupported","mimeType","undefined","checkFormatSupport","checkWebPSupport","isBrowser","_parseImageNode","globalThis","Boolean","includes","element","document","createElement","toDataURL","indexOf"],"mappings":";;;;;;;AAAA;;AAGA,MAAMA,mBAAmB,GAAG,CAAC,WAAD,EAAc,YAAd,EAA4B,WAA5B,CAA5B;AAGA,MAAMC,iBAAgD,GAAG,EAAzD;;AAKO,SAASC,uBAAT,CAAiCC,QAAjC,EAA4D;AACjE,MAAIF,iBAAiB,CAACE,QAAD,CAAjB,KAAgCC,SAApC,EAA+C;AAC7CH,IAAAA,iBAAiB,CAACE,QAAD,CAAjB,GAA8BE,kBAAkB,CAACF,QAAD,CAAhD;AACD;;AACD,SAAOF,iBAAiB,CAACE,QAAD,CAAxB;AACD;;AAKD,SAASE,kBAAT,CAA4BF,QAA5B,EAAuD;AACrD,UAAQA,QAAR;AACE,SAAK,YAAL;AACE,aAAOG,gBAAgB,EAAvB;;AACF,SAAK,WAAL;AACE,aAAOC,sBAAP;;AACF;AACE,UAAI,CAACA,sBAAL,EAAgB;AAEd,cAAM;AAACC,UAAAA;AAAD,YAAoBC,UAA1B;AACA,eAAOC,OAAO,CAACF,eAAD,CAAP,IAA4BR,mBAAmB,CAACW,QAApB,CAA6BR,QAA7B,CAAnC;AACD;;AACD,aAAO,IAAP;AAXJ;AAaD;;AAGD,SAASG,gBAAT,GAA4B;AAC1B,MAAI,CAACC,sBAAL,EAAgB;AACd,WAAO,KAAP;AACD;;AACD,MAAI;AACF,UAAMK,OAAO,GAAGC,QAAQ,CAACC,aAAT,CAAuB,QAAvB,CAAhB;AACA,WAAOF,OAAO,CAACG,SAAR,CAAkB,YAAlB,EAAgCC,OAAhC,CAAwC,iBAAxC,MAA+D,CAAtE;AACD,GAHD,CAGE,MAAM;AAEN,WAAO,KAAP;AACD;AACF","sourcesContent":["import {isBrowser} from '@loaders.gl/loader-utils';\n\n// The following formats are supported by loaders.gl polyfills\nconst NODE_FORMAT_SUPPORT = ['image/png', 'image/jpeg', 'image/gif'];\n\n/** Cache values for speed */\nconst mimeTypeSupported: {[mimeType: string]: boolean} = {};\n\n/**\n * Check if image MIME type is supported. Result is cached.\n */\nexport function _isImageFormatSupported(mimeType: string): boolean {\n if (mimeTypeSupported[mimeType] === undefined) {\n mimeTypeSupported[mimeType] = checkFormatSupport(mimeType);\n }\n return mimeTypeSupported[mimeType];\n}\n\n/**\n * Check if image MIME type is supported.\n */\nfunction checkFormatSupport(mimeType: string): boolean {\n switch (mimeType) {\n case 'image/webp':\n return checkWebPSupport();\n case 'image/svg':\n return isBrowser;\n default:\n if (!isBrowser) {\n // @ts-ignore\n const {_parseImageNode} = globalThis;\n return Boolean(_parseImageNode) && NODE_FORMAT_SUPPORT.includes(mimeType);\n }\n return true;\n }\n}\n\n/** Check WebPSupport synchronously */\nfunction checkWebPSupport() {\n if (!isBrowser) {\n return false;\n }\n try {\n const element = document.createElement('canvas');\n return element.toDataURL('image/webp').indexOf('data:image/webp') === 0;\n } catch {\n // Probably Safari...\n return false;\n }\n}\n\n// Note: better test but asynchronous\n\n// Lossy test image. Support for lossy images doesn't guarantee support for all WebP images.\n// https://stackoverflow.com/questions/5573096/detecting-webp-support\n// const WEBP_TEST_IMAGE = 'data:image/webp;base64,UklGRiIAAABXRUJQVlA4IBYAAAAwAQCdASoBAAEADsD+JaQAA3AAAAAA';\n\n// Check WebPSupport asynchronously\n// async function isWebPSupported() {\n// return new Promise( resolve => {\n// const image = new Image();\n// image.src = WEBP_TEST_IMAGE;\n// image.onload = image.onerror = function () {\n// resolve( image.height === 1 );\n// }\n// }\n"],"file":"image-format.js"}
|
|
@@ -8,11 +8,13 @@ exports.getDefaultImageType = getDefaultImageType;
|
|
|
8
8
|
|
|
9
9
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
10
10
|
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
11
|
+
const {
|
|
12
|
+
_parseImageNode
|
|
13
|
+
} = globalThis;
|
|
14
|
+
const IMAGE_SUPPORTED = typeof Image !== 'undefined';
|
|
15
|
+
const IMAGE_BITMAP_SUPPORTED = typeof ImageBitmap !== 'undefined';
|
|
16
|
+
const NODE_IMAGE_SUPPORTED = Boolean(_parseImageNode);
|
|
17
|
+
const DATA_SUPPORTED = _loaderUtils.isBrowser ? true : NODE_IMAGE_SUPPORTED;
|
|
16
18
|
|
|
17
19
|
function isImageTypeSupported(type) {
|
|
18
20
|
switch (type) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/category-api/image-type.ts"],"names":["_parseImageNode","globalThis","IMAGE_SUPPORTED","Image","IMAGE_BITMAP_SUPPORTED","ImageBitmap","NODE_IMAGE_SUPPORTED","Boolean","DATA_SUPPORTED","isBrowser","isImageTypeSupported","type","Error","getDefaultImageType"],"mappings":";;;;;;;;AAAA;;AAIA,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/category-api/image-type.ts"],"names":["_parseImageNode","globalThis","IMAGE_SUPPORTED","Image","IMAGE_BITMAP_SUPPORTED","ImageBitmap","NODE_IMAGE_SUPPORTED","Boolean","DATA_SUPPORTED","isBrowser","isImageTypeSupported","type","Error","getDefaultImageType"],"mappings":";;;;;;;;AAAA;;AAIA,MAAM;AAACA,EAAAA;AAAD,IAAoBC,UAA1B;AAEA,MAAMC,eAAe,GAAG,OAAOC,KAAP,KAAiB,WAAzC;AACA,MAAMC,sBAAsB,GAAG,OAAOC,WAAP,KAAuB,WAAtD;AACA,MAAMC,oBAAoB,GAAGC,OAAO,CAACP,eAAD,CAApC;AACA,MAAMQ,cAAc,GAAGC,yBAAY,IAAZ,GAAmBH,oBAA1C;;AAMO,SAASI,oBAAT,CAA8BC,IAA9B,EAAqD;AAC1D,UAAQA,IAAR;AACE,SAAK,MAAL;AAEE,aAAOP,sBAAsB,IAAIF,eAA1B,IAA6CM,cAApD;;AAEF,SAAK,aAAL;AACE,aAAOJ,sBAAP;;AACF,SAAK,OAAL;AACE,aAAOF,eAAP;;AACF,SAAK,MAAL;AACE,aAAOM,cAAP;;AAEF;AACE,YAAM,IAAII,KAAJ,qCAAuCD,IAAvC,wCAAN;AAbJ;AAeD;;AAMM,SAASE,mBAAT,GAA8C;AACnD,MAAIT,sBAAJ,EAA4B;AAC1B,WAAO,aAAP;AACD;;AACD,MAAIF,eAAJ,EAAqB;AACnB,WAAO,OAAP;AACD;;AACD,MAAIM,cAAJ,EAAoB;AAClB,WAAO,MAAP;AACD;;AAGD,QAAM,IAAII,KAAJ,CAAU,iEAAV,CAAN;AACD","sourcesContent":["import {isBrowser} from '@loaders.gl/loader-utils';\nimport type {ImageTypeEnum} from '../../types';\n\n// @ts-ignore TS2339: Property does not exist on type\nconst {_parseImageNode} = globalThis;\n\nconst IMAGE_SUPPORTED = typeof Image !== 'undefined'; // NOTE: \"false\" positives if jsdom is installed\nconst IMAGE_BITMAP_SUPPORTED = typeof ImageBitmap !== 'undefined';\nconst NODE_IMAGE_SUPPORTED = Boolean(_parseImageNode);\nconst DATA_SUPPORTED = isBrowser ? true : NODE_IMAGE_SUPPORTED;\n\n/**\n * Checks if a loaders.gl image type is supported\n * @param type image type string\n */\nexport function isImageTypeSupported(type: string): boolean {\n switch (type) {\n case 'auto':\n // Should only ever be false in Node.js, if polyfills have not been installed...\n return IMAGE_BITMAP_SUPPORTED || IMAGE_SUPPORTED || DATA_SUPPORTED;\n\n case 'imagebitmap':\n return IMAGE_BITMAP_SUPPORTED;\n case 'image':\n return IMAGE_SUPPORTED;\n case 'data':\n return DATA_SUPPORTED;\n\n default:\n throw new Error(`@loaders.gl/images: image ${type} not supported in this environment`);\n }\n}\n\n/**\n * Returns the \"most performant\" supported image type on this platform\n * @returns image type string\n */\nexport function getDefaultImageType(): ImageTypeEnum {\n if (IMAGE_BITMAP_SUPPORTED) {\n return 'imagebitmap';\n }\n if (IMAGE_SUPPORTED) {\n return 'image';\n }\n if (DATA_SUPPORTED) {\n return 'data';\n }\n\n // This should only happen in Node.js\n throw new Error('Install \\'@loaders.gl/polyfills\\' to parse images under Node.js');\n}\n"],"file":"image-type.js"}
|
|
@@ -1,7 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
3
|
Object.defineProperty(exports, "__esModule", {
|
|
6
4
|
value: true
|
|
7
5
|
});
|
|
@@ -11,8 +9,6 @@ exports.getImageType = getImageType;
|
|
|
11
9
|
exports.getImageSize = getImageSize;
|
|
12
10
|
exports.getImageData = getImageData;
|
|
13
11
|
|
|
14
|
-
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
15
|
-
|
|
16
12
|
function isImage(image) {
|
|
17
13
|
return Boolean(getImageTypeOrNull(image));
|
|
18
14
|
}
|
|
@@ -28,7 +24,7 @@ function deleteImage(image) {
|
|
|
28
24
|
}
|
|
29
25
|
|
|
30
26
|
function getImageType(image) {
|
|
31
|
-
|
|
27
|
+
const format = getImageTypeOrNull(image);
|
|
32
28
|
|
|
33
29
|
if (!format) {
|
|
34
30
|
throw new Error('Not an image');
|
|
@@ -48,8 +44,8 @@ function getImageData(image) {
|
|
|
48
44
|
|
|
49
45
|
case 'image':
|
|
50
46
|
case 'imagebitmap':
|
|
51
|
-
|
|
52
|
-
|
|
47
|
+
const canvas = document.createElement('canvas');
|
|
48
|
+
const context = canvas.getContext('2d');
|
|
53
49
|
|
|
54
50
|
if (!context) {
|
|
55
51
|
throw new Error('getImageData');
|
|
@@ -74,7 +70,7 @@ function getImageTypeOrNull(image) {
|
|
|
74
70
|
return 'image';
|
|
75
71
|
}
|
|
76
72
|
|
|
77
|
-
if (image &&
|
|
73
|
+
if (image && typeof image === 'object' && image.data && image.width && image.height) {
|
|
78
74
|
return 'data';
|
|
79
75
|
}
|
|
80
76
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/category-api/parsed-image-api.ts"],"names":["isImage","image","Boolean","getImageTypeOrNull","deleteImage","getImageType","close","format","Error","getImageSize","getImageData","canvas","document","createElement","context","getContext","width","height","drawImage","ImageBitmap","Image","data"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/category-api/parsed-image-api.ts"],"names":["isImage","image","Boolean","getImageTypeOrNull","deleteImage","getImageType","close","format","Error","getImageSize","getImageData","canvas","document","createElement","context","getContext","width","height","drawImage","ImageBitmap","Image","data"],"mappings":";;;;;;;;;;;AAEO,SAASA,OAAT,CAAiBC,KAAjB,EAA4C;AACjD,SAAOC,OAAO,CAACC,kBAAkB,CAACF,KAAD,CAAnB,CAAd;AACD;;AAEM,SAASG,WAAT,CAAqBH,KAArB,EAA6C;AAClD,UAAQI,YAAY,CAACJ,KAAD,CAApB;AACE,SAAK,aAAL;AACGA,MAAAA,KAAD,CAAuBK,KAAvB;AACA;;AACF;AAJF;AAOD;;AAEM,SAASD,YAAT,CAAsBJ,KAAtB,EAAuD;AAC5D,QAAMM,MAAM,GAAGJ,kBAAkB,CAACF,KAAD,CAAjC;;AACA,MAAI,CAACM,MAAL,EAAa;AACX,UAAM,IAAIC,KAAJ,CAAU,cAAV,CAAN;AACD;;AACD,SAAOD,MAAP;AACD;;AAEM,SAASE,YAAT,CAAsBR,KAAtB,EAAyE;AAC9E,SAAOS,YAAY,CAACT,KAAD,CAAnB;AACD;;AAEM,SAASS,YAAT,CAAsBT,KAAtB,EAAmE;AACxE,UAAQI,YAAY,CAACJ,KAAD,CAApB;AACE,SAAK,MAAL;AACE,aAAOA,KAAP;;AAEF,SAAK,OAAL;AACA,SAAK,aAAL;AAEE,YAAMU,MAAM,GAAGC,QAAQ,CAACC,aAAT,CAAuB,QAAvB,CAAf;AAEA,YAAMC,OAAO,GAAGH,MAAM,CAACI,UAAP,CAAkB,IAAlB,CAAhB;;AACA,UAAI,CAACD,OAAL,EAAc;AACZ,cAAM,IAAIN,KAAJ,CAAU,cAAV,CAAN;AACD;;AAEDG,MAAAA,MAAM,CAACK,KAAP,GAAef,KAAK,CAACe,KAArB;AAEAL,MAAAA,MAAM,CAACM,MAAP,GAAgBhB,KAAK,CAACgB,MAAtB;AAEAH,MAAAA,OAAO,CAACI,SAAR,CAAkBjB,KAAlB,EAAyB,CAAzB,EAA4B,CAA5B;AAEA,aAAOa,OAAO,CAACJ,YAAR,CAAqB,CAArB,EAAwB,CAAxB,EAA2BT,KAAK,CAACe,KAAjC,EAAwCf,KAAK,CAACgB,MAA9C,CAAP;;AAEF;AACE,YAAM,IAAIT,KAAJ,CAAU,cAAV,CAAN;AAvBJ;AAyBD;;AAKD,SAASL,kBAAT,CAA4BF,KAA5B,EAAmC;AACjC,MAAI,OAAOkB,WAAP,KAAuB,WAAvB,IAAsClB,KAAK,YAAYkB,WAA3D,EAAwE;AACtE,WAAO,aAAP;AACD;;AACD,MAAI,OAAOC,KAAP,KAAiB,WAAjB,IAAgCnB,KAAK,YAAYmB,KAArD,EAA4D;AAC1D,WAAO,OAAP;AACD;;AACD,MAAInB,KAAK,IAAI,OAAOA,KAAP,KAAiB,QAA1B,IAAsCA,KAAK,CAACoB,IAA5C,IAAoDpB,KAAK,CAACe,KAA1D,IAAmEf,KAAK,CAACgB,MAA7E,EAAqF;AACnF,WAAO,MAAP;AACD;;AACD,SAAO,IAAP;AACD","sourcesContent":["import type {ImageType, ImageTypeEnum, ImageDataType} from '../../types';\n\nexport function isImage(image: ImageType): boolean {\n return Boolean(getImageTypeOrNull(image));\n}\n\nexport function deleteImage(image: ImageType): void {\n switch (getImageType(image)) {\n case 'imagebitmap':\n (image as ImageBitmap).close();\n break;\n default:\n // Nothing to do for images and image data objects\n }\n}\n\nexport function getImageType(image: ImageType): ImageTypeEnum {\n const format = getImageTypeOrNull(image);\n if (!format) {\n throw new Error('Not an image');\n }\n return format;\n}\n\nexport function getImageSize(image: ImageType): {width: number; height: number} {\n return getImageData(image);\n}\n\nexport function getImageData(image: ImageType): ImageDataType | ImageData {\n switch (getImageType(image)) {\n case 'data':\n return image as unknown as ImageData;\n\n case 'image':\n case 'imagebitmap':\n // Extract the image data from the image via a canvas\n const canvas = document.createElement('canvas');\n // TODO - reuse the canvas?\n const context = canvas.getContext('2d');\n if (!context) {\n throw new Error('getImageData');\n }\n // @ts-ignore\n canvas.width = image.width;\n // @ts-ignore\n canvas.height = image.height;\n // @ts-ignore\n context.drawImage(image, 0, 0);\n // @ts-ignore\n return context.getImageData(0, 0, image.width, image.height);\n\n default:\n throw new Error('getImageData');\n }\n}\n\n// PRIVATE\n\n// eslint-disable-next-line complexity\nfunction getImageTypeOrNull(image) {\n if (typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap) {\n return 'imagebitmap';\n }\n if (typeof Image !== 'undefined' && image instanceof Image) {\n return 'image';\n }\n if (image && typeof image === 'object' && image.data && image.width && image.height) {\n return 'data';\n }\n return null;\n}\n"],"file":"parsed-image-api.js"}
|
|
@@ -1,126 +1,74 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
3
|
Object.defineProperty(exports, "__esModule", {
|
|
6
4
|
value: true
|
|
7
5
|
});
|
|
8
6
|
exports.encodeImage = encodeImage;
|
|
9
7
|
|
|
10
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
|
|
14
8
|
var _parsedImageApi = require("../category-api/parsed-image-api");
|
|
15
9
|
|
|
16
|
-
|
|
10
|
+
const {
|
|
11
|
+
_encodeImageNode
|
|
12
|
+
} = globalThis;
|
|
17
13
|
|
|
18
|
-
function encodeImage(
|
|
19
|
-
|
|
14
|
+
async function encodeImage(image, options) {
|
|
15
|
+
options = options || {};
|
|
16
|
+
options.image = options.image || {};
|
|
17
|
+
return _encodeImageNode ? _encodeImageNode(image, {
|
|
18
|
+
type: options.image.mimeType
|
|
19
|
+
}) : encodeImageInBrowser(image, options);
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
22
|
+
let qualityParamSupported = true;
|
|
23
|
+
|
|
24
|
+
async function encodeImageInBrowser(image, options) {
|
|
25
|
+
const {
|
|
26
|
+
mimeType,
|
|
27
|
+
jpegQuality
|
|
28
|
+
} = options.image;
|
|
29
|
+
const {
|
|
30
|
+
width,
|
|
31
|
+
height
|
|
32
|
+
} = (0, _parsedImageApi.getImageSize)(image);
|
|
33
|
+
const canvas = document.createElement('canvas');
|
|
34
|
+
canvas.width = width;
|
|
35
|
+
canvas.height = height;
|
|
36
|
+
drawImageToCanvas(image, canvas);
|
|
37
|
+
const blob = await new Promise(resolve => {
|
|
38
|
+
if (jpegQuality && qualityParamSupported) {
|
|
39
|
+
try {
|
|
40
|
+
canvas.toBlob(resolve, mimeType, jpegQuality);
|
|
41
|
+
return;
|
|
42
|
+
} catch (error) {
|
|
43
|
+
qualityParamSupported = false;
|
|
38
44
|
}
|
|
39
|
-
}
|
|
40
|
-
}));
|
|
41
|
-
return _encodeImage.apply(this, arguments);
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
var qualityParamSupported = true;
|
|
45
|
-
|
|
46
|
-
function encodeImageInBrowser(_x3, _x4) {
|
|
47
|
-
return _encodeImageInBrowser.apply(this, arguments);
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
function _encodeImageInBrowser() {
|
|
51
|
-
_encodeImageInBrowser = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(image, options) {
|
|
52
|
-
var _options$image, mimeType, jpegQuality, _getImageSize, width, height, canvas, blob;
|
|
53
|
-
|
|
54
|
-
return _regenerator.default.wrap(function _callee2$(_context3) {
|
|
55
|
-
while (1) {
|
|
56
|
-
switch (_context3.prev = _context3.next) {
|
|
57
|
-
case 0:
|
|
58
|
-
_options$image = options.image, mimeType = _options$image.mimeType, jpegQuality = _options$image.jpegQuality;
|
|
59
|
-
_getImageSize = (0, _parsedImageApi.getImageSize)(image), width = _getImageSize.width, height = _getImageSize.height;
|
|
60
|
-
canvas = document.createElement('canvas');
|
|
61
|
-
canvas.width = width;
|
|
62
|
-
canvas.height = height;
|
|
63
|
-
drawImageToCanvas(image, canvas);
|
|
64
|
-
_context3.next = 8;
|
|
65
|
-
return new Promise(function (resolve) {
|
|
66
|
-
if (jpegQuality && qualityParamSupported) {
|
|
67
|
-
try {
|
|
68
|
-
canvas.toBlob(resolve, mimeType, jpegQuality);
|
|
69
|
-
return;
|
|
70
|
-
} catch (error) {
|
|
71
|
-
qualityParamSupported = false;
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
canvas.toBlob(resolve, mimeType);
|
|
76
|
-
});
|
|
77
|
-
|
|
78
|
-
case 8:
|
|
79
|
-
blob = _context3.sent;
|
|
80
|
-
|
|
81
|
-
if (blob) {
|
|
82
|
-
_context3.next = 11;
|
|
83
|
-
break;
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
throw new Error('image encoding failed');
|
|
45
|
+
}
|
|
87
46
|
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
return blob.arrayBuffer();
|
|
47
|
+
canvas.toBlob(resolve, mimeType);
|
|
48
|
+
});
|
|
91
49
|
|
|
92
|
-
|
|
93
|
-
|
|
50
|
+
if (!blob) {
|
|
51
|
+
throw new Error('image encoding failed');
|
|
52
|
+
}
|
|
94
53
|
|
|
95
|
-
|
|
96
|
-
case "end":
|
|
97
|
-
return _context3.stop();
|
|
98
|
-
}
|
|
99
|
-
}
|
|
100
|
-
}, _callee2);
|
|
101
|
-
}));
|
|
102
|
-
return _encodeImageInBrowser.apply(this, arguments);
|
|
54
|
+
return await blob.arrayBuffer();
|
|
103
55
|
}
|
|
104
56
|
|
|
105
|
-
function drawImageToCanvas(image, canvas) {
|
|
106
|
-
var x = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
|
|
107
|
-
var y = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
|
|
108
|
-
|
|
57
|
+
function drawImageToCanvas(image, canvas, x = 0, y = 0) {
|
|
109
58
|
if (x === 0 && y === 0 && typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap) {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
if (_context) {
|
|
113
|
-
_context.transferFromImageBitmap(image);
|
|
59
|
+
const context = canvas.getContext('bitmaprenderer');
|
|
114
60
|
|
|
61
|
+
if (context) {
|
|
62
|
+
context.transferFromImageBitmap(image);
|
|
115
63
|
return canvas;
|
|
116
64
|
}
|
|
117
65
|
}
|
|
118
66
|
|
|
119
|
-
|
|
67
|
+
const context = canvas.getContext('2d');
|
|
120
68
|
|
|
121
69
|
if (image.data) {
|
|
122
|
-
|
|
123
|
-
|
|
70
|
+
const clampedArray = new Uint8ClampedArray(image.data);
|
|
71
|
+
const imageData = new ImageData(clampedArray, image.width, image.height);
|
|
124
72
|
context.putImageData(imageData, 0, 0);
|
|
125
73
|
return canvas;
|
|
126
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/encoders/encode-image.ts"],"names":["_encodeImageNode","globalThis","encodeImage","image","options","type","mimeType","encodeImageInBrowser","qualityParamSupported","jpegQuality","width","height","canvas","document","createElement","drawImageToCanvas","Promise","resolve","toBlob","error","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/encoders/encode-image.ts"],"names":["_encodeImageNode","globalThis","encodeImage","image","options","type","mimeType","encodeImageInBrowser","qualityParamSupported","jpegQuality","width","height","canvas","document","createElement","drawImageToCanvas","blob","Promise","resolve","toBlob","error","Error","arrayBuffer","x","y","ImageBitmap","context","getContext","transferFromImageBitmap","data","clampedArray","Uint8ClampedArray","imageData","ImageData","putImageData","drawImage"],"mappings":";;;;;;;AACA;;AAGA,MAAM;AAACA,EAAAA;AAAD,IAAqBC,UAA3B;;AAUO,eAAeC,WAAf,CACLC,KADK,EAELC,OAFK,EAGiB;AACtBA,EAAAA,OAAO,GAAGA,OAAO,IAAI,EAArB;AACAA,EAAAA,OAAO,CAACD,KAAR,GAAgBC,OAAO,CAACD,KAAR,IAAkB,EAAlC;AAEA,SAAOH,gBAAgB,GACnBA,gBAAgB,CAACG,KAAD,EAAQ;AAACE,IAAAA,IAAI,EAAED,OAAO,CAACD,KAAR,CAAcG;AAArB,GAAR,CADG,GAEnBC,oBAAoB,CAACJ,KAAD,EAAQC,OAAR,CAFxB;AAGD;;AAGD,IAAII,qBAAqB,GAAG,IAA5B;;AASA,eAAeD,oBAAf,CAAoCJ,KAApC,EAA2CC,OAA3C,EAAoD;AAClD,QAAM;AAACE,IAAAA,QAAD;AAAWG,IAAAA;AAAX,MAA0BL,OAAO,CAACD,KAAxC;AAEA,QAAM;AAACO,IAAAA,KAAD;AAAQC,IAAAA;AAAR,MAAkB,kCAAaR,KAAb,CAAxB;AAGA,QAAMS,MAAM,GAAGC,QAAQ,CAACC,aAAT,CAAuB,QAAvB,CAAf;AACAF,EAAAA,MAAM,CAACF,KAAP,GAAeA,KAAf;AACAE,EAAAA,MAAM,CAACD,MAAP,GAAgBA,MAAhB;AAEAI,EAAAA,iBAAiB,CAACZ,KAAD,EAAQS,MAAR,CAAjB;AAGA,QAAMI,IAAI,GAAG,MAAM,IAAIC,OAAJ,CAA0BC,OAAD,IAAa;AAEvD,QAAIT,WAAW,IAAID,qBAAnB,EAA0C;AACxC,UAAI;AACFI,QAAAA,MAAM,CAACO,MAAP,CAAcD,OAAd,EAAuBZ,QAAvB,EAAiCG,WAAjC;AACA;AACD,OAHD,CAGE,OAAOW,KAAP,EAAc;AACdZ,QAAAA,qBAAqB,GAAG,KAAxB;AACD;AACF;;AACDI,IAAAA,MAAM,CAACO,MAAP,CAAcD,OAAd,EAAuBZ,QAAvB;AACD,GAXkB,CAAnB;;AAaA,MAAI,CAACU,IAAL,EAAW;AACT,UAAM,IAAIK,KAAJ,CAAU,uBAAV,CAAN;AACD;;AAED,SAAO,MAAML,IAAI,CAACM,WAAL,EAAb;AACD;;AAED,SAASP,iBAAT,CAA2BZ,KAA3B,EAAkCS,MAAlC,EAA0CW,CAAC,GAAG,CAA9C,EAAiDC,CAAC,GAAG,CAArD,EAAwD;AAEtD,MAAID,CAAC,KAAK,CAAN,IAAWC,CAAC,KAAK,CAAjB,IAAsB,OAAOC,WAAP,KAAuB,WAA7C,IAA4DtB,KAAK,YAAYsB,WAAjF,EAA8F;AAC5F,UAAMC,OAAO,GAAGd,MAAM,CAACe,UAAP,CAAkB,gBAAlB,CAAhB;;AACA,QAAID,OAAJ,EAAa;AAEXA,MAAAA,OAAO,CAACE,uBAAR,CAAgCzB,KAAhC;AACA,aAAOS,MAAP;AACD;AACF;;AAGD,QAAMc,OAAO,GAAGd,MAAM,CAACe,UAAP,CAAkB,IAAlB,CAAhB;;AACA,MAAIxB,KAAK,CAAC0B,IAAV,EAAgB;AAEd,UAAMC,YAAY,GAAG,IAAIC,iBAAJ,CAAsB5B,KAAK,CAAC0B,IAA5B,CAArB;AACA,UAAMG,SAAS,GAAG,IAAIC,SAAJ,CAAcH,YAAd,EAA4B3B,KAAK,CAACO,KAAlC,EAAyCP,KAAK,CAACQ,MAA/C,CAAlB;AACAe,IAAAA,OAAO,CAACQ,YAAR,CAAqBF,SAArB,EAAgC,CAAhC,EAAmC,CAAnC;AACA,WAAOpB,MAAP;AACD;;AAGDc,EAAAA,OAAO,CAACS,SAAR,CAAkBhC,KAAlB,EAAyB,CAAzB,EAA4B,CAA5B;AACA,SAAOS,MAAP;AACD","sourcesContent":["// Image loading/saving for browser and Node.js\nimport {getImageSize} from '../category-api/parsed-image-api';\n\n// @ts-ignore TS2339: Property does not exist on type\nconst {_encodeImageNode} = globalThis;\n\n/**\n * Returns data bytes representing a compressed image in PNG or JPG format,\n * This data can be saved using file system (f) methods or used in a request.\n * @param image - ImageBitmap Image or Canvas\n * @param options\n * param opt.type='png' - png, jpg or image/png, image/jpg are valid\n * param mimeType= - Whether to include a data URI header\n */\nexport async function encodeImage(\n image: any,\n options?: {[key: string]: any}\n): Promise<ArrayBuffer> {\n options = options || {};\n options.image = options.image || ({} as {[key: string]: any});\n\n return _encodeImageNode\n ? _encodeImageNode(image, {type: options.image.mimeType})\n : encodeImageInBrowser(image, options);\n}\n\n// In case we get exceptions from canvas.toBlob(resolve, type, quality)\nlet qualityParamSupported = true;\n\n/**\n *\n * @param image\n * @param options\n * @note Based on canvas.toBlob\n * @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob\n */\nasync function encodeImageInBrowser(image, options) {\n const {mimeType, jpegQuality} = options.image;\n\n const {width, height} = getImageSize(image);\n\n // create a canvas and resize it to the size of our image\n const canvas = document.createElement('canvas');\n canvas.width = width;\n canvas.height = height;\n\n drawImageToCanvas(image, canvas);\n\n // The actual encoding is done asynchronously with `canvas.toBlob()`\n const blob = await new Promise<Blob | null>((resolve) => {\n // get it back as a Blob\n if (jpegQuality && qualityParamSupported) {\n try {\n canvas.toBlob(resolve, mimeType, jpegQuality);\n return;\n } catch (error) {\n qualityParamSupported = false;\n }\n }\n canvas.toBlob(resolve, mimeType);\n });\n\n if (!blob) {\n throw new Error('image encoding failed');\n }\n\n return await blob.arrayBuffer();\n}\n\nfunction drawImageToCanvas(image, canvas, x = 0, y = 0) {\n // Try optimized path for ImageBitmaps via bitmaprenderer context\n if (x === 0 && y === 0 && typeof ImageBitmap !== 'undefined' && image instanceof ImageBitmap) {\n const context = canvas.getContext('bitmaprenderer');\n if (context) {\n // transfer the ImageBitmap to it\n context.transferFromImageBitmap(image);\n return canvas;\n }\n }\n\n // Available on most platforms, except IE11 and Andriod WebViews...\n const context = canvas.getContext('2d');\n if (image.data) {\n // ImageData constructor expects clamped array even though getImageData does not return a clamped array...\n const clampedArray = new Uint8ClampedArray(image.data);\n const imageData = new ImageData(clampedArray, image.width, image.height);\n context.putImageData(imageData, 0, 0);\n return canvas;\n }\n\n // Fall back to generic image/image bitmap rendering path\n context.drawImage(image, 0, 0);\n return canvas;\n}\n"],"file":"encode-image.js"}
|
|
@@ -7,10 +7,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = parseImage;
|
|
9
9
|
|
|
10
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
13
|
-
|
|
14
10
|
var _loaderUtils = require("@loaders.gl/loader-utils");
|
|
15
11
|
|
|
16
12
|
var _imageType = require("../category-api/image-type");
|
|
@@ -23,69 +19,38 @@ var _parseToImageBitmap = _interopRequireDefault(require("./parse-to-image-bitma
|
|
|
23
19
|
|
|
24
20
|
var _parseToNodeImage = _interopRequireDefault(require("./parse-to-node-image"));
|
|
25
21
|
|
|
26
|
-
function parseImage(
|
|
27
|
-
|
|
28
|
-
}
|
|
22
|
+
async function parseImage(arrayBuffer, options, context) {
|
|
23
|
+
options = options || {};
|
|
24
|
+
const imageOptions = options.image || {};
|
|
25
|
+
const imageType = imageOptions.type || 'auto';
|
|
26
|
+
const {
|
|
27
|
+
url
|
|
28
|
+
} = context || {};
|
|
29
|
+
const loadType = getLoadableImageType(imageType);
|
|
30
|
+
let image;
|
|
31
|
+
|
|
32
|
+
switch (loadType) {
|
|
33
|
+
case 'imagebitmap':
|
|
34
|
+
image = await (0, _parseToImageBitmap.default)(arrayBuffer, options, url);
|
|
35
|
+
break;
|
|
36
|
+
|
|
37
|
+
case 'image':
|
|
38
|
+
image = await (0, _parseToImage.default)(arrayBuffer, options, url);
|
|
39
|
+
break;
|
|
40
|
+
|
|
41
|
+
case 'data':
|
|
42
|
+
image = await (0, _parseToNodeImage.default)(arrayBuffer, options);
|
|
43
|
+
break;
|
|
44
|
+
|
|
45
|
+
default:
|
|
46
|
+
(0, _loaderUtils.assert)(false);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
if (imageType === 'data') {
|
|
50
|
+
image = (0, _parsedImageApi.getImageData)(image);
|
|
51
|
+
}
|
|
29
52
|
|
|
30
|
-
|
|
31
|
-
_parseImage = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(arrayBuffer, options, context) {
|
|
32
|
-
var imageOptions, imageType, _ref, url, loadType, image;
|
|
33
|
-
|
|
34
|
-
return _regenerator.default.wrap(function _callee$(_context) {
|
|
35
|
-
while (1) {
|
|
36
|
-
switch (_context.prev = _context.next) {
|
|
37
|
-
case 0:
|
|
38
|
-
options = options || {};
|
|
39
|
-
imageOptions = options.image || {};
|
|
40
|
-
imageType = imageOptions.type || 'auto';
|
|
41
|
-
_ref = context || {}, url = _ref.url;
|
|
42
|
-
loadType = getLoadableImageType(imageType);
|
|
43
|
-
_context.t0 = loadType;
|
|
44
|
-
_context.next = _context.t0 === 'imagebitmap' ? 8 : _context.t0 === 'image' ? 12 : _context.t0 === 'data' ? 16 : 20;
|
|
45
|
-
break;
|
|
46
|
-
|
|
47
|
-
case 8:
|
|
48
|
-
_context.next = 10;
|
|
49
|
-
return (0, _parseToImageBitmap.default)(arrayBuffer, options, url);
|
|
50
|
-
|
|
51
|
-
case 10:
|
|
52
|
-
image = _context.sent;
|
|
53
|
-
return _context.abrupt("break", 21);
|
|
54
|
-
|
|
55
|
-
case 12:
|
|
56
|
-
_context.next = 14;
|
|
57
|
-
return (0, _parseToImage.default)(arrayBuffer, options, url);
|
|
58
|
-
|
|
59
|
-
case 14:
|
|
60
|
-
image = _context.sent;
|
|
61
|
-
return _context.abrupt("break", 21);
|
|
62
|
-
|
|
63
|
-
case 16:
|
|
64
|
-
_context.next = 18;
|
|
65
|
-
return (0, _parseToNodeImage.default)(arrayBuffer, options);
|
|
66
|
-
|
|
67
|
-
case 18:
|
|
68
|
-
image = _context.sent;
|
|
69
|
-
return _context.abrupt("break", 21);
|
|
70
|
-
|
|
71
|
-
case 20:
|
|
72
|
-
(0, _loaderUtils.assert)(false);
|
|
73
|
-
|
|
74
|
-
case 21:
|
|
75
|
-
if (imageType === 'data') {
|
|
76
|
-
image = (0, _parsedImageApi.getImageData)(image);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
return _context.abrupt("return", image);
|
|
80
|
-
|
|
81
|
-
case 23:
|
|
82
|
-
case "end":
|
|
83
|
-
return _context.stop();
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
}, _callee);
|
|
87
|
-
}));
|
|
88
|
-
return _parseImage.apply(this, arguments);
|
|
53
|
+
return image;
|
|
89
54
|
}
|
|
90
55
|
|
|
91
56
|
function getLoadableImageType(type) {
|