Fix types after rebase onto latest dev

This commit is contained in:
Ingvar Stepanyan
2020-10-30 14:35:17 +00:00
parent eb08d0049a
commit e581075f64
4 changed files with 13 additions and 7 deletions

View File

@@ -1,5 +1,5 @@
interface JXLModule extends EmscriptenWasm.Module { interface JXLModule extends EmscriptenWasm.Module {
decode(data: BufferSource): ImageData; decode(data: BufferSource): ImageData | null;
} }
export default function(opts: EmscriptenWasm.ModuleOpts): JXLModule; export default function(opts: EmscriptenWasm.ModuleOpts): Promise<JXLModule>;

View File

@@ -1,8 +1,7 @@
import { EncodeOptions } from '../../src/codecs/jxl/encoder-meta'; import { EncodeOptions } from '../../../src/codecs/jxl/encoder-meta';
interface JXLModule extends EmscriptenWasm.Module { interface JXLModule extends EmscriptenWasm.Module {
encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array; encode(data: BufferSource, width: number, height: number, options: EncodeOptions): Uint8Array | null;
} }
export default function(opts: EmscriptenWasm.ModuleOpts): Promise<JXLModule>;
export default function(opts: EmscriptenWasm.ModuleOpts): JXLModule;

View File

@@ -8,5 +8,9 @@ export async function decode(data: ArrayBuffer): Promise<ImageData> {
if (!emscriptenModule) emscriptenModule = initEmscriptenModule(jxl_dec, wasmUrl); if (!emscriptenModule) emscriptenModule = initEmscriptenModule(jxl_dec, wasmUrl);
const module = await emscriptenModule; const module = await emscriptenModule;
return module.decode(data); const result = module.decode(data);
if (!result) {
throw new Error('Decoding error');
}
return result;
} }

View File

@@ -10,6 +10,9 @@ export async function encode(data: ImageData, options: EncodeOptions): Promise<A
const module = await emscriptenModule; const module = await emscriptenModule;
const result = module.encode(data.data, data.width, data.height, options); const result = module.encode(data.data, data.width, data.height, options);
if (!result) {
throw new Error('Encoding error');
}
// wasm cant run on SharedArrayBuffers, so we hard-cast to ArrayBuffer. // wasm cant run on SharedArrayBuffers, so we hard-cast to ArrayBuffer.
return result.buffer as ArrayBuffer; return result.buffer as ArrayBuffer;