mirror of
https://github.com/lovell/sharp.git
synced 2025-07-09 18:40:16 +02:00
Expose levels metadata for multi-level images #2222
This commit is contained in:
parent
f8144dd89c
commit
760550ca0d
@ -20,6 +20,7 @@ A `Promise` is returned when `callback` is not provided.
|
|||||||
- `loop`: Number of times to loop an animated image, zero refers to a continuous loop.
|
- `loop`: Number of times to loop an animated image, zero refers to a continuous loop.
|
||||||
- `delay`: Delay in ms between each page in an animated image, provided as an array of integers.
|
- `delay`: Delay in ms between each page in an animated image, provided as an array of integers.
|
||||||
- `pagePrimary`: Number of the primary page in a HEIF image
|
- `pagePrimary`: Number of the primary page in a HEIF image
|
||||||
|
- `levels`: Details of each level in a multi-level image provided as an array of objects, requires libvips compiled with support for OpenSlide
|
||||||
- `hasProfile`: Boolean indicating the presence of an embedded ICC profile
|
- `hasProfile`: Boolean indicating the presence of an embedded ICC profile
|
||||||
- `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
|
- `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
|
||||||
- `orientation`: Number value of the EXIF Orientation header, if present
|
- `orientation`: Number value of the EXIF Orientation header, if present
|
||||||
|
@ -14,6 +14,9 @@ Requires libvips v8.9.1
|
|||||||
[#2226](https://github.com/lovell/sharp/pull/2226)
|
[#2226](https://github.com/lovell/sharp/pull/2226)
|
||||||
[@romaleev](https://github.com/romaleev)
|
[@romaleev](https://github.com/romaleev)
|
||||||
|
|
||||||
|
* Expose `levels` metadata for multi-level images.
|
||||||
|
[#2222](https://github.com/lovell/sharp/issues/2222)
|
||||||
|
|
||||||
### v0.25.3 - 17th May 2020
|
### v0.25.3 - 17th May 2020
|
||||||
|
|
||||||
* Ensure libvips is initialised only once, improves worker thread safety.
|
* Ensure libvips is initialised only once, improves worker thread safety.
|
||||||
|
@ -208,6 +208,7 @@ function _isStreamInput () {
|
|||||||
* - `loop`: Number of times to loop an animated image, zero refers to a continuous loop.
|
* - `loop`: Number of times to loop an animated image, zero refers to a continuous loop.
|
||||||
* - `delay`: Delay in ms between each page in an animated image, provided as an array of integers.
|
* - `delay`: Delay in ms between each page in an animated image, provided as an array of integers.
|
||||||
* - `pagePrimary`: Number of the primary page in a HEIF image
|
* - `pagePrimary`: Number of the primary page in a HEIF image
|
||||||
|
* - `levels`: Details of each level in a multi-level image provided as an array of objects, requires libvips compiled with support for OpenSlide
|
||||||
* - `hasProfile`: Boolean indicating the presence of an embedded ICC profile
|
* - `hasProfile`: Boolean indicating the presence of an embedded ICC profile
|
||||||
* - `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
|
* - `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
|
||||||
* - `orientation`: Number value of the EXIF Orientation header, if present
|
* - `orientation`: Number value of the EXIF Orientation header, if present
|
||||||
|
@ -74,6 +74,15 @@ class MetadataWorker : public Napi::AsyncWorker {
|
|||||||
if (image.get_typeof("heif-primary") == G_TYPE_INT) {
|
if (image.get_typeof("heif-primary") == G_TYPE_INT) {
|
||||||
baton->pagePrimary = image.get_int("heif-primary");
|
baton->pagePrimary = image.get_int("heif-primary");
|
||||||
}
|
}
|
||||||
|
if (image.get_typeof("openslide.level-count") == VIPS_TYPE_REF_STRING) {
|
||||||
|
int const levels = std::stoi(image.get_string("openslide.level-count"));
|
||||||
|
for (int l = 0; l < levels; l++) {
|
||||||
|
std::string prefix = "openslide.level[" + std::to_string(l) + "].";
|
||||||
|
int const width = std::stoi(image.get_string((prefix + "width").data()));
|
||||||
|
int const height = std::stoi(image.get_string((prefix + "height").data()));
|
||||||
|
baton->levels.push_back(std::pair<int, int>(width, height));
|
||||||
|
}
|
||||||
|
}
|
||||||
baton->hasProfile = sharp::HasProfile(image);
|
baton->hasProfile = sharp::HasProfile(image);
|
||||||
// Derived attributes
|
// Derived attributes
|
||||||
baton->hasAlpha = sharp::HasAlpha(image);
|
baton->hasAlpha = sharp::HasAlpha(image);
|
||||||
@ -177,6 +186,17 @@ class MetadataWorker : public Napi::AsyncWorker {
|
|||||||
if (baton->pagePrimary > -1) {
|
if (baton->pagePrimary > -1) {
|
||||||
info.Set("pagePrimary", baton->pagePrimary);
|
info.Set("pagePrimary", baton->pagePrimary);
|
||||||
}
|
}
|
||||||
|
if (!baton->levels.empty()) {
|
||||||
|
int i = 0;
|
||||||
|
Napi::Array levels = Napi::Array::New(env, static_cast<size_t>(baton->levels.size()));
|
||||||
|
for (std::pair<int, int> const l : baton->levels) {
|
||||||
|
Napi::Object level = Napi::Object::New(env);
|
||||||
|
level.Set("width", l.first);
|
||||||
|
level.Set("height", l.second);
|
||||||
|
levels.Set(i++, level);
|
||||||
|
}
|
||||||
|
info.Set("levels", levels);
|
||||||
|
}
|
||||||
info.Set("hasProfile", baton->hasProfile);
|
info.Set("hasProfile", baton->hasProfile);
|
||||||
info.Set("hasAlpha", baton->hasAlpha);
|
info.Set("hasAlpha", baton->hasAlpha);
|
||||||
if (baton->orientation > 0) {
|
if (baton->orientation > 0) {
|
||||||
|
@ -39,6 +39,7 @@ struct MetadataBaton {
|
|||||||
int loop;
|
int loop;
|
||||||
std::vector<int> delay;
|
std::vector<int> delay;
|
||||||
int pagePrimary;
|
int pagePrimary;
|
||||||
|
std::vector<std::pair<int, int>> levels;
|
||||||
bool hasProfile;
|
bool hasProfile;
|
||||||
bool hasAlpha;
|
bool hasAlpha;
|
||||||
int orientation;
|
int orientation;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user