From df7e112d22495415d3e91bf62f77db806934dff8 Mon Sep 17 00:00:00 2001 From: Surma Date: Fri, 20 Jul 2018 10:53:31 +0100 Subject: [PATCH] Nits by Jake --- src/codecs/browser-webp/decoder.ts | 6 +++--- src/codecs/webp/decoder.ts | 6 +++--- src/lib/util.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/codecs/browser-webp/decoder.ts b/src/codecs/browser-webp/decoder.ts index d7be3a37..d7b850a6 100644 --- a/src/codecs/browser-webp/decoder.ts +++ b/src/codecs/browser-webp/decoder.ts @@ -1,9 +1,8 @@ import { canDecodeImage, createImageBitmapPolyfill } from '../../lib/util'; export const name = 'Browser WebP Decoder'; -export const supportedMimeTypes = ['image/webp']; -export async function decode(file: File): Promise { - return createImageBitmapPolyfill(file); +export async function decode(blob: Blob): Promise { + return createImageBitmapPolyfill(blob); } // tslint:disable-next-line:max-line-length It’s a data URL. Whatcha gonna do? @@ -13,6 +12,7 @@ export function isSupported(): Promise { return canDecodeImage(webpFile); } +const supportedMimeTypes = ['image/webp']; export function canHandleMimeType(mimeType: string): boolean { return supportedMimeTypes.includes(mimeType); } diff --git a/src/codecs/webp/decoder.ts b/src/codecs/webp/decoder.ts index 497d3eab..7f2e2649 100644 --- a/src/codecs/webp/decoder.ts +++ b/src/codecs/webp/decoder.ts @@ -2,10 +2,9 @@ import { blobToArrayBuffer, imageDataToBitmap } from '../../lib/util'; import DecoderWorker from './Decoder.worker'; export const name = 'WASM WebP Decoder'; -export const supportedMimeTypes = ['image/webp']; -export async function decode(file: File): Promise { +export async function decode(blob: Blob): Promise { const decoder = await new DecoderWorker(); - const imageData = await decoder.decode(await blobToArrayBuffer(file)); + const imageData = await decoder.decode(await blobToArrayBuffer(blob)); return imageDataToBitmap(imageData); } @@ -13,6 +12,7 @@ export async function isSupported(): Promise { return true; } +const supportedMimeTypes = ['image/webp']; export function canHandleMimeType(mimeType: string): boolean { return supportedMimeTypes.includes(mimeType); } diff --git a/src/lib/util.ts b/src/lib/util.ts index 4af40c39..fbd92e8d 100644 --- a/src/lib/util.ts +++ b/src/lib/util.ts @@ -128,7 +128,7 @@ const magicNumberToMimeType = new Map([ [/^RIFF....WEBPVP8 /, 'image/webp'], ]); -export async function sniffMimeType(blob: Blob): Promise { +export async function sniffMimeType(blob: Blob): Promise { const firstChunk = await blobToArrayBuffer(blob.slice(0, 16)); const firstChunkString = Array.from(new Uint8Array(firstChunk))