From 47ae1f52db9cb85decf6ed3b8110c456925b11d8 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Sat, 29 Jan 2022 15:24:44 +0000 Subject: [PATCH] Docs: metadata returns resolutionUnit, if present --- docs/api-input.md | 1 + lib/input.js | 1 + src/pipeline.cc | 5 ----- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/api-input.md b/docs/api-input.md index 8cca23e5d..b11594925 100644 --- a/docs/api-input.md +++ b/docs/api-input.md @@ -28,6 +28,7 @@ A `Promise` is returned when `callback` is not provided. * `subifds`: Number of Sub Image File Directories in an OME-TIFF image * `background`: Default background colour, if present, for PNG (bKGD) and GIF images, either an RGB Object or a single greyscale value * `compression`: The encoder used to compress an HEIF file, `av1` (AVIF) or `hevc` (HEIC) +* `resolutionUnit`: The unit of resolution (density), either `inch` or `cm`, if present * `hasProfile`: Boolean indicating the presence of an embedded ICC profile * `hasAlpha`: Boolean indicating the presence of an alpha transparency channel * `orientation`: Number value of the EXIF Orientation header, if present diff --git a/lib/input.js b/lib/input.js index 6e0eb7d2c..e684f043d 100644 --- a/lib/input.js +++ b/lib/input.js @@ -316,6 +316,7 @@ function _isStreamInput () { * - `subifds`: Number of Sub Image File Directories in an OME-TIFF image * - `background`: Default background colour, if present, for PNG (bKGD) and GIF images, either an RGB Object or a single greyscale value * - `compression`: The encoder used to compress an HEIF file, `av1` (AVIF) or `hevc` (HEIC) + * - `resolutionUnit`: The unit of resolution (density), either `inch` or `cm`, if present * - `hasProfile`: Boolean indicating the presence of an embedded ICC profile * - `hasAlpha`: Boolean indicating the presence of an alpha transparency channel * - `orientation`: Number value of the EXIF Orientation header, if present diff --git a/src/pipeline.cc b/src/pipeline.cc index 203e6011f..c6239ccfc 100644 --- a/src/pipeline.cc +++ b/src/pipeline.cc @@ -1443,7 +1443,6 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) { baton->affineOdx = sharp::AttrAsDouble(options, "affineOdx"); baton->affineOdy = sharp::AttrAsDouble(options, "affineOdy"); baton->affineInterpolator = vips::VInterpolate::new_from_name(sharp::AttrAsStr(options, "affineInterpolator").data()); - baton->removeAlpha = sharp::AttrAsBool(options, "removeAlpha"); baton->ensureAlpha = sharp::AttrAsDouble(options, "ensureAlpha"); if (options.Has("boolean")) { @@ -1555,13 +1554,10 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) { sharp::AttrAsStr(options, "heifCompression").data())); baton->heifEffort = sharp::AttrAsUint32(options, "heifEffort"); baton->heifChromaSubsampling = sharp::AttrAsStr(options, "heifChromaSubsampling"); - - // Raw output baton->rawDepth = static_cast( vips_enum_from_nick(nullptr, VIPS_TYPE_BAND_FORMAT, sharp::AttrAsStr(options, "rawDepth").data())); - // Animated output properties if (sharp::HasAttr(options, "loop")) { baton->loop = sharp::AttrAsUint32(options, "loop"); @@ -1569,7 +1565,6 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) { if (sharp::HasAttr(options, "delay")) { baton->delay = sharp::AttrAsInt32Vector(options, "delay"); } - // Tile output baton->tileSize = sharp::AttrAsUint32(options, "tileSize"); baton->tileOverlap = sharp::AttrAsUint32(options, "tileOverlap");