Mathis/sharp
1
0
Fork 0
mirror of https://github.com/lovell/sharp.git synced 2025-07-11 03:20:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow use of heic/heif identifiers with toFormat (#1834)

Browse Source
This commit is contained in:
Julian Aubourg 2019-08-12 22:36:56 +02:00 committed by Lovell Fuller
parent 0778c112a9
commit 5bfcf61a6f
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/output.js
View File

@ -487,6 +487,17 @@ function raw () {
return this._updateFormatOut('raw'); return this._updateFormatOut('raw');
} }
const formats = new Map([
['heic', 'heif'],
['heif', 'heif'],
['jpeg', 'jpeg'],
['jpg', 'jpeg'],
['png', 'png'],
['raw', 'raw'],
['tiff', 'tiff'],
['webp', 'webp']
]);
/** /**
* Force output to a given format. * Force output to a given format.
* *
@ -502,14 +513,11 @@ function raw () {
* @throws {Error} unsupported format or options * @throws {Error} unsupported format or options
*/ */
function toFormat (format, options) { function toFormat (format, options) {
if (is.object(format) && is.string(format.id)) { const actualFormat = formats.get(is.object(format) && is.string(format.id) ? format.id : format);
format = format.id; if (!actualFormat) {
throw is.invalidParameterError('format', `one of: ${[...formats.keys()].join(`, `)}`, format);
} }
if (format === 'jpg') format = 'jpeg'; return this[actualFormat](options);
if (!is.inArray(format, ['jpeg', 'png', 'webp', 'tiff', 'raw'])) {
throw is.invalidParameterError('format', 'one of: jpeg, png, webp, tiff, raw', format);
}
return this[format](options);
} }
/** /**