Compare commits
418 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f384e1c6c | ||
|
|
35e8c8b25e | ||
|
|
dc53f1baff | ||
|
|
70139600b5 | ||
|
|
1b4d1521e0 | ||
|
|
ed3377cb2d | ||
|
|
d72852b3aa | ||
|
|
4b6b6189bf | ||
|
|
b69a54fc75 | ||
|
|
81e388a4cc | ||
|
|
5bd5e5052a | ||
|
|
a2d3fa729f | ||
|
|
cb6811bc47 | ||
|
|
53c6e80869 | ||
|
|
e71dca586c | ||
|
|
b3cd48db5f | ||
|
|
476448b9d4 | ||
|
|
070534df5b | ||
|
|
9a1e8ed574 | ||
|
|
309918a878 | ||
|
|
cac83b94c1 | ||
|
|
9c06df08a1 | ||
|
|
52e4543d31 | ||
|
|
a688468378 | ||
|
|
e1760d64fb | ||
|
|
84d4e3cf8f | ||
|
|
f8a76372ad | ||
|
|
4237f5520f | ||
|
|
8c0c01c702 | ||
|
|
9c100830e0 | ||
|
|
ed5d753b89 | ||
|
|
d1ca756bd8 | ||
|
|
16cf9f0ef2 | ||
|
|
133f69d66c | ||
|
|
bc60daff9e | ||
|
|
43a085d1ae | ||
|
|
8c33d0aa56 | ||
|
|
fe0767df13 | ||
|
|
08a25a0c8f | ||
|
|
cd410080bd | ||
|
|
7555378e3b | ||
|
|
80c95ee66a | ||
|
|
31563b210d | ||
|
|
861cd93324 | ||
|
|
abb344bb1a | ||
|
|
6147491d9e | ||
|
|
f1f18fbb4a | ||
|
|
9fc611f257 | ||
|
|
34a2e14a14 | ||
|
|
83fe65b9e9 | ||
|
|
ec26c8aa49 | ||
|
|
da43a3055f | ||
|
|
a38126c82f | ||
|
|
cb592ce588 | ||
|
|
d69c58a6da | ||
|
|
bdb1986e08 | ||
|
|
55356c78a8 | ||
|
|
a0f55252b1 | ||
|
|
013f5cffa9 | ||
|
|
d5d008f568 | ||
|
|
3b02134cdc | ||
|
|
a57d7b51b1 | ||
|
|
1a3c38d35f | ||
|
|
00aece0538 | ||
|
|
5a9cc835b3 | ||
|
|
58526cc849 | ||
|
|
955b5f43a5 | ||
|
|
447aec3fde | ||
|
|
473260a836 | ||
|
|
4d2784c10c | ||
|
|
d9af897595 | ||
|
|
23a48be315 | ||
|
|
ce8f48e5d1 | ||
|
|
6aaf839662 | ||
|
|
984a9e653e | ||
|
|
8dffa28b4d | ||
|
|
b05a4bdadd | ||
|
|
36087fe518 | ||
|
|
5eed87ec4d | ||
|
|
af66a73225 | ||
|
|
dcf913c17e | ||
|
|
68ccba8f74 | ||
|
|
956f7e29db | ||
|
|
4264c0577e | ||
|
|
cc37b59309 | ||
|
|
9f2f92095d | ||
|
|
0c1075c089 | ||
|
|
9c64710c8b | ||
|
|
f6f16b91db | ||
|
|
1986b5cfe6 | ||
|
|
6445b72d41 | ||
|
|
df7b8ba738 | ||
|
|
202083999e | ||
|
|
315f519e1d | ||
|
|
d7d580ae6f | ||
|
|
7017af303d | ||
|
|
0dc325daa4 | ||
|
|
6dffb47973 | ||
|
|
b19dad69d6 | ||
|
|
94c5ac64e9 | ||
|
|
c4bcd088fb | ||
|
|
aeecbe9396 | ||
|
|
171aade9cd | ||
|
|
67213ae86c | ||
|
|
24d9e53c3f | ||
|
|
573ed5f4b5 | ||
|
|
ceff628add | ||
|
|
0bb8cb9203 | ||
|
|
98349bde28 | ||
|
|
f09be932eb | ||
|
|
4c57ac2bbe | ||
|
|
1dd93c1b6b | ||
|
|
c9f85fe27f | ||
|
|
419cbe50f6 | ||
|
|
5031c8323f | ||
|
|
762d5913ce | ||
|
|
290df1b1c7 | ||
|
|
79170afc51 | ||
|
|
bba00c2bfe | ||
|
|
f7e2b3688f | ||
|
|
8d49b7dde1 | ||
|
|
138e60adb3 | ||
|
|
d6376c31e0 | ||
|
|
a7003e93c8 | ||
|
|
4821a11223 | ||
|
|
bf1b326988 | ||
|
|
39ddb6a175 | ||
|
|
b2a0b8c0f0 | ||
|
|
4debc46d0e | ||
|
|
f4e259d10f | ||
|
|
774d78228e | ||
|
|
0e62bde5c3 | ||
|
|
2bbd9b23e6 | ||
|
|
02676140e8 | ||
|
|
182beaa4a1 | ||
|
|
7c08a09529 | ||
|
|
ef964b5472 | ||
|
|
ee54ce9913 | ||
|
|
e59e146887 | ||
|
|
103ec0d58f | ||
|
|
a0d89ed514 | ||
|
|
c10888e6fe | ||
|
|
93455f8eb5 | ||
|
|
65acd96c8d | ||
|
|
fabe720b9b | ||
|
|
53dd313e97 | ||
|
|
2678d7a660 | ||
|
|
46718102c6 | ||
|
|
0f473fe3b1 | ||
|
|
2872602c9e | ||
|
|
ab653cae33 | ||
|
|
e6a035e575 | ||
|
|
fbe48d75dd | ||
|
|
20ba0f49dd | ||
|
|
c213e9878d | ||
|
|
9704ca4c18 | ||
|
|
49dce6219e | ||
|
|
260ff6c94f | ||
|
|
3ec281d104 | ||
|
|
c4c43d525b | ||
|
|
6c5cde363a | ||
|
|
d46b4d950f | ||
|
|
b369c4bb8a | ||
|
|
c3898487c4 | ||
|
|
ca3c5b400f | ||
|
|
97772b176c | ||
|
|
08a2965f1c | ||
|
|
76dcddfa3d | ||
|
|
79f476ae4d | ||
|
|
d406cb619c | ||
|
|
4f3890f1e4 | ||
|
|
7a9d58cc51 | ||
|
|
eef87da0e1 | ||
|
|
00e65f6f14 | ||
|
|
866e9824d1 | ||
|
|
482e6078e2 | ||
|
|
bc7ab296ef | ||
|
|
a5f4f53b56 | ||
|
|
b1227f526d | ||
|
|
78b42c8306 | ||
|
|
4b6d45ab8e | ||
|
|
7980341923 | ||
|
|
3917efdebd | ||
|
|
eaecb7347b | ||
|
|
05ca7d3129 | ||
|
|
4beae0de71 | ||
|
|
b711661784 | ||
|
|
0c4a45b1f4 | ||
|
|
ec2beb0039 | ||
|
|
cafb3e8bac | ||
|
|
e896d5e920 | ||
|
|
42d4228595 | ||
|
|
341ea3e4ea | ||
|
|
cb1baede87 | ||
|
|
45653ca2e7 | ||
|
|
77c861b74b | ||
|
|
b586c2146f | ||
|
|
4d42bed4f8 | ||
|
|
ea54c119ab | ||
|
|
d95b124771 | ||
|
|
61ccf09e6f | ||
|
|
8da30f0b41 | ||
|
|
90a57e7664 | ||
|
|
c42de19d2a | ||
|
|
dcc42f8514 | ||
|
|
3150fad909 | ||
|
|
ba17db3ab3 | ||
|
|
7c1c48327e | ||
|
|
85459e0ec6 | ||
|
|
13bdb68366 | ||
|
|
c91373fba3 | ||
|
|
e8149f5295 | ||
|
|
ab015ef90f | ||
|
|
fdfc89e577 | ||
|
|
e647e1f7bd | ||
|
|
a05d735e31 | ||
|
|
4470048ba4 | ||
|
|
0f58f956a7 | ||
|
|
20284757a6 | ||
|
|
df6efa0285 | ||
|
|
3c10e118e3 | ||
|
|
19980190f7 | ||
|
|
8f5495a446 | ||
|
|
9431029917 | ||
|
|
17ea70a102 | ||
|
|
7f142bddb3 | ||
|
|
98e0516ac1 | ||
|
|
7717516d1d | ||
|
|
760550ca0d | ||
|
|
f8144dd89c | ||
|
|
ac4070cb49 | ||
|
|
25b964e3df | ||
|
|
17ec6c72df | ||
|
|
a7b1185602 | ||
|
|
c76ae06fd1 | ||
|
|
b3dd54d550 | ||
|
|
d248eadb06 | ||
|
|
507eef3053 | ||
|
|
fc2f672337 | ||
|
|
6f49be8f26 | ||
|
|
dad7f1e1f6 | ||
|
|
c3a9384dcf | ||
|
|
0ee08bfe46 | ||
|
|
0872f495f9 | ||
|
|
33ac8b93a9 | ||
|
|
bbff1c222d | ||
|
|
b534f99870 | ||
|
|
86acf2460e | ||
|
|
40c00035ee | ||
|
|
4673abae7d | ||
|
|
ef8a705957 | ||
|
|
48255fa009 | ||
|
|
ed6269bc9c | ||
|
|
16b8d9afe5 | ||
|
|
f29fcb1f73 | ||
|
|
b36ad25030 | ||
|
|
edf3fe24c9 | ||
|
|
5a1bdf0eb1 | ||
|
|
d8e24d7e76 | ||
|
|
786c5330e9 | ||
|
|
70e730bb67 | ||
|
|
1d6ef630a5 | ||
|
|
1eedb22ef5 | ||
|
|
6ed1f49ad3 | ||
|
|
ecd01afad3 | ||
|
|
8bd8709f2b | ||
|
|
e82a585cec | ||
|
|
c1d4a68558 | ||
|
|
eff36dc09f | ||
|
|
031a58f817 | ||
|
|
cf39fc4fb1 | ||
|
|
c9bff94e17 | ||
|
|
e78e919925 | ||
|
|
76bb25262e | ||
|
|
d8426b1ed5 | ||
|
|
4894c10dd9 | ||
|
|
24285bb0e0 | ||
|
|
bf75501262 | ||
|
|
9e214a17f0 | ||
|
|
0aae1ecd9b | ||
|
|
062f990315 | ||
|
|
22685e44c0 | ||
|
|
8d66433e7c | ||
|
|
82863f48f6 | ||
|
|
51b14329d6 | ||
|
|
14dc7681ed | ||
|
|
258c9e86eb | ||
|
|
03dad5f2b2 | ||
|
|
86264e7733 | ||
|
|
95eae905f0 | ||
|
|
a90dbcc808 | ||
|
|
e9b21f2211 | ||
|
|
409e5174bb | ||
|
|
8b3c0daab2 | ||
|
|
c17807c995 | ||
|
|
4abb4edf64 | ||
|
|
d5ecc537af | ||
|
|
c7a49054fd | ||
|
|
a2314c4aa0 | ||
|
|
1717173f17 | ||
|
|
e44c12f029 | ||
|
|
1a98c390fc | ||
|
|
91902740e4 | ||
|
|
6aa6a93b44 | ||
|
|
b4135ac9b3 | ||
|
|
78906e6551 | ||
|
|
ba29ba1ab7 | ||
|
|
e0fa15f5cb | ||
|
|
82a1ff359d | ||
|
|
18e1f10a94 | ||
|
|
4828a17643 | ||
|
|
3b4f95597a | ||
|
|
bd52e93fca | ||
|
|
6fdc79d569 | ||
|
|
7dbad7206e | ||
|
|
a8a0c1e935 | ||
|
|
00bcf60566 | ||
|
|
4a745f2d2e | ||
|
|
057074b238 | ||
|
|
4b8cc13a05 | ||
|
|
a4e8586b59 | ||
|
|
095b37db6a | ||
|
|
efff650314 | ||
|
|
0764ca8fde | ||
|
|
403160434b | ||
|
|
730ab14faa | ||
|
|
51d70c4574 | ||
|
|
765ccd2aaa | ||
|
|
5399332f81 | ||
|
|
43b7f9fc0e | ||
|
|
3925689435 | ||
|
|
96a994a4c0 | ||
|
|
84c20373ec | ||
|
|
a216d2945b | ||
|
|
755a0caf3d | ||
|
|
703d90e663 | ||
|
|
e230ce41d7 | ||
|
|
596b38a3bb | ||
|
|
d31a91a599 | ||
|
|
400ef71b6f | ||
|
|
bb15cd9067 | ||
|
|
6ee6a226e1 | ||
|
|
94d51a94c8 | ||
|
|
d0feb4156c | ||
|
|
0d1278dade | ||
|
|
1b401b1195 | ||
|
|
11daa3b4d1 | ||
|
|
88a3919ce0 | ||
|
|
c41b87303d | ||
|
|
833aaead56 | ||
|
|
ff98d2e44a | ||
|
|
fcf05f608a | ||
|
|
9baf38db44 | ||
|
|
69050ef1c8 | ||
|
|
b35b9f7850 | ||
|
|
500ae97cac | ||
|
|
d5b7040557 | ||
|
|
ca52894651 | ||
|
|
4009acdd30 | ||
|
|
147c93ecd3 | ||
|
|
8e04e4b07f | ||
|
|
e7413ea1e5 | ||
|
|
220bb03a32 | ||
|
|
20f512fe5f | ||
|
|
efb3523eaa | ||
|
|
2f2276e091 | ||
|
|
08a6597626 | ||
|
|
d82a6ee4fc | ||
|
|
e627f6d68d | ||
|
|
e650f58bd8 | ||
|
|
5a9b6c8afd | ||
|
|
075771d1e9 | ||
|
|
4fcf091fef | ||
|
|
0e66454fe4 | ||
|
|
aa3ce760bb | ||
|
|
ba46ad1fd9 | ||
|
|
11214bab5d | ||
|
|
d87c289b4a | ||
|
|
af45c03b6f | ||
|
|
7d6fadce6b | ||
|
|
6b560f7a85 | ||
|
|
5d4221460d | ||
|
|
d42c383992 | ||
|
|
9c7f6fcb2b | ||
|
|
14af0bda61 | ||
|
|
fb5c393fbd | ||
|
|
69fe21a7ec | ||
|
|
da4e05c118 | ||
|
|
e4333ff6b0 | ||
|
|
4ae8999f62 | ||
|
|
3fa91bb4ce | ||
|
|
23b2e541ab | ||
|
|
5bfcf61a6f | ||
|
|
0778c112a9 | ||
|
|
2c300754a7 | ||
|
|
c610e306df | ||
|
|
417cca6e0d | ||
|
|
2ed4b5ae83 | ||
|
|
16e429cf2c | ||
|
|
6b7ce8a605 | ||
|
|
ba4ce75377 | ||
|
|
76ded7fd28 | ||
|
|
a0d1a7be50 | ||
|
|
690bc43abe | ||
|
|
50b461024d | ||
|
|
6cf0b3240d | ||
|
|
233b015d77 | ||
|
|
28de243c11 | ||
|
|
36e8a3da88 | ||
|
|
119d16cad3 | ||
|
|
38402d3185 | ||
|
|
6c02949fc1 | ||
|
|
b737d4601e | ||
|
|
3ff3353550 | ||
|
|
946d3c81a5 | ||
|
|
628996846d | ||
|
|
631a3597c7 | ||
|
|
cfa4f7d45c |
16
.cirrus.yml
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
freebsd_instance:
|
||||||
|
image_family: freebsd-13-0-snap
|
||||||
|
|
||||||
|
task:
|
||||||
|
name: FreeBSD 13.0
|
||||||
|
env:
|
||||||
|
IGNORE_OSVERSION: yes
|
||||||
|
skip_notifications: true
|
||||||
|
prerequisites_script:
|
||||||
|
- pkg update -f
|
||||||
|
- pkg upgrade -y
|
||||||
|
- pkg install -y pkgconf vips node npm
|
||||||
|
install_script:
|
||||||
|
- npm install --build-from-source --unsafe-perm
|
||||||
|
test_script:
|
||||||
|
- npm test
|
||||||
11
.github/CONTRIBUTING.md
vendored
@@ -27,7 +27,7 @@ Please select the `master` branch as the destination for your Pull Request so yo
|
|||||||
|
|
||||||
Please squash your changes into a single commit using a command like `git rebase -i upstream/master`.
|
Please squash your changes into a single commit using a command like `git rebase -i upstream/master`.
|
||||||
|
|
||||||
To test C++ changes, you can compile the module using `npm install` and then run the tests using `npm test`.
|
To test C++ changes, you can compile the module using `npm install --build-from-source` and then run the tests using `npm test`.
|
||||||
|
|
||||||
## Submit a Pull Request with a new feature
|
## Submit a Pull Request with a new feature
|
||||||
|
|
||||||
@@ -42,11 +42,6 @@ You deserve to add your details to the [list of contributors](https://github.com
|
|||||||
|
|
||||||
Any change that modifies the existing public API should be added to the relevant work-in-progress branch for inclusion in the next major release.
|
Any change that modifies the existing public API should be added to the relevant work-in-progress branch for inclusion in the next major release.
|
||||||
|
|
||||||
| Release | WIP branch |
|
|
||||||
| ------: | :--------- |
|
|
||||||
| v0.23.0 | vision |
|
|
||||||
| v0.24.0 | wit |
|
|
||||||
|
|
||||||
Please squash your changes into a single commit using a command like `git rebase -i upstream/<wip-branch>`.
|
Please squash your changes into a single commit using a command like `git rebase -i upstream/<wip-branch>`.
|
||||||
|
|
||||||
### Add a new public method
|
### Add a new public method
|
||||||
@@ -71,7 +66,7 @@ The public API is documented with [JSDoc](http://usejsdoc.org/) annotated commen
|
|||||||
|
|
||||||
These can be converted to Markdown by running:
|
These can be converted to Markdown by running:
|
||||||
```sh
|
```sh
|
||||||
npm run docs
|
npm run docs-build
|
||||||
```
|
```
|
||||||
|
|
||||||
Please include documentation updates in any Pull Request that modifies the public API.
|
Please include documentation updates in any Pull Request that modifies the public API.
|
||||||
@@ -98,5 +93,5 @@ Please feel free to ask any questions via a
|
|||||||
[new issue](https://github.com/lovell/sharp/issues/new).
|
[new issue](https://github.com/lovell/sharp/issues/new).
|
||||||
|
|
||||||
If you're unable to post details publicly, please
|
If you're unable to post details publicly, please
|
||||||
[e-mail](https://github.com/lovell/sharp/blob/master/package.json#L4)
|
[e-mail](https://github.com/lovell/sharp/blob/master/package.json#L5)
|
||||||
for private, paid consulting.
|
for private, paid consulting.
|
||||||
|
|||||||
1
.github/FUNDING.yml
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
open_collective: libvips
|
||||||
5
.github/ISSUE_TEMPLATE/config.yml
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
blank_issues_enabled: false
|
||||||
|
contact_links:
|
||||||
|
- name: Documentation
|
||||||
|
url: https://sharp.pixelplumbing.com/
|
||||||
|
about: Installation instructions, complete API documentation with examples, changelog
|
||||||
2
.github/ISSUE_TEMPLATE/feature_request.md
vendored
@@ -1,9 +1,7 @@
|
|||||||
---
|
---
|
||||||
name: Feature request
|
name: Feature request
|
||||||
about: Suggest an idea
|
about: Suggest an idea
|
||||||
title: ''
|
|
||||||
labels: enhancement
|
labels: enhancement
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
22
.github/ISSUE_TEMPLATE/installation.md
vendored
@@ -1,14 +1,22 @@
|
|||||||
---
|
---
|
||||||
name: Installation
|
name: Installation
|
||||||
about: For help if something went wrong installing sharp
|
about: Something went wrong during either 'npm install sharp' or 'require("sharp")'
|
||||||
title: ''
|
labels: installation
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
What is the output of running `npm install --verbose sharp`?
|
Did you see the [documentation relating to installation](https://sharp.pixelplumbing.com/install)?
|
||||||
|
|
||||||
What is the output of running `npx envinfo --binaries --languages --system --utilities`?
|
Have you ensured the architecture and platform of Node.js used for `npm install` is the same as the architecture and platform of Node.js used at runtime?
|
||||||
|
|
||||||
Have you ensured the platform and version of Node.js used for `npm install` is the same as the platform and version of Node.js used at runtime?
|
Are you using the latest version? Is the version currently in use as reported by `npm ls sharp` the same as the latest version as reported by `npm view sharp dist-tags.latest`?
|
||||||
|
|
||||||
|
If you are using npm v6 or earlier and installing as a `root` or `sudo` user, have you tried with the `npm install --unsafe-perm` flag?
|
||||||
|
|
||||||
|
If you are using npm v7, does the user running `npm install` own the directory it is run in?
|
||||||
|
|
||||||
|
If you are using the `ignore-scripts` feature of `npm`, have you tried with the `npm install --ignore-scripts=false` flag?
|
||||||
|
|
||||||
|
What is the complete output of running `npm install --verbose sharp`? Have you checked this output for useful error messages?
|
||||||
|
|
||||||
|
What is the output of running `npx envinfo --binaries --system`?
|
||||||
|
|||||||
14
.github/ISSUE_TEMPLATE/possible-bug.md
vendored
@@ -1,18 +1,20 @@
|
|||||||
---
|
---
|
||||||
name: Possible bug
|
name: Possible bug
|
||||||
about: Please provide steps to reproduce
|
about: Installation of sharp was successful but then something unexpected occurred using one of its features
|
||||||
title: ''
|
labels: triage
|
||||||
labels: ''
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
What is the output of running `npx envinfo --binaries --languages --system --utilities`?
|
<!-- If this issue relates to installation, please use https://github.com/lovell/sharp/issues/new?labels=installation&template=installation.md instead. -->
|
||||||
|
|
||||||
|
Are you using the latest version? Is the version currently in use as reported by `npm ls sharp` the same as the latest version as reported by `npm view sharp dist-tags.latest`?
|
||||||
|
|
||||||
What are the steps to reproduce?
|
What are the steps to reproduce?
|
||||||
|
|
||||||
What is the expected behaviour?
|
What is the expected behaviour?
|
||||||
|
|
||||||
Are you able to provide a standalone code sample, without other dependencies, that demonstrates this problem?
|
Are you able to provide a minimal, standalone code sample, without other dependencies, that demonstrates this problem?
|
||||||
|
|
||||||
Are you able to provide a sample image that helps explain the problem?
|
Are you able to provide a sample image that helps explain the problem?
|
||||||
|
|
||||||
|
What is the output of running `npx envinfo --binaries --system`?
|
||||||
|
|||||||
8
.github/ISSUE_TEMPLATE/question.md
vendored
@@ -1,16 +1,16 @@
|
|||||||
---
|
---
|
||||||
name: Question
|
name: Question
|
||||||
about: For help with an existing feature
|
about: For help understanding an existing feature
|
||||||
title: ''
|
|
||||||
labels: question
|
labels: question
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
<!-- If this issue relates to installation, please use https://github.com/lovell/sharp/issues/new?labels=installation&template=installation.md instead. -->
|
||||||
|
|
||||||
What are you trying to achieve?
|
What are you trying to achieve?
|
||||||
|
|
||||||
Have you searched for similar questions?
|
Have you searched for similar questions?
|
||||||
|
|
||||||
Are you able to provide a standalone code sample that demonstrates this question?
|
Are you able to provide a minimal, standalone code sample that demonstrates this question?
|
||||||
|
|
||||||
Are you able to provide a sample image that helps explain the question?
|
Are you able to provide a sample image that helps explain the question?
|
||||||
|
|||||||
87
.github/workflows/ci.yml
vendored
Normal file
@@ -0,0 +1,87 @@
|
|||||||
|
on:
|
||||||
|
- push
|
||||||
|
- pull_request
|
||||||
|
jobs:
|
||||||
|
CI:
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
|
container: ${{ matrix.container }}
|
||||||
|
strategy:
|
||||||
|
fail-fast: false
|
||||||
|
matrix:
|
||||||
|
include:
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: centos:7
|
||||||
|
nodejs_version: 10
|
||||||
|
coverage: true
|
||||||
|
prebuild: true
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: centos:7
|
||||||
|
nodejs_version: 12
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: centos:7
|
||||||
|
nodejs_version: 14
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: centos:7
|
||||||
|
nodejs_version: 16
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: node:10-alpine3.11
|
||||||
|
prebuild: true
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: node:12-alpine3.11
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: node:14-alpine3.11
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: node:14-alpine3.13
|
||||||
|
- os: ubuntu-20.04
|
||||||
|
container: node:16-alpine3.11
|
||||||
|
- os: macos-10.15
|
||||||
|
nodejs_version: 10
|
||||||
|
prebuild: true
|
||||||
|
- os: macos-10.15
|
||||||
|
nodejs_version: 12
|
||||||
|
- os: macos-10.15
|
||||||
|
nodejs_version: 14
|
||||||
|
- os: macos-10.15
|
||||||
|
nodejs_version: 16
|
||||||
|
- os: windows-2019
|
||||||
|
nodejs_version: 10
|
||||||
|
prebuild: true
|
||||||
|
- os: windows-2019
|
||||||
|
nodejs_version: 12
|
||||||
|
- os: windows-2019
|
||||||
|
nodejs_version: 14
|
||||||
|
- os: windows-2019
|
||||||
|
nodejs_version: 16
|
||||||
|
steps:
|
||||||
|
- name: Dependencies (Linux glibc)
|
||||||
|
if: contains(matrix.container, 'centos')
|
||||||
|
run: |
|
||||||
|
curl -sL https://rpm.nodesource.com/setup_${{ matrix.nodejs_version }}.x | bash -
|
||||||
|
yum install -y gcc-c++ make git python3 nodejs
|
||||||
|
- name: Dependencies (Linux musl)
|
||||||
|
if: contains(matrix.container, 'alpine')
|
||||||
|
run: apk add build-base git python3 --update-cache
|
||||||
|
- name: Dependencies (macOS, Windows)
|
||||||
|
if: contains(matrix.os, 'macos') || contains(matrix.os, 'windows')
|
||||||
|
uses: actions/setup-node@v1
|
||||||
|
with:
|
||||||
|
node-version: ${{ matrix.nodejs_version }}
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v2
|
||||||
|
- name: Fix working directory ownership
|
||||||
|
if: matrix.container
|
||||||
|
run: chown root.root .
|
||||||
|
- name: Install
|
||||||
|
run: npm install --build-from-source --unsafe-perm
|
||||||
|
- name: Test
|
||||||
|
run: npm test
|
||||||
|
- name: Coverage
|
||||||
|
if: matrix.coverage
|
||||||
|
uses: coverallsapp/github-action@v1.1.2
|
||||||
|
with:
|
||||||
|
github-token: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
- name: Prebuild
|
||||||
|
if: matrix.prebuild && startsWith(github.ref, 'refs/tags/')
|
||||||
|
env:
|
||||||
|
prebuild_upload: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: npx prebuild --runtime napi --target 3
|
||||||
3
.gitignore
vendored
@@ -12,4 +12,7 @@ vendor
|
|||||||
.gitattributes
|
.gitattributes
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.nyc_output
|
.nyc_output
|
||||||
|
.vscode/
|
||||||
package-lock.json
|
package-lock.json
|
||||||
|
.idea
|
||||||
|
.firebase
|
||||||
|
|||||||
15
.npmignore
@@ -1,15 +0,0 @@
|
|||||||
build
|
|
||||||
node_modules
|
|
||||||
coverage
|
|
||||||
.editorconfig
|
|
||||||
.gitattributes
|
|
||||||
.gitignore
|
|
||||||
test
|
|
||||||
.travis.yml
|
|
||||||
appveyor.yml
|
|
||||||
mkdocs.yml
|
|
||||||
docs/css/
|
|
||||||
vendor
|
|
||||||
.prebuildrc
|
|
||||||
.nyc_output
|
|
||||||
.github/
|
|
||||||
182
.travis.yml
@@ -1,100 +1,108 @@
|
|||||||
matrix:
|
jobs:
|
||||||
include:
|
include:
|
||||||
- name: "Linux (glibc) - Node 6"
|
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 10"
|
||||||
|
arch: arm64
|
||||||
os: linux
|
os: linux
|
||||||
dist: trusty
|
dist: bionic
|
||||||
sudo: false
|
language: shell
|
||||||
language: node_js
|
|
||||||
node_js: "6"
|
|
||||||
- name: "Linux (glibc) - Node 8"
|
|
||||||
os: linux
|
|
||||||
dist: trusty
|
|
||||||
sudo: false
|
|
||||||
language: node_js
|
|
||||||
node_js: "8"
|
|
||||||
- name: "Linux (glibc) - Node 10"
|
|
||||||
os: linux
|
|
||||||
dist: trusty
|
|
||||||
sudo: false
|
|
||||||
language: node_js
|
|
||||||
node_js: "10"
|
|
||||||
- name: "Linux (glibc) - Node 12"
|
|
||||||
os: linux
|
|
||||||
dist: trusty
|
|
||||||
sudo: false
|
|
||||||
language: node_js
|
|
||||||
node_js: "12"
|
|
||||||
after_success:
|
|
||||||
- npm install coveralls
|
|
||||||
- cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
|
|
||||||
- name: "Linux (glibc) - Node 11"
|
|
||||||
os: linux
|
|
||||||
dist: trusty
|
|
||||||
sudo: false
|
|
||||||
language: node_js
|
|
||||||
node_js: "11"
|
|
||||||
- name: "Linux (musl) - Node 8"
|
|
||||||
os: linux
|
|
||||||
dist: trusty
|
|
||||||
sudo: true
|
|
||||||
language: minimal
|
|
||||||
before_install:
|
before_install:
|
||||||
- sudo docker run -dit --name sharp --env CI --env PREBUILD_TOKEN --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:8-alpine
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye
|
||||||
- sudo docker exec sharp apk add build-base git python2 --update-cache
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl"
|
||||||
install: sudo docker exec sharp sh -c "npm install --unsafe-perm"
|
- sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
|
||||||
|
- sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_10.x sid main' >/etc/apt/sources.list.d/nodesource.list"
|
||||||
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs=10.*"
|
||||||
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
- name: "Linux (musl) - Node 10"
|
after_success: "[[ -n $TRAVIS_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 3\""
|
||||||
|
|
||||||
|
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 12"
|
||||||
|
arch: arm64
|
||||||
os: linux
|
os: linux
|
||||||
dist: trusty
|
dist: bionic
|
||||||
sudo: true
|
language: shell
|
||||||
language: minimal
|
|
||||||
before_install:
|
before_install:
|
||||||
- sudo docker run -dit --name sharp --env CI --env PREBUILD_TOKEN --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:10-alpine
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye
|
||||||
- sudo docker exec sharp apk add build-base git python2 --update-cache
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl"
|
||||||
install: sudo docker exec sharp sh -c "npm install --unsafe-perm"
|
- sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
|
||||||
|
- sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_12.x sid main' >/etc/apt/sources.list.d/nodesource.list"
|
||||||
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
|
||||||
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
- name: "Linux (musl) - Node 11"
|
|
||||||
|
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 14"
|
||||||
|
arch: arm64
|
||||||
os: linux
|
os: linux
|
||||||
dist: trusty
|
dist: bionic
|
||||||
sudo: true
|
language: shell
|
||||||
language: minimal
|
|
||||||
before_install:
|
before_install:
|
||||||
- sudo docker run -dit --name sharp --env CI --env PREBUILD_TOKEN --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:11-alpine
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye
|
||||||
- sudo docker exec sharp apk add build-base git python2 --update-cache
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl"
|
||||||
install: sudo docker exec sharp sh -c "npm install --unsafe-perm"
|
- sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
|
||||||
|
- sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_14.x sid main' >/etc/apt/sources.list.d/nodesource.list"
|
||||||
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
|
||||||
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
- name: "Linux (musl) - Node 12"
|
|
||||||
|
- name: "Linux ARM64v8 (Debian 11, glibc 2.29) - Node.js 16"
|
||||||
|
arch: arm64
|
||||||
os: linux
|
os: linux
|
||||||
dist: trusty
|
dist: bionic
|
||||||
sudo: true
|
language: shell
|
||||||
language: minimal
|
|
||||||
before_install:
|
before_install:
|
||||||
- sudo docker run -dit --name sharp --env CI --env PREBUILD_TOKEN --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:12.0-alpine
|
- sudo chown 0.0 ${PWD}
|
||||||
- sudo docker exec sharp apk add build-base git python2 --update-cache
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp arm64v8/debian:bullseye
|
||||||
install: sudo docker exec sharp sh -c "npm install --unsafe-perm"
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y build-essential git python3 curl"
|
||||||
|
- sudo docker exec sharp sh -c "curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -"
|
||||||
|
- sudo docker exec sharp sh -c "echo 'deb https://deb.nodesource.com/node_16.x sid main' >/etc/apt/sources.list.d/nodesource.list"
|
||||||
|
- sudo docker exec sharp sh -c "apt-get update && apt-get install -y nodejs"
|
||||||
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
script: sudo docker exec sharp sh -c "npm test"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
- name: "OS X - Node 6"
|
|
||||||
os: osx
|
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 10"
|
||||||
osx_image: xcode9.2
|
arch: arm64
|
||||||
language: node_js
|
os: linux
|
||||||
node_js: "6"
|
dist: focal
|
||||||
- name: "OS X - Node 8"
|
language: shell
|
||||||
os: osx
|
before_install:
|
||||||
osx_image: xcode9.2
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:10-alpine3.11
|
||||||
language: node_js
|
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
||||||
node_js: "8"
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
- name: "OS X - Node 10"
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
os: osx
|
after_success: "[[ -n $TRAVIS_TAG ]] && sudo docker exec --env prebuild_upload sharp sh -c \"npx prebuild --runtime napi --target 3\""
|
||||||
osx_image: xcode9.2
|
|
||||||
language: node_js
|
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 12"
|
||||||
node_js: "10"
|
arch: arm64
|
||||||
- name: "OS X - Node 11"
|
os: linux
|
||||||
os: osx
|
dist: focal
|
||||||
osx_image: xcode9.2
|
language: shell
|
||||||
language: node_js
|
before_install:
|
||||||
node_js: "11"
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:12-alpine3.11
|
||||||
- name: "OS X - Node 12"
|
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
||||||
os: osx
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
osx_image: xcode9.2
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
language: node_js
|
|
||||||
node_js: "12"
|
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 14"
|
||||||
|
arch: arm64
|
||||||
|
os: linux
|
||||||
|
dist: focal
|
||||||
|
language: shell
|
||||||
|
before_install:
|
||||||
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:14-alpine3.11
|
||||||
|
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
||||||
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
|
|
||||||
|
- name: "Linux ARM64v8 (Alpine 3.11, musl 1.1.24) - Node.js 16"
|
||||||
|
arch: arm64
|
||||||
|
os: linux
|
||||||
|
dist: focal
|
||||||
|
language: shell
|
||||||
|
before_install:
|
||||||
|
- sudo chown 0.0 ${PWD}
|
||||||
|
- sudo docker run -dit --name sharp --volume "${PWD}:/mnt/sharp" --workdir /mnt/sharp node:16-alpine3.11
|
||||||
|
- sudo docker exec sharp sh -c "apk add build-base git python3 --update-cache"
|
||||||
|
install: sudo docker exec sharp sh -c "npm install --build-from-source --unsafe-perm"
|
||||||
|
script: sudo docker exec sharp sh -c "npm test"
|
||||||
|
|
||||||
|
cache:
|
||||||
|
npm: false
|
||||||
|
|||||||
46
README.md
@@ -1,17 +1,14 @@
|
|||||||
# sharp
|
# sharp
|
||||||
|
|
||||||
<img src="https://raw.githubusercontent.com/lovell/sharp/master/docs/image/sharp-logo.svg?sanitize=true" width="160" height="160" alt="sharp logo" align="right">
|
<img src="https://cdn.jsdelivr.net/gh/lovell/sharp@master/docs/image/sharp-logo.svg" width="160" height="160" alt="sharp logo" align="right">
|
||||||
|
|
||||||
```sh
|
|
||||||
npm install sharp
|
|
||||||
```
|
|
||||||
|
|
||||||
The typical use case for this high speed Node.js module
|
The typical use case for this high speed Node.js module
|
||||||
is to convert large images in common formats to
|
is to convert large images in common formats to
|
||||||
smaller, web-friendly JPEG, PNG and WebP images of varying dimensions.
|
smaller, web-friendly JPEG, PNG, WebP and AVIF images of varying dimensions.
|
||||||
|
|
||||||
Resizing an image is typically 4x-5x faster than using the
|
Resizing an image is typically 4x-5x faster than using the
|
||||||
quickest ImageMagick and GraphicsMagick settings.
|
quickest ImageMagick and GraphicsMagick settings
|
||||||
|
due to its use of [libvips](https://github.com/libvips/libvips).
|
||||||
|
|
||||||
Colour spaces, embedded ICC profiles and alpha transparency channels are all handled correctly.
|
Colour spaces, embedded ICC profiles and alpha transparency channels are all handled correctly.
|
||||||
Lanczos resampling ensures quality is not sacrificed for speed.
|
Lanczos resampling ensures quality is not sacrificed for speed.
|
||||||
@@ -19,12 +16,23 @@ Lanczos resampling ensures quality is not sacrificed for speed.
|
|||||||
As well as image resizing, operations such as
|
As well as image resizing, operations such as
|
||||||
rotation, extraction, compositing and gamma correction are available.
|
rotation, extraction, compositing and gamma correction are available.
|
||||||
|
|
||||||
Most modern 64-bit OS X, Windows and Linux systems running
|
Most modern macOS, Windows and Linux systems running Node.js v10+
|
||||||
Node versions 6, 8, 10, 11 and 12
|
|
||||||
do not require any additional install or runtime dependencies.
|
do not require any additional install or runtime dependencies.
|
||||||
|
|
||||||
|
## Documentation
|
||||||
|
|
||||||
|
Visit [sharp.pixelplumbing.com](https://sharp.pixelplumbing.com/) for complete
|
||||||
|
[installation instructions](https://sharp.pixelplumbing.com/install),
|
||||||
|
[API documentation](https://sharp.pixelplumbing.com/api-constructor),
|
||||||
|
[benchmark tests](https://sharp.pixelplumbing.com/performance) and
|
||||||
|
[changelog](https://sharp.pixelplumbing.com/changelog).
|
||||||
|
|
||||||
## Examples
|
## Examples
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm install sharp
|
||||||
|
```
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
const sharp = require('sharp');
|
const sharp = require('sharp');
|
||||||
```
|
```
|
||||||
@@ -43,6 +51,7 @@ sharp(inputBuffer)
|
|||||||
sharp('input.jpg')
|
sharp('input.jpg')
|
||||||
.rotate()
|
.rotate()
|
||||||
.resize(200)
|
.resize(200)
|
||||||
|
.jpeg({ mozjpeg: true })
|
||||||
.toBuffer()
|
.toBuffer()
|
||||||
.then( data => { ... })
|
.then( data => { ... })
|
||||||
.catch( err => { ... });
|
.catch( err => { ... });
|
||||||
@@ -84,24 +93,17 @@ readableStream
|
|||||||
.pipe(writableStream);
|
.pipe(writableStream);
|
||||||
```
|
```
|
||||||
|
|
||||||
[](https://coveralls.io/r/lovell/sharp?branch=master)
|
## Contributing
|
||||||
|
|
||||||
### Documentation
|
|
||||||
|
|
||||||
Visit [sharp.pixelplumbing.com](https://sharp.pixelplumbing.com/) for complete
|
|
||||||
[installation instructions](https://sharp.pixelplumbing.com/page/install),
|
|
||||||
[API documentation](https://sharp.pixelplumbing.com/page/api),
|
|
||||||
[benchmark tests](https://sharp.pixelplumbing.com/page/performance) and
|
|
||||||
[changelog](https://sharp.pixelplumbing.com/page/changelog).
|
|
||||||
|
|
||||||
### Contributing
|
|
||||||
|
|
||||||
A [guide for contributors](https://github.com/lovell/sharp/blob/master/.github/CONTRIBUTING.md)
|
A [guide for contributors](https://github.com/lovell/sharp/blob/master/.github/CONTRIBUTING.md)
|
||||||
covers reporting bugs, requesting features and submitting code changes.
|
covers reporting bugs, requesting features and submitting code changes.
|
||||||
|
|
||||||
### Licensing
|
[](https://coveralls.io/r/lovell/sharp?branch=master)
|
||||||
|
[](https://nodejs.org/dist/latest/docs/api/n-api.html#n_api_n_api_version_matrix)
|
||||||
|
|
||||||
Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
## Licensing
|
||||||
|
|
||||||
|
Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Lovell Fuller and contributors.
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
|||||||
17
appveyor.yml
@@ -1,17 +1,18 @@
|
|||||||
os: Visual Studio 2015
|
os: Visual Studio 2019
|
||||||
version: "{build}"
|
version: "{build}"
|
||||||
build: off
|
build: off
|
||||||
platform: x64
|
platform: x86
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
- nodejs_version: "6"
|
|
||||||
- nodejs_version: "8"
|
|
||||||
- nodejs_version: "10"
|
- nodejs_version: "10"
|
||||||
- nodejs_version: "11"
|
prebuild: true
|
||||||
- nodejs_version: "12"
|
- nodejs_version: "12"
|
||||||
|
- nodejs_version: "14"
|
||||||
|
- nodejs_version: "16"
|
||||||
install:
|
install:
|
||||||
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version) x64
|
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
|
||||||
- npm install -g npm@6
|
- npm install --build-from-source
|
||||||
- npm install
|
|
||||||
test_script:
|
test_script:
|
||||||
- npm test
|
- npm test
|
||||||
|
on_success:
|
||||||
|
- if [%prebuild%] == [true] if [%APPVEYOR_REPO_TAG%] == [true] npx prebuild --runtime napi --target 3
|
||||||
|
|||||||
204
binding.gyp
@@ -1,4 +1,8 @@
|
|||||||
{
|
{
|
||||||
|
'variables': {
|
||||||
|
'vips_version': '<!(node -p "require(\'./lib/libvips\').minimumLibvipsVersion")',
|
||||||
|
'sharp_vendor_dir': '<(module_root_dir)/vendor/<(vips_version)'
|
||||||
|
},
|
||||||
'targets': [{
|
'targets': [{
|
||||||
'target_name': 'libvips-cpp',
|
'target_name': 'libvips-cpp',
|
||||||
'conditions': [
|
'conditions': [
|
||||||
@@ -11,24 +15,43 @@
|
|||||||
],
|
],
|
||||||
'sources': [
|
'sources': [
|
||||||
'src/libvips/cplusplus/VError.cpp',
|
'src/libvips/cplusplus/VError.cpp',
|
||||||
|
'src/libvips/cplusplus/VConnection.cpp',
|
||||||
'src/libvips/cplusplus/VInterpolate.cpp',
|
'src/libvips/cplusplus/VInterpolate.cpp',
|
||||||
'src/libvips/cplusplus/VImage.cpp'
|
'src/libvips/cplusplus/VImage.cpp'
|
||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'vendor/include',
|
'<(sharp_vendor_dir)/include',
|
||||||
'vendor/include/glib-2.0',
|
'<(sharp_vendor_dir)/include/glib-2.0',
|
||||||
'vendor/lib/glib-2.0/include'
|
'<(sharp_vendor_dir)/lib/glib-2.0/include'
|
||||||
],
|
|
||||||
'libraries': [
|
|
||||||
'../vendor/lib/libvips.lib',
|
|
||||||
'../vendor/lib/libglib-2.0.lib',
|
|
||||||
'../vendor/lib/libgobject-2.0.lib'
|
|
||||||
],
|
],
|
||||||
|
'link_settings': {
|
||||||
|
'library_dirs': ['<(sharp_vendor_dir)/lib'],
|
||||||
|
'libraries': [
|
||||||
|
'libvips.lib',
|
||||||
|
'libglib-2.0.lib',
|
||||||
|
'libgobject-2.0.lib'
|
||||||
|
],
|
||||||
|
},
|
||||||
'configurations': {
|
'configurations': {
|
||||||
'Release': {
|
'Release': {
|
||||||
'msvs_settings': {
|
'msvs_settings': {
|
||||||
'VCCLCompilerTool': {
|
'VCCLCompilerTool': {
|
||||||
'ExceptionHandling': 1
|
'ExceptionHandling': 1,
|
||||||
|
'WholeProgramOptimization': 'true'
|
||||||
|
},
|
||||||
|
'VCLibrarianTool': {
|
||||||
|
'AdditionalOptions': [
|
||||||
|
'/LTCG:INCREMENTAL'
|
||||||
|
]
|
||||||
|
},
|
||||||
|
'VCLinkerTool': {
|
||||||
|
'ImageHasSafeExceptionHandlers': 'false',
|
||||||
|
'OptimizeReferences': 2,
|
||||||
|
'EnableCOMDATFolding': 2,
|
||||||
|
'LinkIncremental': 1,
|
||||||
|
'AdditionalOptions': [
|
||||||
|
'/LTCG:INCREMENTAL'
|
||||||
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
'msvs_disabled_warnings': [
|
'msvs_disabled_warnings': [
|
||||||
@@ -43,15 +66,19 @@
|
|||||||
]
|
]
|
||||||
}, {
|
}, {
|
||||||
'target_name': 'sharp',
|
'target_name': 'sharp',
|
||||||
|
'defines': [
|
||||||
|
'NAPI_VERSION=3'
|
||||||
|
],
|
||||||
'dependencies': [
|
'dependencies': [
|
||||||
|
'<!(node -p "require(\'node-addon-api\').gyp")',
|
||||||
'libvips-cpp'
|
'libvips-cpp'
|
||||||
],
|
],
|
||||||
'variables': {
|
'variables': {
|
||||||
'runtime_link%': 'shared',
|
'runtime_link%': 'shared',
|
||||||
'conditions': [
|
'conditions': [
|
||||||
['OS != "win"', {
|
['OS != "win"', {
|
||||||
'pkg_config_path': '<!(node -e "console.log(require(\'./lib/libvips\').pkgConfigPath())")',
|
'pkg_config_path': '<!(node -p "require(\'./lib/libvips\').pkgConfigPath()")',
|
||||||
'use_global_libvips': '<!(node -e "console.log(Boolean(require(\'./lib/libvips\').useGlobalLibvips()).toString())")'
|
'use_global_libvips': '<!(node -p "Boolean(require(\'./lib/libvips\').useGlobalLibvips()).toString()")'
|
||||||
}, {
|
}, {
|
||||||
'pkg_config_path': '',
|
'pkg_config_path': '',
|
||||||
'use_global_libvips': ''
|
'use_global_libvips': ''
|
||||||
@@ -64,11 +91,11 @@
|
|||||||
'src/stats.cc',
|
'src/stats.cc',
|
||||||
'src/operations.cc',
|
'src/operations.cc',
|
||||||
'src/pipeline.cc',
|
'src/pipeline.cc',
|
||||||
'src/sharp.cc',
|
'src/utilities.cc',
|
||||||
'src/utilities.cc'
|
'src/sharp.cc'
|
||||||
],
|
],
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'<!(node -e "require(\'nan\')")'
|
'<!(node -p "require(\'node-addon-api\').include_dir")',
|
||||||
],
|
],
|
||||||
'conditions': [
|
'conditions': [
|
||||||
['use_global_libvips == "true"', {
|
['use_global_libvips == "true"', {
|
||||||
@@ -90,74 +117,53 @@
|
|||||||
}, {
|
}, {
|
||||||
# Use pre-built libvips stored locally within node_modules
|
# Use pre-built libvips stored locally within node_modules
|
||||||
'include_dirs': [
|
'include_dirs': [
|
||||||
'vendor/include',
|
'<(sharp_vendor_dir)/include',
|
||||||
'vendor/include/glib-2.0',
|
'<(sharp_vendor_dir)/include/glib-2.0',
|
||||||
'vendor/lib/glib-2.0/include'
|
'<(sharp_vendor_dir)/lib/glib-2.0/include'
|
||||||
],
|
],
|
||||||
'conditions': [
|
'conditions': [
|
||||||
['OS == "win"', {
|
['OS == "win"', {
|
||||||
'defines': [
|
'defines': [
|
||||||
'_ALLOW_KEYWORD_MACROS'
|
'_ALLOW_KEYWORD_MACROS',
|
||||||
|
'_FILE_OFFSET_BITS=64'
|
||||||
],
|
],
|
||||||
'libraries': [
|
'link_settings': {
|
||||||
'../vendor/lib/libvips.lib',
|
'library_dirs': ['<(sharp_vendor_dir)/lib'],
|
||||||
'../vendor/lib/libglib-2.0.lib',
|
'libraries': [
|
||||||
'../vendor/lib/libgobject-2.0.lib'
|
'libvips.lib',
|
||||||
]
|
'libglib-2.0.lib',
|
||||||
|
'libgobject-2.0.lib'
|
||||||
|
]
|
||||||
|
}
|
||||||
}],
|
}],
|
||||||
['OS == "mac"', {
|
['OS == "mac"', {
|
||||||
'libraries': [
|
'link_settings': {
|
||||||
'../vendor/lib/libvips-cpp.42.dylib',
|
'library_dirs': ['<(sharp_vendor_dir)/lib'],
|
||||||
'../vendor/lib/libvips.42.dylib',
|
'libraries': [
|
||||||
'../vendor/lib/libglib-2.0.0.dylib',
|
'libvips-cpp.42.dylib'
|
||||||
'../vendor/lib/libgobject-2.0.0.dylib',
|
]
|
||||||
# Ensure runtime linking is relative to sharp.node
|
},
|
||||||
'-rpath \'@loader_path/../../vendor/lib\''
|
'xcode_settings': {
|
||||||
]
|
'OTHER_LDFLAGS': [
|
||||||
|
# Ensure runtime linking is relative to sharp.node
|
||||||
|
'-Wl,-rpath,\'@loader_path/../../vendor/<(vips_version)/lib\''
|
||||||
|
]
|
||||||
|
}
|
||||||
}],
|
}],
|
||||||
['OS == "linux"', {
|
['OS == "linux"', {
|
||||||
'defines': [
|
'defines': [
|
||||||
'_GLIBCXX_USE_CXX11_ABI=0'
|
'_GLIBCXX_USE_CXX11_ABI=1'
|
||||||
],
|
],
|
||||||
'libraries': [
|
'link_settings': {
|
||||||
'../vendor/lib/libvips-cpp.so',
|
'library_dirs': ['<(sharp_vendor_dir)/lib'],
|
||||||
'../vendor/lib/libvips.so',
|
'libraries': [
|
||||||
'../vendor/lib/libglib-2.0.so',
|
'-l:libvips-cpp.so.42'
|
||||||
'../vendor/lib/libgobject-2.0.so',
|
],
|
||||||
# Dependencies of dependencies, included for openSUSE support
|
'ldflags': [
|
||||||
'../vendor/lib/libcairo.so',
|
# Ensure runtime linking is relative to sharp.node
|
||||||
'../vendor/lib/libcroco-0.6.so',
|
'-Wl,-s -Wl,--disable-new-dtags -Wl,-rpath=\'$$ORIGIN/../../vendor/<(vips_version)/lib\''
|
||||||
'../vendor/lib/libexif.so',
|
]
|
||||||
'../vendor/lib/libexpat.so',
|
}
|
||||||
'../vendor/lib/libffi.so',
|
|
||||||
'../vendor/lib/libfontconfig.so',
|
|
||||||
'../vendor/lib/libfreetype.so',
|
|
||||||
'../vendor/lib/libfribidi.so',
|
|
||||||
'../vendor/lib/libgdk_pixbuf-2.0.so',
|
|
||||||
'../vendor/lib/libgif.so',
|
|
||||||
'../vendor/lib/libgio-2.0.so',
|
|
||||||
'../vendor/lib/libgmodule-2.0.so',
|
|
||||||
'../vendor/lib/libgsf-1.so',
|
|
||||||
'../vendor/lib/libgthread-2.0.so',
|
|
||||||
'../vendor/lib/libharfbuzz.so',
|
|
||||||
'../vendor/lib/libjpeg.so',
|
|
||||||
'../vendor/lib/liblcms2.so',
|
|
||||||
'../vendor/lib/liborc-0.4.so',
|
|
||||||
'../vendor/lib/libpango-1.0.so',
|
|
||||||
'../vendor/lib/libpangocairo-1.0.so',
|
|
||||||
'../vendor/lib/libpangoft2-1.0.so',
|
|
||||||
'../vendor/lib/libpixman-1.so',
|
|
||||||
'../vendor/lib/libpng.so',
|
|
||||||
'../vendor/lib/librsvg-2.so',
|
|
||||||
'../vendor/lib/libtiff.so',
|
|
||||||
'../vendor/lib/libwebp.so',
|
|
||||||
'../vendor/lib/libwebpdemux.so',
|
|
||||||
'../vendor/lib/libwebpmux.so',
|
|
||||||
'../vendor/lib/libxml2.so',
|
|
||||||
'../vendor/lib/libz.so',
|
|
||||||
# Ensure runtime linking is relative to sharp.node
|
|
||||||
'-Wl,--disable-new-dtags -Wl,-rpath=\'$${ORIGIN}/../../vendor/lib\''
|
|
||||||
]
|
|
||||||
}]
|
}]
|
||||||
]
|
]
|
||||||
}]
|
}]
|
||||||
@@ -170,8 +176,7 @@
|
|||||||
],
|
],
|
||||||
'xcode_settings': {
|
'xcode_settings': {
|
||||||
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
|
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11',
|
||||||
'CLANG_CXX_LIBRARY': 'libc++',
|
'MACOSX_DEPLOYMENT_TARGET': '10.9',
|
||||||
'MACOSX_DEPLOYMENT_TARGET': '10.7',
|
|
||||||
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
|
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
|
||||||
'GCC_ENABLE_CPP_RTTI': 'YES',
|
'GCC_ENABLE_CPP_RTTI': 'YES',
|
||||||
'OTHER_CPLUSPLUSFLAGS': [
|
'OTHER_CPLUSPLUSFLAGS': [
|
||||||
@@ -182,23 +187,42 @@
|
|||||||
},
|
},
|
||||||
'configurations': {
|
'configurations': {
|
||||||
'Release': {
|
'Release': {
|
||||||
'cflags_cc': [
|
'conditions': [
|
||||||
'-Wno-cast-function-type',
|
['OS == "linux"', {
|
||||||
'-Wno-deprecated-declarations'
|
'cflags_cc': [
|
||||||
],
|
'-Wno-cast-function-type'
|
||||||
'xcode_settings': {
|
]
|
||||||
'OTHER_CPLUSPLUSFLAGS': [
|
}],
|
||||||
'-Wno-deprecated-declarations'
|
['target_arch == "arm"', {
|
||||||
]
|
'cflags_cc': [
|
||||||
},
|
'-Wno-psabi'
|
||||||
'msvs_settings': {
|
]
|
||||||
'VCCLCompilerTool': {
|
}],
|
||||||
'ExceptionHandling': 1
|
['OS == "win"', {
|
||||||
}
|
'msvs_settings': {
|
||||||
},
|
'VCCLCompilerTool': {
|
||||||
'msvs_disabled_warnings': [
|
'ExceptionHandling': 1,
|
||||||
4275,
|
'WholeProgramOptimization': 'true'
|
||||||
4996
|
},
|
||||||
|
'VCLibrarianTool': {
|
||||||
|
'AdditionalOptions': [
|
||||||
|
'/LTCG:INCREMENTAL'
|
||||||
|
]
|
||||||
|
},
|
||||||
|
'VCLinkerTool': {
|
||||||
|
'ImageHasSafeExceptionHandlers': 'false',
|
||||||
|
'OptimizeReferences': 2,
|
||||||
|
'EnableCOMDATFolding': 2,
|
||||||
|
'LinkIncremental': 1,
|
||||||
|
'AdditionalOptions': [
|
||||||
|
'/LTCG:INCREMENTAL'
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
'msvs_disabled_warnings': [
|
||||||
|
4275
|
||||||
|
]
|
||||||
|
}]
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
84
docs/README.md
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
# sharp
|
||||||
|
|
||||||
|
<img src="https://cdn.jsdelivr.net/gh/lovell/sharp@master/docs/image/sharp-logo.svg" width="160" height="160" alt="sharp logo" align="right">
|
||||||
|
|
||||||
|
The typical use case for this high speed Node.js module
|
||||||
|
is to convert large images in common formats to
|
||||||
|
smaller, web-friendly JPEG, PNG, AVIF and WebP images of varying dimensions.
|
||||||
|
|
||||||
|
Resizing an image is typically 4x-5x faster than using the
|
||||||
|
quickest ImageMagick and GraphicsMagick settings
|
||||||
|
due to its use of [libvips](https://github.com/libvips/libvips).
|
||||||
|
|
||||||
|
Colour spaces, embedded ICC profiles and alpha transparency channels are all handled correctly.
|
||||||
|
Lanczos resampling ensures quality is not sacrificed for speed.
|
||||||
|
|
||||||
|
As well as image resizing, operations such as
|
||||||
|
rotation, extraction, compositing and gamma correction are available.
|
||||||
|
|
||||||
|
Most modern macOS, Windows and Linux systems running Node.js v10+
|
||||||
|
do not require any additional install or runtime dependencies.
|
||||||
|
|
||||||
|
### Formats
|
||||||
|
|
||||||
|
This module supports reading JPEG, PNG, WebP, AVIF, TIFF, GIF and SVG images.
|
||||||
|
|
||||||
|
Output images can be in JPEG, PNG, WebP, AVIF and TIFF formats as well as uncompressed raw pixel data.
|
||||||
|
|
||||||
|
Streams, Buffer objects and the filesystem can be used for input and output.
|
||||||
|
|
||||||
|
A single input Stream can be split into multiple processing pipelines and output Streams.
|
||||||
|
|
||||||
|
Deep Zoom image pyramids can be generated,
|
||||||
|
suitable for use with "slippy map" tile viewers like
|
||||||
|
[OpenSeadragon](https://github.com/openseadragon/openseadragon).
|
||||||
|
|
||||||
|
### Fast
|
||||||
|
|
||||||
|
This module is powered by the blazingly fast
|
||||||
|
[libvips](https://github.com/libvips/libvips) image processing library,
|
||||||
|
originally created in 1989 at Birkbeck College
|
||||||
|
and currently maintained by a small team led by
|
||||||
|
[John Cupitt](https://github.com/jcupitt).
|
||||||
|
|
||||||
|
Only small regions of uncompressed image data
|
||||||
|
are held in memory and processed at a time,
|
||||||
|
taking full advantage of multiple CPU cores and L1/L2/L3 cache.
|
||||||
|
|
||||||
|
Everything remains non-blocking thanks to _libuv_,
|
||||||
|
no child processes are spawned and Promises/async/await are supported.
|
||||||
|
|
||||||
|
### Optimal
|
||||||
|
|
||||||
|
The features of `mozjpeg` and `pngquant` can be used
|
||||||
|
to optimise the file size of JPEG and PNG images respectively,
|
||||||
|
without having to invoke separate `imagemin` processes.
|
||||||
|
|
||||||
|
Huffman tables are optimised when generating JPEG output images
|
||||||
|
without having to use separate command line tools like
|
||||||
|
[jpegoptim](https://github.com/tjko/jpegoptim) and
|
||||||
|
[jpegtran](http://jpegclub.org/jpegtran/).
|
||||||
|
|
||||||
|
PNG filtering is disabled by default,
|
||||||
|
which for diagrams and line art often produces the same result
|
||||||
|
as [pngcrush](https://pmt.sourceforge.io/pngcrush/).
|
||||||
|
|
||||||
|
### Contributing
|
||||||
|
|
||||||
|
A [guide for contributors](https://github.com/lovell/sharp/blob/master/.github/CONTRIBUTING.md)
|
||||||
|
covers reporting bugs, requesting features and submitting code changes.
|
||||||
|
|
||||||
|
### Licensing
|
||||||
|
|
||||||
|
Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Lovell Fuller and contributors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
@@ -4,6 +4,8 @@
|
|||||||
|
|
||||||
Remove alpha channel, if any. This is a no-op if the image does not have an alpha channel.
|
Remove alpha channel, if any. This is a no-op if the image does not have an alpha channel.
|
||||||
|
|
||||||
|
See also [flatten][1].
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
@@ -18,40 +20,60 @@ Returns **Sharp**
|
|||||||
|
|
||||||
## ensureAlpha
|
## ensureAlpha
|
||||||
|
|
||||||
Ensure alpha channel, if missing. The added alpha channel will be fully opaque. This is a no-op if the image already has an alpha channel.
|
Ensure the output image has an alpha transparency channel.
|
||||||
|
If missing, the added alpha channel will have the specified
|
||||||
|
transparency level, defaulting to fully-opaque (1).
|
||||||
|
This is a no-op if the image already has an alpha channel.
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `alpha` **[number][2]** alpha transparency level (0=fully-transparent, 1=fully-opaque) (optional, default `1`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
sharp('rgb.jpg')
|
// rgba.png will be a 4 channel image with a fully-opaque alpha channel
|
||||||
|
await sharp('rgb.jpg')
|
||||||
.ensureAlpha()
|
.ensureAlpha()
|
||||||
.toFile('rgba.png', function(err, info) {
|
.toFile('rgba.png')
|
||||||
// rgba.png is a 4 channel image with a fully opaque alpha channel
|
|
||||||
});
|
|
||||||
```
|
```
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// rgba is a 4 channel image with a fully-transparent alpha channel
|
||||||
|
const rgba = await sharp(rgb)
|
||||||
|
.ensureAlpha(0)
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][3]** Invalid alpha transparency level
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.21.2
|
||||||
|
|
||||||
## extractChannel
|
## extractChannel
|
||||||
|
|
||||||
Extract a single channel from a multi-channel image.
|
Extract a single channel from a multi-channel image.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `channel` **([Number][1] \| [String][2])** zero-indexed band number to extract, or `red`, `green` or `blue` as alternative to `0`, `1` or `2` respectively.
|
* `channel` **([number][2] | [string][4])** zero-indexed channel/band number to extract, or `red`, `green`, `blue` or `alpha`.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
sharp(input)
|
sharp(input)
|
||||||
.extractChannel('green')
|
.extractChannel('green')
|
||||||
.toFile('input_green.jpg', function(err, info) {
|
.toColourspace('b-w')
|
||||||
|
.toFile('green.jpg', function(err, info) {
|
||||||
// info.channels === 1
|
// info.channels === 1
|
||||||
// input_green.jpg contains the green channel of the input image
|
// green.jpg is a greyscale image containing the green channel of the input
|
||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid channel
|
* Throws **[Error][3]** Invalid channel
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -62,19 +84,20 @@ The meaning of the added channels depends on the output colourspace, set with `t
|
|||||||
By default the output image will be web-friendly sRGB, with additional channels interpreted as alpha channels.
|
By default the output image will be web-friendly sRGB, with additional channels interpreted as alpha channels.
|
||||||
Channel ordering follows vips convention:
|
Channel ordering follows vips convention:
|
||||||
|
|
||||||
- sRGB: 0: Red, 1: Green, 2: Blue, 3: Alpha.
|
* sRGB: 0: Red, 1: Green, 2: Blue, 3: Alpha.
|
||||||
- CMYK: 0: Magenta, 1: Cyan, 2: Yellow, 3: Black, 4: Alpha.
|
* CMYK: 0: Magenta, 1: Cyan, 2: Yellow, 3: Black, 4: Alpha.
|
||||||
|
|
||||||
Buffers may be any of the image formats supported by sharp: JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data.
|
Buffers may be any of the image formats supported by sharp.
|
||||||
For raw pixel input, the `options` object should contain a `raw` attribute, which follows the format of the attribute of the same name in the `sharp()` constructor.
|
For raw pixel input, the `options` object should contain a `raw` attribute, which follows the format of the attribute of the same name in the `sharp()` constructor.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `images` **([Array][4]<([String][2] \| [Buffer][5])> | [String][2] \| [Buffer][5])** one or more images (file paths, Buffers).
|
* `images` **([Array][5]<([string][4] | [Buffer][6])> | [string][4] | [Buffer][6])** one or more images (file paths, Buffers).
|
||||||
- `options` **[Object][6]** image options, see `sharp()` constructor.
|
* `options` **[Object][7]** image options, see `sharp()` constructor.
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid parameters
|
* Throws **[Error][3]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -84,7 +107,7 @@ Perform a bitwise boolean operation on all input image channels (bands) to produ
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `boolOp` **[String][2]** one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
* `boolOp` **[string][4]** one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -98,18 +121,20 @@ sharp('3-channel-rgb-input.png')
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid parameters
|
* Throws **[Error][3]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
[1]: /api-operation#flatten
|
||||||
|
|
||||||
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
||||||
|
|
||||||
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
||||||
|
|
||||||
[4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array
|
[4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
||||||
|
|
||||||
[5]: https://nodejs.org/api/buffer.html
|
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array
|
||||||
|
|
||||||
[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
[6]: https://nodejs.org/api/buffer.html
|
||||||
|
|
||||||
|
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
||||||
|
|||||||
@@ -7,10 +7,11 @@ An alpha channel may be present and will be unchanged by the operation.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `rgb` **([String][1] \| [Object][2])** parsed by the [color][3] module to extract chroma values.
|
* `rgb` **([string][1] | [Object][2])** parsed by the [color][3] module to extract chroma values.
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][4]** Invalid parameter
|
* Throws **[Error][4]** Invalid parameter
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -25,7 +26,7 @@ An alpha channel may be present, and will be unchanged by the operation.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `greyscale` **[Boolean][5]** (optional, default `true`)
|
* `greyscale` **[Boolean][5]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -35,7 +36,7 @@ Alternative spelling of `greyscale`.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `grayscale` **[Boolean][5]** (optional, default `true`)
|
* `grayscale` **[Boolean][5]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -46,10 +47,18 @@ By default output image will be web-friendly sRGB, with additional channels inte
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `colourspace` **[String][1]?** output colourspace e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...][6]
|
* `colourspace` **[string][1]?** output colourspace e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...][6]
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
- Throws **[Error][4]** Invalid parameters
|
```javascript
|
||||||
|
// Output 16 bits per pixel RGB
|
||||||
|
await sharp(input)
|
||||||
|
.toColourspace('rgb16')
|
||||||
|
.toFile('16-bpp.png')
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -59,10 +68,11 @@ Alternative spelling of `toColourspace`.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `colorspace` **[String][1]?** output colorspace.
|
* `colorspace` **[string][1]?** output colorspace.
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][4]** Invalid parameters
|
* Throws **[Error][4]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
|||||||
@@ -19,23 +19,30 @@ and [https://www.cairographics.org/operators/][2]
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `images` **[Array][3]<[Object][4]>** Ordered list of images to composite
|
* `images` **[Array][3]<[Object][4]>** Ordered list of images to composite
|
||||||
- `images[].input` **([Buffer][5] \| [String][6])?** Buffer containing image data, String containing the path to an image file, or Create object (see bellow)
|
|
||||||
- `images[].input.create` **[Object][4]?** describes a blank overlay to be created.
|
* `images[].input` **([Buffer][5] | [String][6])?** Buffer containing image data, String containing the path to an image file, or Create object (see below)
|
||||||
- `images[].input.create.width` **[Number][7]?**
|
|
||||||
- `images[].input.create.height` **[Number][7]?**
|
* `images[].input.create` **[Object][4]?** describes a blank overlay to be created.
|
||||||
- `images[].input.create.channels` **[Number][7]?** 3-4
|
|
||||||
- `images[].input.create.background` **([String][6] \| [Object][4])?** parsed by the [color][8] module to extract values for red, green, blue and alpha.
|
* `images[].input.create.width` **[Number][7]?**
|
||||||
- `images[].blend` **[String][6]** how to blend this image with the image below. (optional, default `'over'`)
|
* `images[].input.create.height` **[Number][7]?**
|
||||||
- `images[].gravity` **[String][6]** gravity at which to place the overlay. (optional, default `'centre'`)
|
* `images[].input.create.channels` **[Number][7]?** 3-4
|
||||||
- `images[].top` **[Number][7]?** the pixel offset from the top edge.
|
* `images[].input.create.background` **([String][6] | [Object][4])?** parsed by the [color][8] module to extract values for red, green, blue and alpha.
|
||||||
- `images[].left` **[Number][7]?** the pixel offset from the left edge.
|
* `images[].blend` **[String][6]** how to blend this image with the image below. (optional, default `'over'`)
|
||||||
- `images[].tile` **[Boolean][9]** set to true to repeat the overlay image across the entire image with the given `gravity`. (optional, default `false`)
|
* `images[].gravity` **[String][6]** gravity at which to place the overlay. (optional, default `'centre'`)
|
||||||
- `images[].density` **[Number][7]** number representing the DPI for vector overlay image. (optional, default `72`)
|
* `images[].top` **[Number][7]?** the pixel offset from the top edge.
|
||||||
- `images[].raw` **[Object][4]?** describes overlay when using raw pixel data.
|
* `images[].left` **[Number][7]?** the pixel offset from the left edge.
|
||||||
- `images[].raw.width` **[Number][7]?**
|
* `images[].tile` **[Boolean][9]** set to true to repeat the overlay image across the entire image with the given `gravity`. (optional, default `false`)
|
||||||
- `images[].raw.height` **[Number][7]?**
|
* `images[].premultiplied` **[Boolean][9]** set to true to avoid premultipling the image below. Equivalent to the `--premultiplied` vips option. (optional, default `false`)
|
||||||
- `images[].raw.channels` **[Number][7]?**
|
* `images[].density` **[Number][7]** number representing the DPI for vector overlay image. (optional, default `72`)
|
||||||
|
* `images[].raw` **[Object][4]?** describes overlay when using raw pixel data.
|
||||||
|
|
||||||
|
* `images[].raw.width` **[Number][7]?**
|
||||||
|
* `images[].raw.height` **[Number][7]?**
|
||||||
|
* `images[].raw.channels` **[Number][7]?**
|
||||||
|
* `images[].failOnError` **[boolean][9]** @see [constructor parameters][10] (optional, default `true`)
|
||||||
|
* `images[].limitInputPixels` **([number][7] | [boolean][9])** @see [constructor parameters][10] (optional, default `268402689`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -56,10 +63,14 @@ sharp('input.png')
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][10]** Invalid parameters
|
* Throws **[Error][11]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.22.0
|
||||||
|
|
||||||
[1]: https://libvips.github.io/libvips/API/current/libvips-conversion.html#VipsBlendMode
|
[1]: https://libvips.github.io/libvips/API/current/libvips-conversion.html#VipsBlendMode
|
||||||
|
|
||||||
[2]: https://www.cairographics.org/operators/
|
[2]: https://www.cairographics.org/operators/
|
||||||
@@ -78,4 +89,6 @@ Returns **Sharp**
|
|||||||
|
|
||||||
[9]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
[9]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
||||||
|
|
||||||
[10]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
[10]: /api-constructor#parameters
|
||||||
|
|
||||||
|
[11]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
||||||
|
|||||||
@@ -2,27 +2,54 @@
|
|||||||
|
|
||||||
## Sharp
|
## Sharp
|
||||||
|
|
||||||
|
Constructor factory to create an instance of `sharp`, to which further methods are chained.
|
||||||
|
|
||||||
|
JPEG, PNG, WebP, AVIF or TIFF format image data can be streamed out from this object.
|
||||||
|
When using Stream based output, derived attributes are available from the `info` event.
|
||||||
|
|
||||||
|
Non-critical problems encountered during processing are emitted as `warning` events.
|
||||||
|
|
||||||
|
Implements the [stream.Duplex][1] class.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `input` **([Buffer][1] \| [String][2])?** if present, can be
|
* `input` **([Buffer][2] | [Uint8Array][3] | [Uint8ClampedArray][4] | [string][5])?** if present, can be
|
||||||
a Buffer containing JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data, or
|
a Buffer / Uint8Array / Uint8ClampedArray containing JPEG, PNG, WebP, AVIF, GIF, SVG, TIFF or raw pixel image data, or
|
||||||
a String containing the path to an JPEG, PNG, WebP, GIF, SVG or TIFF image file.
|
a String containing the filesystem path to an JPEG, PNG, WebP, AVIF, GIF, SVG or TIFF image file.
|
||||||
JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data can be streamed into the object when not present.
|
JPEG, PNG, WebP, AVIF, GIF, SVG, TIFF or raw pixel image data can be streamed into the object when not present.
|
||||||
- `options` **[Object][3]?** if present, is an Object with optional attributes.
|
* `options` **[Object][6]?** if present, is an Object with optional attributes.
|
||||||
- `options.failOnError` **[Boolean][4]** by default halt processing and raise an error when loading invalid images.
|
|
||||||
Set this flag to `false` if you'd rather apply a "best effort" to decode images, even if the data is corrupt or invalid. (optional, default `true`)
|
* `options.failOnError` **[boolean][7]** by default halt processing and raise an error when loading invalid images.
|
||||||
- `options.density` **[Number][5]** number representing the DPI for vector images. (optional, default `72`)
|
Set this flag to `false` if you'd rather apply a "best effort" to decode images, even if the data is corrupt or invalid. (optional, default `true`)
|
||||||
- `options.pages` **[Number][5]** number of pages to extract for multi-page input (GIF, TIFF, PDF), use -1 for all pages. (optional, default `1`)
|
* `options.limitInputPixels` **([number][8] | [boolean][7])** Do not process input images where the number of pixels
|
||||||
- `options.page` **[Number][5]** page number to start extracting from for multi-page input (GIF, TIFF, PDF), zero based. (optional, default `0`)
|
(width x height) exceeds this limit. Assumes image dimensions contained in the input metadata can be trusted.
|
||||||
- `options.raw` **[Object][3]?** describes raw pixel input image data. See `raw()` for pixel ordering.
|
An integral Number of pixels, zero or false to remove limit, true to use default limit of 268402689 (0x3FFF x 0x3FFF). (optional, default `268402689`)
|
||||||
- `options.raw.width` **[Number][5]?**
|
* `options.sequentialRead` **[boolean][7]** Set this to `true` to use sequential rather than random access where possible.
|
||||||
- `options.raw.height` **[Number][5]?**
|
This can reduce memory usage and might improve performance on some systems. (optional, default `false`)
|
||||||
- `options.raw.channels` **[Number][5]?** 1-4
|
* `options.density` **[number][8]** number representing the DPI for vector images in the range 1 to 100000. (optional, default `72`)
|
||||||
- `options.create` **[Object][3]?** describes a new image to be created.
|
* `options.pages` **[number][8]** number of pages to extract for multi-page input (GIF, WebP, AVIF, TIFF, PDF), use -1 for all pages. (optional, default `1`)
|
||||||
- `options.create.width` **[Number][5]?**
|
* `options.page` **[number][8]** page number to start extracting from for multi-page input (GIF, WebP, AVIF, TIFF, PDF), zero based. (optional, default `0`)
|
||||||
- `options.create.height` **[Number][5]?**
|
* `options.subifd` **[number][8]** subIFD (Sub Image File Directory) to extract for OME-TIFF, defaults to main image. (optional, default `-1`)
|
||||||
- `options.create.channels` **[Number][5]?** 3-4
|
* `options.level` **[number][8]** level to extract from a multi-level input (OpenSlide), zero based. (optional, default `0`)
|
||||||
- `options.create.background` **([String][2] \| [Object][3])?** parsed by the [color][6] module to extract values for red, green, blue and alpha.
|
* `options.animated` **[boolean][7]** Set to `true` to read all frames/pages of an animated image (equivalent of setting `pages` to `-1`). (optional, default `false`)
|
||||||
|
* `options.raw` **[Object][6]?** describes raw pixel input image data. See `raw()` for pixel ordering.
|
||||||
|
|
||||||
|
* `options.raw.width` **[number][8]?** integral number of pixels wide.
|
||||||
|
* `options.raw.height` **[number][8]?** integral number of pixels high.
|
||||||
|
* `options.raw.channels` **[number][8]?** integral number of channels, between 1 and 4.
|
||||||
|
* `options.raw.premultiplied` **[boolean][7]?** specifies that the raw input has already been premultiplied, set to `true`
|
||||||
|
to avoid sharp premultiplying the image. (optional, default `false`)
|
||||||
|
* `options.create` **[Object][6]?** describes a new image to be created.
|
||||||
|
|
||||||
|
* `options.create.width` **[number][8]?** integral number of pixels wide.
|
||||||
|
* `options.create.height` **[number][8]?** integral number of pixels high.
|
||||||
|
* `options.create.channels` **[number][8]?** integral number of channels, either 3 (RGB) or 4 (RGBA).
|
||||||
|
* `options.create.background` **([string][5] | [Object][6])?** parsed by the [color][9] module to extract values for red, green, blue and alpha.
|
||||||
|
* `options.create.noise` **[Object][6]?** describes a noise to be created.
|
||||||
|
|
||||||
|
* `options.create.noise.type` **[string][5]?** type of generated noise, currently only `gaussian` is supported.
|
||||||
|
* `options.create.noise.mean` **[number][8]?** mean of pixels in generated noise.
|
||||||
|
* `options.create.noise.sigma` **[number][8]?** standard deviation of pixels in generated noise.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -63,59 +90,132 @@ sharp({
|
|||||||
.then( ... );
|
.then( ... );
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][7]** Invalid parameters
|
|
||||||
|
|
||||||
Returns **[Sharp][8]**
|
|
||||||
|
|
||||||
### format
|
|
||||||
|
|
||||||
An Object containing nested boolean values representing the available input and output formats/methods.
|
|
||||||
|
|
||||||
#### Examples
|
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
console.log(sharp.format);
|
// Convert an animated GIF to an animated WebP
|
||||||
|
await sharp('in.gif', { animated: true }).toFile('out.webp');
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **[Object][3]**
|
|
||||||
|
|
||||||
### versions
|
|
||||||
|
|
||||||
An Object containing the version numbers of libvips and its dependencies.
|
|
||||||
|
|
||||||
#### Examples
|
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
console.log(sharp.versions);
|
// Read a raw array of pixels and save it to a png
|
||||||
|
const input = Uint8Array.from([255, 255, 255, 0, 0, 0]); // or Uint8ClampedArray
|
||||||
|
const image = sharp(input, {
|
||||||
|
// because the input does not contain its dimensions or how many channels it has
|
||||||
|
// we need to specify it in the constructor options
|
||||||
|
raw: {
|
||||||
|
width: 2,
|
||||||
|
height: 1,
|
||||||
|
channels: 3
|
||||||
|
}
|
||||||
|
});
|
||||||
|
await image.toFile('my-two-pixels.png');
|
||||||
```
|
```
|
||||||
|
|
||||||
## queue
|
```javascript
|
||||||
|
// Generate RGB Gaussian noise
|
||||||
|
await sharp({
|
||||||
|
create: {
|
||||||
|
width: 300,
|
||||||
|
height: 200,
|
||||||
|
channels: 3,
|
||||||
|
noise: {
|
||||||
|
type: 'gaussian',
|
||||||
|
mean: 128,
|
||||||
|
sigma: 30
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).toFile('noise.png');
|
||||||
|
```
|
||||||
|
|
||||||
An EventEmitter that emits a `change` event when a task is either:
|
* Throws **[Error][10]** Invalid parameters
|
||||||
|
|
||||||
- queued, waiting for _libuv_ to provide a worker thread
|
Returns **[Sharp][11]**
|
||||||
- complete
|
|
||||||
|
## clone
|
||||||
|
|
||||||
|
Take a "snapshot" of the Sharp instance, returning a new instance.
|
||||||
|
Cloned instances inherit the input of their parent instance.
|
||||||
|
This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
sharp.queue.on('change', function(queueLength) {
|
const pipeline = sharp().rotate();
|
||||||
console.log('Queue contains ' + queueLength + ' task(s)');
|
pipeline.clone().resize(800, 600).pipe(firstWritableStream);
|
||||||
});
|
pipeline.clone().extract({ left: 20, top: 20, width: 100, height: 100 }).pipe(secondWritableStream);
|
||||||
|
readableStream.pipe(pipeline);
|
||||||
|
// firstWritableStream receives auto-rotated, resized readableStream
|
||||||
|
// secondWritableStream receives auto-rotated, extracted region of readableStream
|
||||||
```
|
```
|
||||||
|
|
||||||
[1]: https://nodejs.org/api/buffer.html
|
```javascript
|
||||||
|
// Create a pipeline that will download an image, resize it and format it to different files
|
||||||
|
// Using Promises to know when the pipeline is complete
|
||||||
|
const fs = require("fs");
|
||||||
|
const got = require("got");
|
||||||
|
const sharpStream = sharp({
|
||||||
|
failOnError: false
|
||||||
|
});
|
||||||
|
|
||||||
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
const promises = [];
|
||||||
|
|
||||||
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
promises.push(
|
||||||
|
sharpStream
|
||||||
|
.clone()
|
||||||
|
.jpeg({ quality: 100 })
|
||||||
|
.toFile("originalFile.jpg")
|
||||||
|
);
|
||||||
|
|
||||||
[4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
promises.push(
|
||||||
|
sharpStream
|
||||||
|
.clone()
|
||||||
|
.resize({ width: 500 })
|
||||||
|
.jpeg({ quality: 80 })
|
||||||
|
.toFile("optimized-500.jpg")
|
||||||
|
);
|
||||||
|
|
||||||
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
promises.push(
|
||||||
|
sharpStream
|
||||||
|
.clone()
|
||||||
|
.resize({ width: 500 })
|
||||||
|
.webp({ quality: 80 })
|
||||||
|
.toFile("optimized-500.webp")
|
||||||
|
);
|
||||||
|
|
||||||
[6]: https://www.npmjs.org/package/color
|
// https://github.com/sindresorhus/got#gotstreamurl-options
|
||||||
|
got.stream("https://www.example.com/some-file.jpg").pipe(sharpStream);
|
||||||
|
|
||||||
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
Promise.all(promises)
|
||||||
|
.then(res => { console.log("Done!", res); })
|
||||||
|
.catch(err => {
|
||||||
|
console.error("Error processing files, let's clean it up", err);
|
||||||
|
try {
|
||||||
|
fs.unlinkSync("originalFile.jpg");
|
||||||
|
fs.unlinkSync("optimized-500.jpg");
|
||||||
|
fs.unlinkSync("optimized-500.webp");
|
||||||
|
} catch (e) {}
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
[8]: #sharp
|
Returns **[Sharp][11]**
|
||||||
|
|
||||||
|
[1]: http://nodejs.org/api/stream.html#stream_class_stream_duplex
|
||||||
|
|
||||||
|
[2]: https://nodejs.org/api/buffer.html
|
||||||
|
|
||||||
|
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array
|
||||||
|
|
||||||
|
[4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint8ClampedArray
|
||||||
|
|
||||||
|
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
||||||
|
|
||||||
|
[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
||||||
|
|
||||||
|
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
||||||
|
|
||||||
|
[8]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
||||||
|
|
||||||
|
[9]: https://www.npmjs.org/package/color
|
||||||
|
|
||||||
|
[10]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
||||||
|
|
||||||
|
[11]: #sharp
|
||||||
|
|||||||
@@ -1,52 +1,39 @@
|
|||||||
<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
|
<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
|
||||||
|
|
||||||
## clone
|
|
||||||
|
|
||||||
Take a "snapshot" of the Sharp instance, returning a new instance.
|
|
||||||
Cloned instances inherit the input of their parent instance.
|
|
||||||
This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.
|
|
||||||
|
|
||||||
### Examples
|
|
||||||
|
|
||||||
```javascript
|
|
||||||
const pipeline = sharp().rotate();
|
|
||||||
pipeline.clone().resize(800, 600).pipe(firstWritableStream);
|
|
||||||
pipeline.clone().extract({ left: 20, top: 20, width: 100, height: 100 }).pipe(secondWritableStream);
|
|
||||||
readableStream.pipe(pipeline);
|
|
||||||
// firstWritableStream receives auto-rotated, resized readableStream
|
|
||||||
// secondWritableStream receives auto-rotated, extracted region of readableStream
|
|
||||||
```
|
|
||||||
|
|
||||||
Returns **Sharp**
|
|
||||||
|
|
||||||
## metadata
|
## metadata
|
||||||
|
|
||||||
Fast access to (uncached) image metadata without decoding any compressed image data.
|
Fast access to (uncached) image metadata without decoding any compressed image data.
|
||||||
A `Promise` is returned when `callback` is not provided.
|
A `Promise` is returned when `callback` is not provided.
|
||||||
|
|
||||||
- `format`: Name of decoder used to decompress image data e.g. `jpeg`, `png`, `webp`, `gif`, `svg`
|
* `format`: Name of decoder used to decompress image data e.g. `jpeg`, `png`, `webp`, `gif`, `svg`
|
||||||
- `size`: Total size of image in bytes, for Stream and Buffer input only
|
* `size`: Total size of image in bytes, for Stream and Buffer input only
|
||||||
- `width`: Number of pixels wide (EXIF orientation is not taken into consideration)
|
* `width`: Number of pixels wide (EXIF orientation is not taken into consideration)
|
||||||
- `height`: Number of pixels high (EXIF orientation is not taken into consideration)
|
* `height`: Number of pixels high (EXIF orientation is not taken into consideration)
|
||||||
- `space`: Name of colour space interpretation e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...][1]
|
* `space`: Name of colour space interpretation e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...][1]
|
||||||
- `channels`: Number of bands e.g. `3` for sRGB, `4` for CMYK
|
* `channels`: Number of bands e.g. `3` for sRGB, `4` for CMYK
|
||||||
- `depth`: Name of pixel depth format e.g. `uchar`, `char`, `ushort`, `float` [...][2]
|
* `depth`: Name of pixel depth format e.g. `uchar`, `char`, `ushort`, `float` [...][2]
|
||||||
- `density`: Number of pixels per inch (DPI), if present
|
* `density`: Number of pixels per inch (DPI), if present
|
||||||
- `chromaSubsampling`: String containing JPEG chroma subsampling, `4:2:0` or `4:4:4` for RGB, `4:2:0:4` or `4:4:4:4` for CMYK
|
* `chromaSubsampling`: String containing JPEG chroma subsampling, `4:2:0` or `4:4:4` for RGB, `4:2:0:4` or `4:4:4:4` for CMYK
|
||||||
- `isProgressive`: Boolean indicating whether the image is interlaced using a progressive scan
|
* `isProgressive`: Boolean indicating whether the image is interlaced using a progressive scan
|
||||||
- `pages`: Number of pages/frames contained within the image, with support for TIFF, PDF, animated GIF and animated WebP
|
* `pages`: Number of pages/frames contained within the image, with support for TIFF, HEIF, PDF, animated GIF and animated WebP
|
||||||
- `pageHeight`: Number of pixels high each page in this PDF image will be.
|
* `pageHeight`: Number of pixels high each page in a multi-page image will be.
|
||||||
- `hasProfile`: Boolean indicating the presence of an embedded ICC profile
|
* `loop`: Number of times to loop an animated image, zero refers to a continuous loop.
|
||||||
- `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
|
* `delay`: Delay in ms between each page in an animated image, provided as an array of integers.
|
||||||
- `orientation`: Number value of the EXIF Orientation header, if present
|
* `pagePrimary`: Number of the primary page in a HEIF image
|
||||||
- `exif`: Buffer containing raw EXIF data, if present
|
* `levels`: Details of each level in a multi-level image provided as an array of objects, requires libvips compiled with support for OpenSlide
|
||||||
- `icc`: Buffer containing raw [ICC][3] profile data, if present
|
* `subifds`: Number of Sub Image File Directories in an OME-TIFF image
|
||||||
- `iptc`: Buffer containing raw IPTC data, if present
|
* `hasProfile`: Boolean indicating the presence of an embedded ICC profile
|
||||||
- `xmp`: Buffer containing raw XMP data, if present
|
* `hasAlpha`: Boolean indicating the presence of an alpha transparency channel
|
||||||
|
* `orientation`: Number value of the EXIF Orientation header, if present
|
||||||
|
* `exif`: Buffer containing raw EXIF data, if present
|
||||||
|
* `icc`: Buffer containing raw [ICC][3] profile data, if present
|
||||||
|
* `iptc`: Buffer containing raw IPTC data, if present
|
||||||
|
* `xmp`: Buffer containing raw XMP data, if present
|
||||||
|
* `tifftagPhotoshop`: Buffer containing raw TIFFTAG_PHOTOSHOP data, if present
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `callback` **[Function][4]?** called with the arguments `(err, metadata)`
|
* `callback` **[Function][4]?** called with the arguments `(err, metadata)`
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -65,30 +52,32 @@ image
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **([Promise][5]<[Object][6]> | Sharp)**
|
Returns **([Promise][5]<[Object][6]> | Sharp)**
|
||||||
|
|
||||||
## stats
|
## stats
|
||||||
|
|
||||||
Access to pixel-derived image statistics for every channel in the image.
|
Access to pixel-derived image statistics for every channel in the image.
|
||||||
A `Promise` is returned when `callback` is not provided.
|
A `Promise` is returned when `callback` is not provided.
|
||||||
|
|
||||||
- `channels`: Array of channel statistics for each channel in the image. Each channel statistic contains
|
* `channels`: Array of channel statistics for each channel in the image. Each channel statistic contains
|
||||||
- `min` (minimum value in the channel)
|
* `min` (minimum value in the channel)
|
||||||
- `max` (maximum value in the channel)
|
* `max` (maximum value in the channel)
|
||||||
- `sum` (sum of all values in a channel)
|
* `sum` (sum of all values in a channel)
|
||||||
- `squaresSum` (sum of squared values in a channel)
|
* `squaresSum` (sum of squared values in a channel)
|
||||||
- `mean` (mean of the values in a channel)
|
* `mean` (mean of the values in a channel)
|
||||||
- `stdev` (standard deviation for the values in a channel)
|
* `stdev` (standard deviation for the values in a channel)
|
||||||
- `minX` (x-coordinate of one of the pixel where the minimum lies)
|
* `minX` (x-coordinate of one of the pixel where the minimum lies)
|
||||||
- `minY` (y-coordinate of one of the pixel where the minimum lies)
|
* `minY` (y-coordinate of one of the pixel where the minimum lies)
|
||||||
- `maxX` (x-coordinate of one of the pixel where the maximum lies)
|
* `maxX` (x-coordinate of one of the pixel where the maximum lies)
|
||||||
- `maxY` (y-coordinate of one of the pixel where the maximum lies)
|
* `maxY` (y-coordinate of one of the pixel where the maximum lies)
|
||||||
- `isOpaque`: Value to identify if the image is opaque or transparent, based on the presence and use of alpha channel
|
* `isOpaque`: Is the image fully opaque? Will be `true` if the image has no alpha channel or if every pixel is fully opaque.
|
||||||
- `entropy`: Histogram-based estimation of greyscale entropy, discarding alpha channel if any (experimental)
|
* `entropy`: Histogram-based estimation of greyscale entropy, discarding alpha channel if any (experimental)
|
||||||
|
* `sharpness`: Estimation of greyscale sharpness based on the standard deviation of a Laplacian convolution, discarding alpha channel if any (experimental)
|
||||||
|
* `dominant`: Object containing most dominant sRGB colour based on a 4096-bin 3D histogram (experimental)
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `callback` **[Function][4]?** called with the arguments `(err, stats)`
|
* `callback` **[Function][4]?** called with the arguments `(err, stats)`
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -101,39 +90,16 @@ image
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **[Promise][5]<[Object][6]>**
|
```javascript
|
||||||
|
const { entropy, sharpness, dominant } = await sharp(input).stats();
|
||||||
|
const { r, g, b } = dominant;
|
||||||
|
```
|
||||||
|
|
||||||
## limitInputPixels
|
Returns **[Promise][5]<[Object][6]>**
|
||||||
|
|
||||||
Do not process input images where the number of pixels (width x height) exceeds this limit.
|
[1]: https://libvips.github.io/libvips/API/current/VipsImage.html#VipsInterpretation
|
||||||
Assumes image dimensions contained in the input metadata can be trusted.
|
|
||||||
The default limit is 268402689 (0x3FFF x 0x3FFF) pixels.
|
|
||||||
|
|
||||||
### Parameters
|
[2]: https://libvips.github.io/libvips/API/current/VipsImage.html#VipsBandFormat
|
||||||
|
|
||||||
- `limit` **([Number][7] \| [Boolean][8])** an integral Number of pixels, zero or false to remove limit, true to use default limit.
|
|
||||||
|
|
||||||
|
|
||||||
- Throws **[Error][9]** Invalid limit
|
|
||||||
|
|
||||||
Returns **Sharp**
|
|
||||||
|
|
||||||
## sequentialRead
|
|
||||||
|
|
||||||
An advanced setting that switches the libvips access method to `VIPS_ACCESS_SEQUENTIAL`.
|
|
||||||
This will reduce memory usage and can improve performance on some systems.
|
|
||||||
|
|
||||||
The default behaviour _before_ function call is `false`, meaning the libvips access method is not sequential.
|
|
||||||
|
|
||||||
### Parameters
|
|
||||||
|
|
||||||
- `sequentialRead` **[Boolean][8]** (optional, default `true`)
|
|
||||||
|
|
||||||
Returns **Sharp**
|
|
||||||
|
|
||||||
[1]: https://github.com/libvips/libvips/blob/master/libvips/iofuncs/enumtypes.c#L636
|
|
||||||
|
|
||||||
[2]: https://github.com/libvips/libvips/blob/master/libvips/iofuncs/enumtypes.c#L672
|
|
||||||
|
|
||||||
[3]: https://www.npmjs.com/package/icc
|
[3]: https://www.npmjs.com/package/icc
|
||||||
|
|
||||||
@@ -142,9 +108,3 @@ Returns **Sharp**
|
|||||||
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise
|
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise
|
||||||
|
|
||||||
[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
||||||
|
|
||||||
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
|
||||||
|
|
||||||
[8]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
|
||||||
|
|
||||||
[9]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
|
||||||
|
|||||||
@@ -21,9 +21,10 @@ for example `rotate(x).extract(y)` will produce a different result to `extract(y
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `angle` **[Number][1]** angle of rotation. (optional, default `auto`)
|
* `angle` **[number][1]** angle of rotation. (optional, default `auto`)
|
||||||
- `options` **[Object][2]?** if present, is an Object with optional attributes.
|
* `options` **[Object][2]?** if present, is an Object with optional attributes.
|
||||||
- `options.background` **([String][3] \| [Object][2])** parsed by the [color][4] module to extract values for red, green, blue and alpha. (optional, default `"#000000"`)
|
|
||||||
|
* `options.background` **([string][3] | [Object][2])** parsed by the [color][4] module to extract values for red, green, blue and alpha. (optional, default `"#000000"`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -39,7 +40,7 @@ const pipeline = sharp()
|
|||||||
readableStream.pipe(pipeline);
|
readableStream.pipe(pipeline);
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -50,7 +51,7 @@ The use of `flip` implies the removal of the EXIF `Orientation` tag, if any.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `flip` **[Boolean][6]** (optional, default `true`)
|
* `flip` **[Boolean][6]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -61,10 +62,66 @@ The use of `flop` implies the removal of the EXIF `Orientation` tag, if any.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `flop` **[Boolean][6]** (optional, default `true`)
|
* `flop` **[Boolean][6]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
## affine
|
||||||
|
|
||||||
|
Perform an affine transform on an image. This operation will always occur after resizing, extraction and rotation, if any.
|
||||||
|
|
||||||
|
You must provide an array of length 4 or a 2x2 affine transformation matrix.
|
||||||
|
By default, new pixels are filled with a black background. You can provide a background color with the `background` option.
|
||||||
|
A particular interpolator may also be specified. Set the `interpolator` option to an attribute of the `sharp.interpolator` Object e.g. `sharp.interpolator.nohalo`.
|
||||||
|
|
||||||
|
In the case of a 2x2 matrix, the transform is:
|
||||||
|
|
||||||
|
* X = `matrix[0, 0]` \* (x + `idx`) + `matrix[0, 1]` \* (y + `idy`) + `odx`
|
||||||
|
* Y = `matrix[1, 0]` \* (x + `idx`) + `matrix[1, 1]` \* (y + `idy`) + `ody`
|
||||||
|
|
||||||
|
where:
|
||||||
|
|
||||||
|
* x and y are the coordinates in input image.
|
||||||
|
* X and Y are the coordinates in output image.
|
||||||
|
* (0,0) is the upper left corner.
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `matrix` **([Array][7]<[Array][7]<[number][1]>> | [Array][7]<[number][1]>)** affine transformation matrix
|
||||||
|
* `options` **[Object][2]?** if present, is an Object with optional attributes.
|
||||||
|
|
||||||
|
* `options.background` **([String][3] | [Object][2])** parsed by the [color][4] module to extract values for red, green, blue and alpha. (optional, default `"#000000"`)
|
||||||
|
* `options.idx` **[Number][1]** input horizontal offset (optional, default `0`)
|
||||||
|
* `options.idy` **[Number][1]** input vertical offset (optional, default `0`)
|
||||||
|
* `options.odx` **[Number][1]** output horizontal offset (optional, default `0`)
|
||||||
|
* `options.ody` **[Number][1]** output vertical offset (optional, default `0`)
|
||||||
|
* `options.interpolator` **[String][3]** interpolator (optional, default `sharp.interpolators.bicubic`)
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
const pipeline = sharp()
|
||||||
|
.affine([[1, 0.3], [0.1, 0.7]], {
|
||||||
|
background: 'white',
|
||||||
|
interpolate: sharp.interpolators.nohalo
|
||||||
|
})
|
||||||
|
.toBuffer((err, outputBuffer, info) => {
|
||||||
|
// outputBuffer contains the transformed image
|
||||||
|
// info.width and info.height contain the new dimensions
|
||||||
|
});
|
||||||
|
|
||||||
|
inputStream
|
||||||
|
.pipe(pipeline);
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.27.0
|
||||||
|
|
||||||
## sharpen
|
## sharpen
|
||||||
|
|
||||||
Sharpen the image.
|
Sharpen the image.
|
||||||
@@ -74,12 +131,13 @@ Separate control over the level of sharpening in "flat" and "jagged" areas is av
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `sigma` **[Number][1]?** the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
* `sigma` **[number][1]?** the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
||||||
- `flat` **[Number][1]** the level of sharpening to apply to "flat" areas. (optional, default `1.0`)
|
* `flat` **[number][1]** the level of sharpening to apply to "flat" areas. (optional, default `1.0`)
|
||||||
- `jagged` **[Number][1]** the level of sharpening to apply to "jagged" areas. (optional, default `2.0`)
|
* `jagged` **[number][1]** the level of sharpening to apply to "jagged" areas. (optional, default `2.0`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -90,10 +148,11 @@ When used without parameters the default window is 3x3.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `size` **[Number][1]** square mask size: size x size (optional, default `3`)
|
* `size` **[number][1]** square mask size: size x size (optional, default `3`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -105,21 +164,33 @@ When a `sigma` is provided, performs a slower, more accurate Gaussian blur.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `sigma` **[Number][1]?** a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
* `sigma` **[number][1]?** a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
## flatten
|
## flatten
|
||||||
|
|
||||||
Merge alpha transparency channel, if any, with a background.
|
Merge alpha transparency channel, if any, with a background, then remove the alpha channel.
|
||||||
|
|
||||||
|
See also [removeAlpha][8].
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][2]?**
|
* `options` **[Object][2]?**
|
||||||
- `options.background` **([String][3] \| [Object][2])** background colour, parsed by the [color][4] module, defaults to black. (optional, default `{r:0,g:0,b:0}`)
|
|
||||||
|
* `options.background` **([string][3] | [Object][2])** background colour, parsed by the [color][4] module, defaults to black. (optional, default `{r:0,g:0,b:0}`)
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
await sharp(rgbaInput)
|
||||||
|
.flatten({ background: '#F0A703' })
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -135,11 +206,12 @@ Supply a second argument to use a different output gamma value, otherwise the fi
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `gamma` **[Number][1]** value between 1.0 and 3.0. (optional, default `2.2`)
|
* `gamma` **[number][1]** value between 1.0 and 3.0. (optional, default `2.2`)
|
||||||
- `gammaOut` **[Number][1]?** value between 1.0 and 3.0. (optional, defaults to same as `gamma`)
|
* `gammaOut` **[number][1]?** value between 1.0 and 3.0. (optional, defaults to same as `gamma`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -149,7 +221,7 @@ Produce the "negative" of the image.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `negate` **[Boolean][6]** (optional, default `true`)
|
* `negate` **[Boolean][6]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -159,7 +231,7 @@ Enhance output image contrast by stretching its luminance to cover the full dyna
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `normalise` **[Boolean][6]** (optional, default `true`)
|
* `normalise` **[Boolean][6]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -169,22 +241,50 @@ Alternative spelling of normalise.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `normalize` **[Boolean][6]** (optional, default `true`)
|
* `normalize` **[Boolean][6]** (optional, default `true`)
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
## clahe
|
||||||
|
|
||||||
|
Perform contrast limiting adaptive histogram equalization
|
||||||
|
[CLAHE][9].
|
||||||
|
|
||||||
|
This will, in general, enhance the clarity of the image by bringing out darker details.
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `options` **[Object][2]**
|
||||||
|
|
||||||
|
* `options.width` **[number][1]** integer width of the region in pixels.
|
||||||
|
* `options.height` **[number][1]** integer height of the region in pixels.
|
||||||
|
* `options.maxSlope` **[number][1]** maximum value for the slope of the
|
||||||
|
cumulative histogram. A value of 0 disables contrast limiting. Valid values
|
||||||
|
are integers in the range 0-100 (inclusive) (optional, default `3`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.28.3
|
||||||
|
|
||||||
## convolve
|
## convolve
|
||||||
|
|
||||||
Convolve the image with the specified kernel.
|
Convolve the image with the specified kernel.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `kernel` **[Object][2]**
|
* `kernel` **[Object][2]**
|
||||||
- `kernel.width` **[Number][1]** width of the kernel in pixels.
|
|
||||||
- `kernel.height` **[Number][1]** width of the kernel in pixels.
|
* `kernel.width` **[number][1]** width of the kernel in pixels.
|
||||||
- `kernel.kernel` **[Array][7]<[Number][1]>** Array of length `width*height` containing the kernel values.
|
* `kernel.height` **[number][1]** height of the kernel in pixels.
|
||||||
- `kernel.scale` **[Number][1]** the scale of the kernel in pixels. (optional, default `sum`)
|
* `kernel.kernel` **[Array][7]<[number][1]>** Array of length `width*height` containing the kernel values.
|
||||||
- `kernel.offset` **[Number][1]** the offset of the kernel in pixels. (optional, default `0`)
|
* `kernel.scale` **[number][1]** the scale of the kernel in pixels. (optional, default `sum`)
|
||||||
|
* `kernel.offset` **[number][1]** the offset of the kernel in pixels. (optional, default `0`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -202,23 +302,25 @@ sharp(input)
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
## threshold
|
## threshold
|
||||||
|
|
||||||
Any pixel value greather than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
|
Any pixel value greater than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `threshold` **[Number][1]** a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default `128`)
|
* `threshold` **[number][1]** a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default `128`)
|
||||||
- `options` **[Object][2]?**
|
* `options` **[Object][2]?**
|
||||||
- `options.greyscale` **[Boolean][6]** convert to single channel greyscale. (optional, default `true`)
|
|
||||||
- `options.grayscale` **[Boolean][6]** alternative spelling for greyscale. (optional, default `true`)
|
|
||||||
|
|
||||||
|
* `options.greyscale` **[Boolean][6]** convert to single channel greyscale. (optional, default `true`)
|
||||||
|
* `options.grayscale` **[Boolean][6]** alternative spelling for greyscale. (optional, default `true`)
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
<!---->
|
||||||
|
|
||||||
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -231,16 +333,19 @@ the selected bitwise boolean `operation` between the corresponding pixels of the
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `operand` **([Buffer][8] \| [String][3])** Buffer containing image data or String containing the path to an image file.
|
* `operand` **([Buffer][10] | [string][3])** Buffer containing image data or string containing the path to an image file.
|
||||||
- `operator` **[String][3]** one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
* `operator` **[string][3]** one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
||||||
- `options` **[Object][2]?**
|
* `options` **[Object][2]?**
|
||||||
- `options.raw` **[Object][2]?** describes operand when using raw pixel data.
|
|
||||||
- `options.raw.width` **[Number][1]?**
|
|
||||||
- `options.raw.height` **[Number][1]?**
|
|
||||||
- `options.raw.channels` **[Number][1]?**
|
|
||||||
|
|
||||||
|
* `options.raw` **[Object][2]?** describes operand when using raw pixel data.
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* `options.raw.width` **[number][1]?**
|
||||||
|
* `options.raw.height` **[number][1]?**
|
||||||
|
* `options.raw.channels` **[number][1]?**
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -250,11 +355,12 @@ Apply the linear formula a \* input + b to the image (levels adjustment)
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `a` **[Number][1]** multiplier (optional, default `1.0`)
|
* `a` **[number][1]** multiplier (optional, default `1.0`)
|
||||||
- `b` **[Number][1]** offset (optional, default `0.0`)
|
* `b` **[number][1]** offset (optional, default `0.0`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -264,8 +370,7 @@ Recomb the image with the specified matrix.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `inputMatrix`
|
* `inputMatrix` **[Array][7]<[Array][7]<[number][1]>>** 3x3 Recombination matrix
|
||||||
- `3x3` **[Array][7]<[Array][7]<[Number][1]>>** Recombination matrix
|
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -283,20 +388,25 @@ sharp(input)
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][5]** Invalid parameters
|
* Throws **[Error][5]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.21.1
|
||||||
|
|
||||||
## modulate
|
## modulate
|
||||||
|
|
||||||
Transforms the image using brightness, saturation and hue rotation.
|
Transforms the image using brightness, saturation and hue rotation.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][2]?**
|
* `options` **[Object][2]?**
|
||||||
- `options.brightness` **[Number][1]?** Brightness multiplier
|
|
||||||
- `options.saturation` **[Number][1]?** Saturation multiplier
|
* `options.brightness` **[number][1]?** Brightness multiplier
|
||||||
- `options.hue` **[Number][1]?** Degrees for hue rotation
|
* `options.saturation` **[number][1]?** Saturation multiplier
|
||||||
|
* `options.hue` **[number][1]?** Degrees for hue rotation
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -322,6 +432,10 @@ sharp(input)
|
|||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.22.1
|
||||||
|
|
||||||
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
||||||
|
|
||||||
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
||||||
@@ -336,4 +450,8 @@ Returns **Sharp**
|
|||||||
|
|
||||||
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array
|
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array
|
||||||
|
|
||||||
[8]: https://nodejs.org/api/buffer.html
|
[8]: /api-channel#removealpha
|
||||||
|
|
||||||
|
[9]: https://en.wikipedia.org/wiki/Adaptive_histogram_equalization#Contrast_Limited_AHE
|
||||||
|
|
||||||
|
[10]: https://nodejs.org/api/buffer.html
|
||||||
|
|||||||
@@ -5,15 +5,18 @@
|
|||||||
Write output image data to a file.
|
Write output image data to a file.
|
||||||
|
|
||||||
If an explicit output format is not selected, it will be inferred from the extension,
|
If an explicit output format is not selected, it will be inferred from the extension,
|
||||||
with JPEG, PNG, WebP, TIFF, DZI, and libvips' V format supported.
|
with JPEG, PNG, WebP, AVIF, TIFF, DZI, and libvips' V format supported.
|
||||||
Note that raw pixel data is only supported for buffer output.
|
Note that raw pixel data is only supported for buffer output.
|
||||||
|
|
||||||
|
By default all metadata will be removed, which includes EXIF-based orientation.
|
||||||
|
See [withMetadata][1] for control over this.
|
||||||
|
|
||||||
A `Promise` is returned when `callback` is not provided.
|
A `Promise` is returned when `callback` is not provided.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `fileOut` **[String][1]** the path to write the image data to.
|
* `fileOut` **[string][2]** the path to write the image data to.
|
||||||
- `callback` **[Function][2]?** called on completion with two arguments `(err, info)`.
|
* `callback` **[Function][3]?** called on completion with two arguments `(err, info)`.
|
||||||
`info` contains the output image `format`, `size` (bytes), `width`, `height`,
|
`info` contains the output image `format`, `size` (bytes), `width`, `height`,
|
||||||
`channels` and `premultiplied` (indicating if premultiplication was used).
|
`channels` and `premultiplied` (indicating if premultiplication was used).
|
||||||
When using a crop strategy also contains `cropOffsetLeft` and `cropOffsetTop`.
|
When using a crop strategy also contains `cropOffsetLeft` and `cropOffsetTop`.
|
||||||
@@ -32,31 +35,37 @@ sharp(input)
|
|||||||
.catch(err => { ... });
|
.catch(err => { ... });
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid parameters
|
* Throws **[Error][4]** Invalid parameters
|
||||||
|
|
||||||
Returns **[Promise][4]<[Object][5]>** when no callback is provided
|
Returns **[Promise][5]<[Object][6]>** when no callback is provided
|
||||||
|
|
||||||
## toBuffer
|
## toBuffer
|
||||||
|
|
||||||
Write output to a Buffer.
|
Write output to a Buffer.
|
||||||
JPEG, PNG, WebP, TIFF and RAW output are supported.
|
JPEG, PNG, WebP, AVIF, TIFF and raw pixel data output are supported.
|
||||||
By default, the format will match the input image, except GIF and SVG input which become PNG output.
|
|
||||||
|
If no explicit format is set, the output format will match the input image, except GIF and SVG input which become PNG output.
|
||||||
|
|
||||||
|
By default all metadata will be removed, which includes EXIF-based orientation.
|
||||||
|
See [withMetadata][1] for control over this.
|
||||||
|
|
||||||
`callback`, if present, gets three arguments `(err, data, info)` where:
|
`callback`, if present, gets three arguments `(err, data, info)` where:
|
||||||
|
|
||||||
- `err` is an error, if any.
|
* `err` is an error, if any.
|
||||||
- `data` is the output image data.
|
* `data` is the output image data.
|
||||||
- `info` contains the output image `format`, `size` (bytes), `width`, `height`,
|
* `info` contains the output image `format`, `size` (bytes), `width`, `height`,
|
||||||
`channels` and `premultiplied` (indicating if premultiplication was used).
|
|
||||||
When using a crop strategy also contains `cropOffsetLeft` and `cropOffsetTop`.
|
`channels` and `premultiplied` (indicating if premultiplication was used).
|
||||||
|
When using a crop strategy also contains `cropOffsetLeft` and `cropOffsetTop`.
|
||||||
|
|
||||||
A `Promise` is returned when `callback` is not provided.
|
A `Promise` is returned when `callback` is not provided.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][5]?**
|
* `options` **[Object][6]?**
|
||||||
- `options.resolveWithObject` **[Boolean][6]?** Resolve the Promise with an Object containing `data` and `info` properties instead of resolving only with `data`.
|
|
||||||
- `callback` **[Function][2]?**
|
* `options.resolveWithObject` **[boolean][7]?** Resolve the Promise with an Object containing `data` and `info` properties instead of resolving only with `data`.
|
||||||
|
* `callback` **[Function][3]?**
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -79,18 +88,42 @@ sharp(input)
|
|||||||
.catch(err => { ... });
|
.catch(err => { ... });
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **[Promise][4]<[Buffer][7]>** when no callback is provided
|
```javascript
|
||||||
|
const { data, info } = await sharp('my-image.jpg')
|
||||||
|
// output the raw pixels
|
||||||
|
.raw()
|
||||||
|
.toBuffer({ resolveWithObject: true });
|
||||||
|
|
||||||
|
// create a more type safe way to work with the raw pixel data
|
||||||
|
// this will not copy the data, instead it will change `data`s underlying ArrayBuffer
|
||||||
|
// so `data` and `pixelArray` point to the same memory location
|
||||||
|
const pixelArray = new Uint8ClampedArray(data.buffer);
|
||||||
|
|
||||||
|
// When you are done changing the pixelArray, sharp takes the `pixelArray` as an input
|
||||||
|
const { width, height, channels } = info;
|
||||||
|
await sharp(pixelArray, { raw: { width, height, channels } })
|
||||||
|
.toFile('my-changed-image.jpg');
|
||||||
|
```
|
||||||
|
|
||||||
|
Returns **[Promise][5]<[Buffer][8]>** when no callback is provided
|
||||||
|
|
||||||
## withMetadata
|
## withMetadata
|
||||||
|
|
||||||
Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
|
Include all metadata (EXIF, XMP, IPTC) from the input image in the output image.
|
||||||
The default behaviour, when `withMetadata` is not used, is to strip all metadata and convert to the device-independent sRGB colour space.
|
This will also convert to and add a web-friendly sRGB ICC profile unless a custom
|
||||||
This will also convert to and add a web-friendly sRGB ICC profile.
|
output profile is provided.
|
||||||
|
|
||||||
|
The default behaviour, when `withMetadata` is not used, is to convert to the device-independent
|
||||||
|
sRGB colour space and strip all metadata, including the removal of any ICC profile.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `withMetadata` **[Object][5]?**
|
* `options` **[Object][6]?**
|
||||||
- `withMetadata.orientation` **[Number][8]?** value between 1 and 8, used to update the EXIF `Orientation` tag.
|
|
||||||
|
* `options.orientation` **[number][9]?** value between 1 and 8, used to update the EXIF `Orientation` tag.
|
||||||
|
* `options.icc` **[string][2]?** filesystem path to output ICC profile, defaults to sRGB.
|
||||||
|
* `options.exif` **[Object][6]<[Object][6]>** Object keyed by IFD0, IFD1 etc. of key/value string pairs to write as EXIF data. (optional, default `{}`)
|
||||||
|
* `options.density` **[number][9]?** Number of pixels per inch (DPI).
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -101,7 +134,48 @@ sharp('input.jpg')
|
|||||||
.then(info => { ... });
|
.then(info => { ... });
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid parameters
|
```javascript
|
||||||
|
// Set "IFD0-Copyright" in output EXIF metadata
|
||||||
|
const data = await sharp(input)
|
||||||
|
.withMetadata({
|
||||||
|
exif: {
|
||||||
|
IFD0: {
|
||||||
|
Copyright: 'Wernham Hogg'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.toBuffer();
|
||||||
|
|
||||||
|
* @example
|
||||||
|
// Set output metadata to 96 DPI
|
||||||
|
const data = await sharp(input)
|
||||||
|
.withMetadata({ density: 96 })
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid parameters
|
||||||
|
|
||||||
|
Returns **Sharp**
|
||||||
|
|
||||||
|
## toFormat
|
||||||
|
|
||||||
|
Force output to a given format.
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `format` **([string][2] | [Object][6])** as a string or an Object with an 'id' attribute
|
||||||
|
* `options` **[Object][6]** output options
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
// Convert any input to PNG output
|
||||||
|
const data = await sharp(input)
|
||||||
|
.toFormat('png')
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][4]** unsupported format or options
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -111,19 +185,21 @@ Use these JPEG options for output image.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][5]?** output options
|
* `options` **[Object][6]?** output options
|
||||||
- `options.quality` **[Number][8]** quality, integer 1-100 (optional, default `80`)
|
|
||||||
- `options.progressive` **[Boolean][6]** use progressive (interlace) scan (optional, default `false`)
|
* `options.quality` **[number][9]** quality, integer 1-100 (optional, default `80`)
|
||||||
- `options.chromaSubsampling` **[String][1]** set to '4:4:4' to prevent chroma subsampling when quality <= 90 (optional, default `'4:2:0'`)
|
* `options.progressive` **[boolean][7]** use progressive (interlace) scan (optional, default `false`)
|
||||||
- `options.trellisQuantisation` **[Boolean][6]** apply trellis quantisation, requires libvips compiled with support for mozjpeg (optional, default `false`)
|
* `options.chromaSubsampling` **[string][2]** set to '4:4:4' to prevent chroma subsampling otherwise defaults to '4:2:0' chroma subsampling (optional, default `'4:2:0'`)
|
||||||
- `options.overshootDeringing` **[Boolean][6]** apply overshoot deringing, requires libvips compiled with support for mozjpeg (optional, default `false`)
|
* `options.optimiseCoding` **[boolean][7]** optimise Huffman coding tables (optional, default `true`)
|
||||||
- `options.optimiseScans` **[Boolean][6]** optimise progressive scans, forces progressive, requires libvips compiled with support for mozjpeg (optional, default `false`)
|
* `options.optimizeCoding` **[boolean][7]** alternative spelling of optimiseCoding (optional, default `true`)
|
||||||
- `options.optimizeScans` **[Boolean][6]** alternative spelling of optimiseScans (optional, default `false`)
|
* `options.mozjpeg` **[boolean][7]** use mozjpeg defaults, equivalent to `{ trellisQuantisation: true, overshootDeringing: true, optimiseScans: true, quantisationTable: 3 }` (optional, default `false`)
|
||||||
- `options.optimiseCoding` **[Boolean][6]** optimise Huffman coding tables (optional, default `true`)
|
* `options.trellisQuantisation` **[boolean][7]** apply trellis quantisation (optional, default `false`)
|
||||||
- `options.optimizeCoding` **[Boolean][6]** alternative spelling of optimiseCoding (optional, default `true`)
|
* `options.overshootDeringing` **[boolean][7]** apply overshoot deringing (optional, default `false`)
|
||||||
- `options.quantisationTable` **[Number][8]** quantization table to use, integer 0-8, requires libvips compiled with support for mozjpeg (optional, default `0`)
|
* `options.optimiseScans` **[boolean][7]** optimise progressive scans, forces progressive (optional, default `false`)
|
||||||
- `options.quantizationTable` **[Number][8]** alternative spelling of quantisationTable (optional, default `0`)
|
* `options.optimizeScans` **[boolean][7]** alternative spelling of optimiseScans (optional, default `false`)
|
||||||
- `options.force` **[Boolean][6]** force JPEG output, otherwise attempt to use input format (optional, default `true`)
|
* `options.quantisationTable` **[number][9]** quantization table to use, integer 0-8 (optional, default `0`)
|
||||||
|
* `options.quantizationTable` **[number][9]** alternative spelling of quantisationTable (optional, default `0`)
|
||||||
|
* `options.force` **[boolean][7]** force JPEG output, otherwise attempt to use input format (optional, default `true`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -137,7 +213,14 @@ const data = await sharp(input)
|
|||||||
.toBuffer();
|
.toBuffer();
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid options
|
```javascript
|
||||||
|
// Use mozjpeg to reduce output JPEG file size (slower)
|
||||||
|
const data = await sharp(input)
|
||||||
|
.jpeg({ mozjpeg: true })
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -145,32 +228,41 @@ Returns **Sharp**
|
|||||||
|
|
||||||
Use these PNG options for output image.
|
Use these PNG options for output image.
|
||||||
|
|
||||||
PNG output is always full colour at 8 or 16 bits per pixel.
|
By default, PNG output is full colour at 8 or 16 bits per pixel.
|
||||||
Indexed PNG input at 1, 2 or 4 bits per pixel is converted to 8 bits per pixel.
|
Indexed PNG input at 1, 2 or 4 bits per pixel is converted to 8 bits per pixel.
|
||||||
|
Set `palette` to `true` for slower, indexed PNG output.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][5]?**
|
* `options` **[Object][6]?**
|
||||||
- `options.progressive` **[Boolean][6]** use progressive (interlace) scan (optional, default `false`)
|
|
||||||
- `options.compressionLevel` **[Number][8]** zlib compression level, 0-9 (optional, default `9`)
|
* `options.progressive` **[boolean][7]** use progressive (interlace) scan (optional, default `false`)
|
||||||
- `options.adaptiveFiltering` **[Boolean][6]** use adaptive row filtering (optional, default `false`)
|
* `options.compressionLevel` **[number][9]** zlib compression level, 0 (fastest, largest) to 9 (slowest, smallest) (optional, default `6`)
|
||||||
- `options.palette` **[Boolean][6]** quantise to a palette-based image with alpha transparency support, requires libvips compiled with support for libimagequant (optional, default `false`)
|
* `options.adaptiveFiltering` **[boolean][7]** use adaptive row filtering (optional, default `false`)
|
||||||
- `options.quality` **[Number][8]** use the lowest number of colours needed to achieve given quality, requires libvips compiled with support for libimagequant (optional, default `100`)
|
* `options.palette` **[boolean][7]** quantise to a palette-based image with alpha transparency support (optional, default `false`)
|
||||||
- `options.colours` **[Number][8]** maximum number of palette entries, requires libvips compiled with support for libimagequant (optional, default `256`)
|
* `options.quality` **[number][9]** use the lowest number of colours needed to achieve given quality, sets `palette` to `true` (optional, default `100`)
|
||||||
- `options.colors` **[Number][8]** alternative spelling of `options.colours`, requires libvips compiled with support for libimagequant (optional, default `256`)
|
* `options.colours` **[number][9]** maximum number of palette entries, sets `palette` to `true` (optional, default `256`)
|
||||||
- `options.dither` **[Number][8]** level of Floyd-Steinberg error diffusion, requires libvips compiled with support for libimagequant (optional, default `1.0`)
|
* `options.colors` **[number][9]** alternative spelling of `options.colours`, sets `palette` to `true` (optional, default `256`)
|
||||||
- `options.force` **[Boolean][6]** force PNG output, otherwise attempt to use input format (optional, default `true`)
|
* `options.dither` **[number][9]** level of Floyd-Steinberg error diffusion, sets `palette` to `true` (optional, default `1.0`)
|
||||||
|
* `options.force` **[boolean][7]** force PNG output, otherwise attempt to use input format (optional, default `true`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
// Convert any input to PNG output
|
// Convert any input to full colour PNG output
|
||||||
const data = await sharp(input)
|
const data = await sharp(input)
|
||||||
.png()
|
.png()
|
||||||
.toBuffer();
|
.toBuffer();
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid options
|
```javascript
|
||||||
|
// Convert any input to indexed PNG output (slower)
|
||||||
|
const data = await sharp(input)
|
||||||
|
.png({ palette: true })
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -180,12 +272,18 @@ Use these WebP options for output image.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][5]?** output options
|
* `options` **[Object][6]?** output options
|
||||||
- `options.quality` **[Number][8]** quality, integer 1-100 (optional, default `80`)
|
|
||||||
- `options.alphaQuality` **[Number][8]** quality of alpha layer, integer 0-100 (optional, default `100`)
|
* `options.quality` **[number][9]** quality, integer 1-100 (optional, default `80`)
|
||||||
- `options.lossless` **[Boolean][6]** use lossless compression mode (optional, default `false`)
|
* `options.alphaQuality` **[number][9]** quality of alpha layer, integer 0-100 (optional, default `100`)
|
||||||
- `options.nearLossless` **[Boolean][6]** use near_lossless compression mode (optional, default `false`)
|
* `options.lossless` **[boolean][7]** use lossless compression mode (optional, default `false`)
|
||||||
- `options.force` **[Boolean][6]** force WebP output, otherwise attempt to use input format (optional, default `true`)
|
* `options.nearLossless` **[boolean][7]** use near_lossless compression mode (optional, default `false`)
|
||||||
|
* `options.smartSubsample` **[boolean][7]** use high quality chroma subsampling (optional, default `false`)
|
||||||
|
* `options.reductionEffort` **[number][9]** level of CPU effort to reduce file size, integer 0-6 (optional, default `4`)
|
||||||
|
* `options.pageHeight` **[number][9]?** page height for animated output
|
||||||
|
* `options.loop` **[number][9]** number of animation iterations, use 0 for infinite animation (optional, default `0`)
|
||||||
|
* `options.delay` **[Array][10]<[number][9]>?** list of delays between animation frames (in milliseconds)
|
||||||
|
* `options.force` **[boolean][7]** force WebP output, otherwise attempt to use input format (optional, default `true`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -196,7 +294,37 @@ const data = await sharp(input)
|
|||||||
.toBuffer();
|
.toBuffer();
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid options
|
```javascript
|
||||||
|
// Optimise the file size of an animated WebP
|
||||||
|
const outputWebp = await sharp(inputWebp, { animated: true })
|
||||||
|
.webp({ reductionEffort: 6 })
|
||||||
|
.toBuffer();
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
|
Returns **Sharp**
|
||||||
|
|
||||||
|
## gif
|
||||||
|
|
||||||
|
Use these GIF options for output image.
|
||||||
|
|
||||||
|
Requires libvips compiled with support for ImageMagick or GraphicsMagick.
|
||||||
|
The prebuilt binaries do not include this - see
|
||||||
|
[installing a custom libvips][11].
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `options` **[Object][6]?** output options
|
||||||
|
|
||||||
|
* `options.pageHeight` **[number][9]?** page height for animated output
|
||||||
|
* `options.loop` **[number][9]** number of animation iterations, use 0 for infinite animation (optional, default `0`)
|
||||||
|
* `options.delay` **[Array][10]<[number][9]>?** list of delays between animation frames (in milliseconds)
|
||||||
|
* `options.force` **[boolean][7]** force GIF output, otherwise attempt to use input format (optional, default `true`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -206,18 +334,19 @@ Use these TIFF options for output image.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][5]?** output options
|
* `options` **[Object][6]?** output options
|
||||||
- `options.quality` **[Number][8]** quality, integer 1-100 (optional, default `80`)
|
|
||||||
- `options.force` **[Boolean][6]** force TIFF output, otherwise attempt to use input format (optional, default `true`)
|
* `options.quality` **[number][9]** quality, integer 1-100 (optional, default `80`)
|
||||||
- `options.compression` **[Boolean][6]** compression options: lzw, deflate, jpeg, ccittfax4 (optional, default `'jpeg'`)
|
* `options.force` **[boolean][7]** force TIFF output, otherwise attempt to use input format (optional, default `true`)
|
||||||
- `options.predictor` **[Boolean][6]** compression predictor options: none, horizontal, float (optional, default `'horizontal'`)
|
* `options.compression` **[string][2]** compression options: lzw, deflate, jpeg, ccittfax4 (optional, default `'jpeg'`)
|
||||||
- `options.pyramid` **[Boolean][6]** write an image pyramid (optional, default `false`)
|
* `options.predictor` **[string][2]** compression predictor options: none, horizontal, float (optional, default `'horizontal'`)
|
||||||
- `options.tile` **[Boolean][6]** write a tiled tiff (optional, default `false`)
|
* `options.pyramid` **[boolean][7]** write an image pyramid (optional, default `false`)
|
||||||
- `options.tileWidth` **[Boolean][6]** horizontal tile size (optional, default `256`)
|
* `options.tile` **[boolean][7]** write a tiled tiff (optional, default `false`)
|
||||||
- `options.tileHeight` **[Boolean][6]** vertical tile size (optional, default `256`)
|
* `options.tileWidth` **[number][9]** horizontal tile size (optional, default `256`)
|
||||||
- `options.xres` **[Number][8]** horizontal resolution in pixels/mm (optional, default `1.0`)
|
* `options.tileHeight` **[number][9]** vertical tile size (optional, default `256`)
|
||||||
- `options.yres` **[Number][8]** vertical resolution in pixels/mm (optional, default `1.0`)
|
* `options.xres` **[number][9]** horizontal resolution in pixels/mm (optional, default `1.0`)
|
||||||
- `options.squash` **[Boolean][6]** squash 8-bit images down to 1 bit (optional, default `false`)
|
* `options.yres` **[number][9]** vertical resolution in pixels/mm (optional, default `1.0`)
|
||||||
|
* `options.bitdepth` **[number][9]** reduce bitdepth to 1, 2 or 4 bit (optional, default `8`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -226,19 +355,74 @@ Use these TIFF options for output image.
|
|||||||
sharp('input.svg')
|
sharp('input.svg')
|
||||||
.tiff({
|
.tiff({
|
||||||
compression: 'lzw',
|
compression: 'lzw',
|
||||||
squash: true
|
bitdepth: 1
|
||||||
})
|
})
|
||||||
.toFile('1-bpp-output.tiff')
|
.toFile('1-bpp-output.tiff')
|
||||||
.then(info => { ... });
|
.then(info => { ... });
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid options
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
## avif
|
||||||
|
|
||||||
|
Use these AVIF options for output image.
|
||||||
|
|
||||||
|
Whilst it is possible to create AVIF images smaller than 16x16 pixels,
|
||||||
|
most web browsers do not display these properly.
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `options` **[Object][6]?** output options
|
||||||
|
|
||||||
|
* `options.quality` **[number][9]** quality, integer 1-100 (optional, default `50`)
|
||||||
|
* `options.lossless` **[boolean][7]** use lossless compression (optional, default `false`)
|
||||||
|
* `options.speed` **[number][9]** CPU effort vs file size, 0 (slowest/smallest) to 8 (fastest/largest) (optional, default `5`)
|
||||||
|
* `options.chromaSubsampling` **[string][2]** set to '4:4:4' to prevent chroma subsampling otherwise defaults to '4:2:0' chroma subsampling, requires libvips v8.11.0 (optional, default `'4:2:0'`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.27.0
|
||||||
|
|
||||||
|
## heif
|
||||||
|
|
||||||
|
Use these HEIF options for output image.
|
||||||
|
|
||||||
|
Support for patent-encumbered HEIC images requires the use of a
|
||||||
|
globally-installed libvips compiled with support for libheif, libde265 and x265.
|
||||||
|
|
||||||
|
### Parameters
|
||||||
|
|
||||||
|
* `options` **[Object][6]?** output options
|
||||||
|
|
||||||
|
* `options.quality` **[number][9]** quality, integer 1-100 (optional, default `50`)
|
||||||
|
* `options.compression` **[string][2]** compression format: av1, hevc (optional, default `'av1'`)
|
||||||
|
* `options.lossless` **[boolean][7]** use lossless compression (optional, default `false`)
|
||||||
|
* `options.speed` **[number][9]** CPU effort vs file size, 0 (slowest/smallest) to 8 (fastest/largest) (optional, default `5`)
|
||||||
|
* `options.chromaSubsampling` **[string][2]** set to '4:4:4' to prevent chroma subsampling otherwise defaults to '4:2:0' chroma subsampling, requires libvips v8.11.0 (optional, default `'4:2:0'`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
|
* Throws **[Error][4]** Invalid options
|
||||||
|
|
||||||
|
Returns **Sharp**
|
||||||
|
|
||||||
|
**Meta**
|
||||||
|
|
||||||
|
* **since**: 0.23.0
|
||||||
|
|
||||||
## raw
|
## raw
|
||||||
|
|
||||||
Force output to be raw, uncompressed uint8 pixel data.
|
Force output to be raw, uncompressed, 8-bit unsigned integer (unit8) pixel data.
|
||||||
|
Pixel ordering is left-to-right, top-to-bottom, without padding.
|
||||||
|
Channel ordering will be RGB or RGBA for non-greyscale colourspaces.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -249,28 +433,16 @@ const { data, info } = await sharp('input.jpg')
|
|||||||
.toBuffer({ resolveWithObject: true });
|
.toBuffer({ resolveWithObject: true });
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **Sharp**
|
|
||||||
|
|
||||||
## toFormat
|
|
||||||
|
|
||||||
Force output to a given format.
|
|
||||||
|
|
||||||
### Parameters
|
|
||||||
|
|
||||||
- `format` **([String][1] \| [Object][5])** as a String or an Object with an 'id' attribute
|
|
||||||
- `options` **[Object][5]** output options
|
|
||||||
|
|
||||||
### Examples
|
|
||||||
|
|
||||||
```javascript
|
```javascript
|
||||||
// Convert any input to PNG output
|
// Extract alpha channel as raw pixel data from PNG input
|
||||||
const data = await sharp(input)
|
const data = await sharp('input.png')
|
||||||
.toFormat('png')
|
.ensureAlpha()
|
||||||
|
.extractChannel(3)
|
||||||
|
.toColourspace('b-w')
|
||||||
|
.raw()
|
||||||
.toBuffer();
|
.toBuffer();
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** unsupported format or options
|
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
## tile
|
## tile
|
||||||
@@ -283,13 +455,19 @@ Warning: multiple sharp instances concurrently producing tile output can expose
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `tile` **[Object][5]?**
|
* `options` **[Object][6]?**
|
||||||
- `tile.size` **[Number][8]** tile size in pixels, a value between 1 and 8192. (optional, default `256`)
|
|
||||||
- `tile.overlap` **[Number][8]** tile overlap in pixels, a value between 0 and 8192. (optional, default `0`)
|
* `options.size` **[number][9]** tile size in pixels, a value between 1 and 8192. (optional, default `256`)
|
||||||
- `tile.angle` **[Number][8]** tile angle of rotation, must be a multiple of 90. (optional, default `0`)
|
* `options.overlap` **[number][9]** tile overlap in pixels, a value between 0 and 8192. (optional, default `0`)
|
||||||
- `tile.depth` **[String][1]?** how deep to make the pyramid, possible values are `onepixel`, `onetile` or `one`, default based on layout.
|
* `options.angle` **[number][9]** tile angle of rotation, must be a multiple of 90. (optional, default `0`)
|
||||||
- `tile.container` **[String][1]** tile container, with value `fs` (filesystem) or `zip` (compressed file). (optional, default `'fs'`)
|
* `options.background` **([string][2] | [Object][6])** background colour, parsed by the [color][12] module, defaults to white without transparency. (optional, default `{r:255,g:255,b:255,alpha:1}`)
|
||||||
- `tile.layout` **[String][1]** filesystem layout, possible values are `dz`, `zoomify` or `google`. (optional, default `'dz'`)
|
* `options.depth` **[string][2]?** how deep to make the pyramid, possible values are `onepixel`, `onetile` or `one`, default based on layout.
|
||||||
|
* `options.skipBlanks` **[number][9]** threshold to skip tile generation, a value 0 - 255 for 8-bit images or 0 - 65535 for 16-bit images (optional, default `-1`)
|
||||||
|
* `options.container` **[string][2]** tile container, with value `fs` (filesystem) or `zip` (compressed file). (optional, default `'fs'`)
|
||||||
|
* `options.layout` **[string][2]** filesystem layout, possible values are `dz`, `iiif`, `zoomify` or `google`. (optional, default `'dz'`)
|
||||||
|
* `options.centre` **[boolean][7]** centre image in tile. (optional, default `false`)
|
||||||
|
* `options.center` **[boolean][7]** alternative spelling of centre. (optional, default `false`)
|
||||||
|
* `options.id` **[string][2]** when `layout` is `iiif`, sets the `@id` attribute of `info.json` (optional, default `'https://example.com/iiif'`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -305,22 +483,30 @@ sharp('input.tiff')
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][3]** Invalid parameters
|
* Throws **[Error][4]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
[1]: #withmetadata
|
||||||
|
|
||||||
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function
|
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
||||||
|
|
||||||
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function
|
||||||
|
|
||||||
[4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise
|
[4]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Error
|
||||||
|
|
||||||
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
[5]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Promise
|
||||||
|
|
||||||
[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
||||||
|
|
||||||
[7]: https://nodejs.org/api/buffer.html
|
[7]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
||||||
|
|
||||||
[8]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
[8]: https://nodejs.org/api/buffer.html
|
||||||
|
|
||||||
|
[9]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
||||||
|
|
||||||
|
[10]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array
|
||||||
|
|
||||||
|
[11]: https://sharp.pixelplumbing.com/install#custom-libvips
|
||||||
|
|
||||||
|
[12]: https://www.npmjs.org/package/color
|
||||||
|
|||||||
@@ -6,47 +6,50 @@ Resize image to `width`, `height` or `width x height`.
|
|||||||
|
|
||||||
When both a `width` and `height` are provided, the possible methods by which the image should **fit** these are:
|
When both a `width` and `height` are provided, the possible methods by which the image should **fit** these are:
|
||||||
|
|
||||||
- `cover`: Crop to cover both provided dimensions (the default).
|
* `cover`: (default) Preserving aspect ratio, ensure the image covers both provided dimensions by cropping/clipping to fit.
|
||||||
- `contain`: Embed within both provided dimensions.
|
* `contain`: Preserving aspect ratio, contain within both provided dimensions using "letterboxing" where necessary.
|
||||||
- `fill`: Ignore the aspect ratio of the input and stretch to both provided dimensions.
|
* `fill`: Ignore the aspect ratio of the input and stretch to both provided dimensions.
|
||||||
- `inside`: Preserving aspect ratio, resize the image to be as large as possible while ensuring its dimensions are less than or equal to both those specified.
|
* `inside`: Preserving aspect ratio, resize the image to be as large as possible while ensuring its dimensions are less than or equal to both those specified.
|
||||||
- `outside`: Preserving aspect ratio, resize the image to be as small as possible while ensuring its dimensions are greater than or equal to both those specified.
|
* `outside`: Preserving aspect ratio, resize the image to be as small as possible while ensuring its dimensions are greater than or equal to both those specified.
|
||||||
Some of these values are based on the [object-fit][1] CSS property.
|
|
||||||
|
Some of these values are based on the [object-fit][1] CSS property.
|
||||||
|
|
||||||
When using a `fit` of `cover` or `contain`, the default **position** is `centre`. Other options are:
|
When using a `fit` of `cover` or `contain`, the default **position** is `centre`. Other options are:
|
||||||
|
|
||||||
- `sharp.position`: `top`, `right top`, `right`, `right bottom`, `bottom`, `left bottom`, `left`, `left top`.
|
* `sharp.position`: `top`, `right top`, `right`, `right bottom`, `bottom`, `left bottom`, `left`, `left top`.
|
||||||
- `sharp.gravity`: `north`, `northeast`, `east`, `southeast`, `south`, `southwest`, `west`, `northwest`, `center` or `centre`.
|
* `sharp.gravity`: `north`, `northeast`, `east`, `southeast`, `south`, `southwest`, `west`, `northwest`, `center` or `centre`.
|
||||||
- `sharp.strategy`: `cover` only, dynamically crop using either the `entropy` or `attention` strategy.
|
* `sharp.strategy`: `cover` only, dynamically crop using either the `entropy` or `attention` strategy.
|
||||||
Some of these values are based on the [object-position][2] CSS property.
|
|
||||||
|
Some of these values are based on the [object-position][2] CSS property.
|
||||||
|
|
||||||
The experimental strategy-based approach resizes so one dimension is at its target length
|
The experimental strategy-based approach resizes so one dimension is at its target length
|
||||||
then repeatedly ranks edge regions, discarding the edge with the lowest score based on the selected strategy.
|
then repeatedly ranks edge regions, discarding the edge with the lowest score based on the selected strategy.
|
||||||
|
|
||||||
- `entropy`: focus on the region with the highest [Shannon entropy][3].
|
* `entropy`: focus on the region with the highest [Shannon entropy][3].
|
||||||
- `attention`: focus on the region with the highest luminance frequency, colour saturation and presence of skin tones.
|
* `attention`: focus on the region with the highest luminance frequency, colour saturation and presence of skin tones.
|
||||||
|
|
||||||
Possible interpolation kernels are:
|
Possible interpolation kernels are:
|
||||||
|
|
||||||
- `nearest`: Use [nearest neighbour interpolation][4].
|
* `nearest`: Use [nearest neighbour interpolation][4].
|
||||||
- `cubic`: Use a [Catmull-Rom spline][5].
|
* `cubic`: Use a [Catmull-Rom spline][5].
|
||||||
- `mitchell`: Use a [Mitchell-Netravali spline][6].
|
* `mitchell`: Use a [Mitchell-Netravali spline][6].
|
||||||
- `lanczos2`: Use a [Lanczos kernel][7] with `a=2`.
|
* `lanczos2`: Use a [Lanczos kernel][7] with `a=2`.
|
||||||
- `lanczos3`: Use a Lanczos kernel with `a=3` (the default).
|
* `lanczos3`: Use a Lanczos kernel with `a=3` (the default).
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `width` **[Number][8]?** pixels wide the resultant image should be. Use `null` or `undefined` to auto-scale the width to match the height.
|
* `width` **[number][8]?** pixels wide the resultant image should be. Use `null` or `undefined` to auto-scale the width to match the height.
|
||||||
- `height` **[Number][8]?** pixels high the resultant image should be. Use `null` or `undefined` to auto-scale the height to match the width.
|
* `height` **[number][8]?** pixels high the resultant image should be. Use `null` or `undefined` to auto-scale the height to match the width.
|
||||||
- `options` **[Object][9]?**
|
* `options` **[Object][9]?**
|
||||||
- `options.width` **[String][10]?** alternative means of specifying `width`. If both are present this take priority.
|
|
||||||
- `options.height` **[String][10]?** alternative means of specifying `height`. If both are present this take priority.
|
* `options.width` **[String][10]?** alternative means of specifying `width`. If both are present this take priority.
|
||||||
- `options.fit` **[String][10]** how the image should be resized to fit both provided dimensions, one of `cover`, `contain`, `fill`, `inside` or `outside`. (optional, default `'cover'`)
|
* `options.height` **[String][10]?** alternative means of specifying `height`. If both are present this take priority.
|
||||||
- `options.position` **[String][10]** position, gravity or strategy to use when `fit` is `cover` or `contain`. (optional, default `'centre'`)
|
* `options.fit` **[String][10]** how the image should be resized to fit both provided dimensions, one of `cover`, `contain`, `fill`, `inside` or `outside`. (optional, default `'cover'`)
|
||||||
- `options.background` **([String][10] \| [Object][9])** background colour when using a `fit` of `contain`, parsed by the [color][11] module, defaults to black without transparency. (optional, default `{r:0,g:0,b:0,alpha:1}`)
|
* `options.position` **[String][10]** position, gravity or strategy to use when `fit` is `cover` or `contain`. (optional, default `'centre'`)
|
||||||
- `options.kernel` **[String][10]** the kernel to use for image reduction. (optional, default `'lanczos3'`)
|
* `options.background` **([String][10] | [Object][9])** background colour when using a `fit` of `contain`, parsed by the [color][11] module, defaults to black without transparency. (optional, default `{r:0,g:0,b:0,alpha:1}`)
|
||||||
- `options.withoutEnlargement` **[Boolean][12]** do not enlarge if the width _or_ height are already less than the specified dimensions, equivalent to GraphicsMagick's `>` geometry option. (optional, default `false`)
|
* `options.kernel` **[String][10]** the kernel to use for image reduction. (optional, default `'lanczos3'`)
|
||||||
- `options.fastShrinkOnLoad` **[Boolean][12]** take greater advantage of the JPEG and WebP shrink-on-load feature, which can lead to a slight moiré pattern on some images. (optional, default `true`)
|
* `options.withoutEnlargement` **[Boolean][12]** do not enlarge if the width *or* height are already less than the specified dimensions, equivalent to GraphicsMagick's `>` geometry option. (optional, default `false`)
|
||||||
|
* `options.fastShrinkOnLoad` **[Boolean][12]** take greater advantage of the JPEG and WebP shrink-on-load feature, which can lead to a slight moiré pattern on some images. (optional, default `true`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -114,7 +117,16 @@ sharp(input)
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][13]** Invalid parameters
|
```javascript
|
||||||
|
const scaleByHalf = await sharp(input)
|
||||||
|
.metadata()
|
||||||
|
.then(({ width }) => sharp(input)
|
||||||
|
.resize(Math.round(width * 0.5))
|
||||||
|
.toBuffer()
|
||||||
|
);
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][13]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
@@ -125,12 +137,13 @@ This operation will always occur after resizing and extraction, if any.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `extend` **([Number][8] \| [Object][9])** single pixel count to add to all edges or an Object with per-edge counts
|
* `extend` **([number][8] | [Object][9])** single pixel count to add to all edges or an Object with per-edge counts
|
||||||
- `extend.top` **[Number][8]?**
|
|
||||||
- `extend.left` **[Number][8]?**
|
* `extend.top` **[number][8]** (optional, default `0`)
|
||||||
- `extend.bottom` **[Number][8]?**
|
* `extend.left` **[number][8]** (optional, default `0`)
|
||||||
- `extend.right` **[Number][8]?**
|
* `extend.bottom` **[number][8]** (optional, default `0`)
|
||||||
- `extend.background` **([String][10] \| [Object][9])** background colour, parsed by the [color][11] module, defaults to black without transparency. (optional, default `{r:0,g:0,b:0,alpha:1}`)
|
* `extend.right` **[number][8]** (optional, default `0`)
|
||||||
|
* `extend.background` **([String][10] | [Object][9])** background colour, parsed by the [color][11] module, defaults to black without transparency. (optional, default `{r:0,g:0,b:0,alpha:1}`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -149,25 +162,36 @@ sharp(input)
|
|||||||
...
|
...
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][13]** Invalid parameters
|
```javascript
|
||||||
|
// Add a row of 10 red pixels to the bottom
|
||||||
|
sharp(input)
|
||||||
|
.extend({
|
||||||
|
bottom: 10,
|
||||||
|
background: 'red'
|
||||||
|
})
|
||||||
|
...
|
||||||
|
```
|
||||||
|
|
||||||
|
* Throws **[Error][13]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
## extract
|
## extract
|
||||||
|
|
||||||
Extract a region of the image.
|
Extract/crop a region of the image.
|
||||||
|
|
||||||
- Use `extract` before `resize` for pre-resize extraction.
|
* Use `extract` before `resize` for pre-resize extraction.
|
||||||
- Use `extract` after `resize` for post-resize extraction.
|
* Use `extract` after `resize` for post-resize extraction.
|
||||||
- Use `extract` before and after for both.
|
* Use `extract` before and after for both.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **[Object][9]** describes the region to extract using integral pixel values
|
* `options` **[Object][9]** describes the region to extract using integral pixel values
|
||||||
- `options.left` **[Number][8]** zero-indexed offset from left edge
|
|
||||||
- `options.top` **[Number][8]** zero-indexed offset from top edge
|
* `options.left` **[number][8]** zero-indexed offset from left edge
|
||||||
- `options.width` **[Number][8]** width of region to extract
|
* `options.top` **[number][8]** zero-indexed offset from top edge
|
||||||
- `options.height` **[Number][8]** height of region to extract
|
* `options.width` **[number][8]** width of region to extract
|
||||||
|
* `options.height` **[number][8]** height of region to extract
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -189,21 +213,25 @@ sharp(input)
|
|||||||
});
|
});
|
||||||
```
|
```
|
||||||
|
|
||||||
- Throws **[Error][13]** Invalid parameters
|
* Throws **[Error][13]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
## trim
|
## trim
|
||||||
|
|
||||||
Trim "boring" pixels from all edges that contain values similar to the top-left pixel.
|
Trim "boring" pixels from all edges that contain values similar to the top-left pixel.
|
||||||
The `info` response Object will contain `trimOffsetLeft` and `trimOffsetTop` properties.
|
Images consisting entirely of a single colour will calculate "boring" using the alpha channel, if any.
|
||||||
|
|
||||||
|
The `info` response Object, obtained from callback of `.toFile()` or `.toBuffer()`,
|
||||||
|
will contain `trimOffsetLeft` and `trimOffsetTop` properties.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `threshold` **[Number][8]** the allowed difference from the top-left pixel, a number greater than zero. (optional, default `10`)
|
* `threshold` **[number][8]** the allowed difference from the top-left pixel, a number greater than zero. (optional, default `10`)
|
||||||
|
|
||||||
|
<!---->
|
||||||
|
|
||||||
- Throws **[Error][13]** Invalid parameters
|
* Throws **[Error][13]** Invalid parameters
|
||||||
|
|
||||||
Returns **Sharp**
|
Returns **Sharp**
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +1,71 @@
|
|||||||
<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
|
<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
|
||||||
|
|
||||||
|
## format
|
||||||
|
|
||||||
|
An Object containing nested boolean values representing the available input and output formats/methods.
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
console.log(sharp.format);
|
||||||
|
```
|
||||||
|
|
||||||
|
Returns **[Object][1]**
|
||||||
|
|
||||||
|
## interpolators
|
||||||
|
|
||||||
|
An Object containing the available interpolators and their proper values
|
||||||
|
|
||||||
|
Type: [string][2]
|
||||||
|
|
||||||
|
### nearest
|
||||||
|
|
||||||
|
[Nearest neighbour interpolation][3]. Suitable for image enlargement only.
|
||||||
|
|
||||||
|
### bilinear
|
||||||
|
|
||||||
|
[Bilinear interpolation][4]. Faster than bicubic but with less smooth results.
|
||||||
|
|
||||||
|
### bicubic
|
||||||
|
|
||||||
|
[Bicubic interpolation][5] (the default).
|
||||||
|
|
||||||
|
### locallyBoundedBicubic
|
||||||
|
|
||||||
|
[LBB interpolation][6]. Prevents some "[acutance][7]" but typically reduces performance by a factor of 2.
|
||||||
|
|
||||||
|
### nohalo
|
||||||
|
|
||||||
|
[Nohalo interpolation][8]. Prevents acutance but typically reduces performance by a factor of 3.
|
||||||
|
|
||||||
|
### vertexSplitQuadraticBasisSpline
|
||||||
|
|
||||||
|
[VSQBS interpolation][9]. Prevents "staircasing" when enlarging.
|
||||||
|
|
||||||
|
## versions
|
||||||
|
|
||||||
|
An Object containing the version numbers of libvips and its dependencies.
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
console.log(sharp.versions);
|
||||||
|
```
|
||||||
|
|
||||||
## cache
|
## cache
|
||||||
|
|
||||||
Gets or, when options are provided, sets the limits of _libvips'_ operation cache.
|
Gets or, when options are provided, sets the limits of *libvips'* operation cache.
|
||||||
Existing entries in the cache will be trimmed after any change in limits.
|
Existing entries in the cache will be trimmed after any change in limits.
|
||||||
This method always returns cache statistics,
|
This method always returns cache statistics,
|
||||||
useful for determining how much working memory is required for a particular task.
|
useful for determining how much working memory is required for a particular task.
|
||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `options` **([Object][1] \| [Boolean][2])** Object with the following attributes, or Boolean where true uses default cache settings and false removes all caching (optional, default `true`)
|
* `options` **([Object][1] | [boolean][10])** Object with the following attributes, or boolean where true uses default cache settings and false removes all caching (optional, default `true`)
|
||||||
- `options.memory` **[Number][3]** is the maximum memory in MB to use for this cache (optional, default `50`)
|
|
||||||
- `options.files` **[Number][3]** is the maximum number of files to hold open (optional, default `20`)
|
* `options.memory` **[number][11]** is the maximum memory in MB to use for this cache (optional, default `50`)
|
||||||
- `options.items` **[Number][3]** is the maximum number of operations to cache (optional, default `100`)
|
* `options.files` **[number][11]** is the maximum number of files to hold open (optional, default `20`)
|
||||||
|
* `options.items` **[number][11]** is the maximum number of operations to cache (optional, default `100`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -31,9 +84,13 @@ Returns **[Object][1]**
|
|||||||
## concurrency
|
## concurrency
|
||||||
|
|
||||||
Gets or, when a concurrency is provided, sets
|
Gets or, when a concurrency is provided, sets
|
||||||
the number of threads _libvips'_ should create to process each image.
|
the number of threads *libvips'* should create to process each image.
|
||||||
The default value is the number of CPU cores.
|
|
||||||
A value of `0` will reset to this default.
|
The default value is the number of CPU cores,
|
||||||
|
except when using glibc-based Linux without jemalloc,
|
||||||
|
where the default is `1` to help reduce memory fragmentation.
|
||||||
|
|
||||||
|
A value of `0` will reset this to the number of CPU cores.
|
||||||
|
|
||||||
The maximum number of images that can be processed in parallel
|
The maximum number of images that can be processed in parallel
|
||||||
is limited by libuv's `UV_THREADPOOL_SIZE` environment variable.
|
is limited by libuv's `UV_THREADPOOL_SIZE` environment variable.
|
||||||
@@ -42,7 +99,7 @@ This method always returns the current concurrency.
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `concurrency` **[Number][3]?**
|
* `concurrency` **[number][11]?**
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -52,14 +109,29 @@ sharp.concurrency(2); // 2
|
|||||||
sharp.concurrency(0); // 4
|
sharp.concurrency(0); // 4
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **[Number][3]** concurrency
|
Returns **[number][11]** concurrency
|
||||||
|
|
||||||
|
## queue
|
||||||
|
|
||||||
|
An EventEmitter that emits a `change` event when a task is either:
|
||||||
|
|
||||||
|
* queued, waiting for *libuv* to provide a worker thread
|
||||||
|
* complete
|
||||||
|
|
||||||
|
### Examples
|
||||||
|
|
||||||
|
```javascript
|
||||||
|
sharp.queue.on('change', function(queueLength) {
|
||||||
|
console.log('Queue contains ' + queueLength + ' task(s)');
|
||||||
|
});
|
||||||
|
```
|
||||||
|
|
||||||
## counters
|
## counters
|
||||||
|
|
||||||
Provides access to internal task counters.
|
Provides access to internal task counters.
|
||||||
|
|
||||||
- queue is the number of tasks this module has queued waiting for _libuv_ to provide a worker thread from its pool.
|
* queue is the number of tasks this module has queued waiting for *libuv* to provide a worker thread from its pool.
|
||||||
- process is the number of resize tasks currently being processed.
|
* process is the number of resize tasks currently being processed.
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -79,7 +151,7 @@ by taking advantage of the SIMD vector unit of the CPU, e.g. Intel SSE and ARM N
|
|||||||
|
|
||||||
### Parameters
|
### Parameters
|
||||||
|
|
||||||
- `simd` **[Boolean][2]** (optional, default `true`)
|
* `simd` **[boolean][10]** (optional, default `true`)
|
||||||
|
|
||||||
### Examples
|
### Examples
|
||||||
|
|
||||||
@@ -93,10 +165,26 @@ const simd = sharp.simd(false);
|
|||||||
// prevent libvips from using liborc at runtime
|
// prevent libvips from using liborc at runtime
|
||||||
```
|
```
|
||||||
|
|
||||||
Returns **[Boolean][2]**
|
Returns **[boolean][10]**
|
||||||
|
|
||||||
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
[1]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object
|
||||||
|
|
||||||
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
[2]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String
|
||||||
|
|
||||||
[3]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
[3]: http://en.wikipedia.org/wiki/Nearest-neighbor_interpolation
|
||||||
|
|
||||||
|
[4]: http://en.wikipedia.org/wiki/Bilinear_interpolation
|
||||||
|
|
||||||
|
[5]: http://en.wikipedia.org/wiki/Bicubic_interpolation
|
||||||
|
|
||||||
|
[6]: https://github.com/jcupitt/libvips/blob/master/libvips/resample/lbb.cpp#L100
|
||||||
|
|
||||||
|
[7]: http://en.wikipedia.org/wiki/Acutance
|
||||||
|
|
||||||
|
[8]: http://eprints.soton.ac.uk/268086/
|
||||||
|
|
||||||
|
[9]: https://github.com/jcupitt/libvips/blob/master/libvips/resample/vsqbs.cpp#L48
|
||||||
|
|
||||||
|
[10]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean
|
||||||
|
|
||||||
|
[11]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Number
|
||||||
|
|||||||
25
docs/build.js
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
const fs = require('fs').promises;
|
||||||
|
const path = require('path');
|
||||||
|
const documentation = require('documentation');
|
||||||
|
|
||||||
|
[
|
||||||
|
'constructor',
|
||||||
|
'input',
|
||||||
|
'resize',
|
||||||
|
'composite',
|
||||||
|
'operation',
|
||||||
|
'colour',
|
||||||
|
'channel',
|
||||||
|
'output',
|
||||||
|
'utility'
|
||||||
|
].forEach(async (m) => {
|
||||||
|
const input = path.join('lib', `${m}.js`);
|
||||||
|
const output = path.join('docs', `api-${m}.md`);
|
||||||
|
|
||||||
|
const ast = await documentation.build(input, { shallow: true });
|
||||||
|
const markdown = await documentation.formats.md(ast, { markdownToc: false });
|
||||||
|
|
||||||
|
await fs.writeFile(output, markdown);
|
||||||
|
});
|
||||||
@@ -1,10 +1,429 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
### v0.22 - "*uptake*"
|
## v0.28 - *bijou*
|
||||||
|
|
||||||
|
Requires libvips v8.10.6
|
||||||
|
|
||||||
|
### v0.28.3 - 24th May 2021
|
||||||
|
|
||||||
|
* Ensure presence of libvips, vendored or global, before invoking node-gyp.
|
||||||
|
|
||||||
|
* Skip shrink-on-load for multi-page WebP.
|
||||||
|
[#2714](https://github.com/lovell/sharp/issues/2714)
|
||||||
|
|
||||||
|
* Add contrast limiting adaptive histogram equalization (CLAHE) operator.
|
||||||
|
[#2726](https://github.com/lovell/sharp/pull/2726)
|
||||||
|
[@baparham](https://github.com/baparham)
|
||||||
|
|
||||||
|
### v0.28.2 - 10th May 2021
|
||||||
|
|
||||||
|
* Allow `withMetadata` to set `density`.
|
||||||
|
[#967](https://github.com/lovell/sharp/issues/967)
|
||||||
|
|
||||||
|
* Skip shrink-on-load where one dimension <4px.
|
||||||
|
[#2653](https://github.com/lovell/sharp/issues/2653)
|
||||||
|
|
||||||
|
* Allow escaped proxy credentials.
|
||||||
|
[#2664](https://github.com/lovell/sharp/pull/2664)
|
||||||
|
[@msalettes](https://github.com/msalettes)
|
||||||
|
|
||||||
|
* Add `premultiplied` flag for raw pixel data input.
|
||||||
|
[#2685](https://github.com/lovell/sharp/pull/2685)
|
||||||
|
[@mnutt](https://github.com/mnutt)
|
||||||
|
|
||||||
|
* Detect empty input and throw a helpful error.
|
||||||
|
[#2687](https://github.com/lovell/sharp/pull/2687)
|
||||||
|
[@JakobJingleheimer](https://github.com/JakobJingleheimer)
|
||||||
|
|
||||||
|
* Add install-time flag to skip version compatibility checks.
|
||||||
|
[#2692](https://github.com/lovell/sharp/pull/2692)
|
||||||
|
[@xemle](https://github.com/xemle)
|
||||||
|
|
||||||
|
### v0.28.1 - 5th April 2021
|
||||||
|
|
||||||
|
* Ensure all installation errors are logged with a more obvious prefix.
|
||||||
|
|
||||||
|
* Allow `withMetadata` to set and update EXIF metadata.
|
||||||
|
[#650](https://github.com/lovell/sharp/issues/650)
|
||||||
|
|
||||||
|
* Add support for OME-TIFF Sub Image File Directories (subIFD).
|
||||||
|
[#2557](https://github.com/lovell/sharp/issues/2557)
|
||||||
|
|
||||||
|
* Allow `ensureAlpha` to set the alpha transparency level.
|
||||||
|
[#2634](https://github.com/lovell/sharp/issues/2634)
|
||||||
|
|
||||||
|
### v0.28.0 - 29th March 2021
|
||||||
|
|
||||||
|
* Prebuilt binaries now include mozjpeg and libimagequant (BSD 2-Clause).
|
||||||
|
|
||||||
|
* Prebuilt binaries limit AVIF support to the most common 8-bit depth.
|
||||||
|
|
||||||
|
* Add `mozjpeg` option to `jpeg` method, sets mozjpeg defaults.
|
||||||
|
|
||||||
|
* Reduce the default PNG `compressionLevel` to the more commonly used 6.
|
||||||
|
|
||||||
|
* Reduce concurrency on glibc-based Linux when using the default memory allocator to help prevent fragmentation.
|
||||||
|
|
||||||
|
* Default missing edge properties of extend operation to zero.
|
||||||
|
[#2578](https://github.com/lovell/sharp/issues/2578)
|
||||||
|
|
||||||
|
* Ensure composite does not clip top and left offsets.
|
||||||
|
[#2594](https://github.com/lovell/sharp/pull/2594)
|
||||||
|
[@SHG42](https://github.com/SHG42)
|
||||||
|
|
||||||
|
* Improve error handling of network failure at install time.
|
||||||
|
[#2608](https://github.com/lovell/sharp/pull/2608)
|
||||||
|
[@abradley](https://github.com/abradley)
|
||||||
|
|
||||||
|
* Ensure `@id` attribute can be set for IIIF tile-based output.
|
||||||
|
[#2612](https://github.com/lovell/sharp/issues/2612)
|
||||||
|
[@edsilv](https://github.com/edsilv)
|
||||||
|
|
||||||
|
* Ensure composite replicates the correct number of tiles for centred gravities.
|
||||||
|
[#2626](https://github.com/lovell/sharp/issues/2626)
|
||||||
|
|
||||||
|
## v0.27 - *avif*
|
||||||
|
|
||||||
|
Requires libvips v8.10.5
|
||||||
|
|
||||||
|
### v0.27.2 - 22nd February 2021
|
||||||
|
|
||||||
|
* macOS: Prevent use of globally-installed ARM64 libvips with Rosetta x64 emulation.
|
||||||
|
[#2460](https://github.com/lovell/sharp/issues/2460)
|
||||||
|
|
||||||
|
* Linux (musl): Prevent use of prebuilt linuxmusl-x64 binaries with musl >= 1.2.0.
|
||||||
|
[#2570](https://github.com/lovell/sharp/issues/2570)
|
||||||
|
|
||||||
|
* Improve 16-bit grey+alpha support by using libvips' `has_alpha` detection.
|
||||||
|
[#2569](https://github.com/lovell/sharp/issues/2569)
|
||||||
|
|
||||||
|
* Allow the use of non lower case extensions with `toFormat`.
|
||||||
|
[#2581](https://github.com/lovell/sharp/pull/2581)
|
||||||
|
[@florian-busch](https://github.com/florian-busch)
|
||||||
|
|
||||||
|
* Allow use of `recomb` operation with single channel input.
|
||||||
|
[#2584](https://github.com/lovell/sharp/issues/2584)
|
||||||
|
|
||||||
|
### v0.27.1 - 27th January 2021
|
||||||
|
|
||||||
|
* Ensure TIFF is cast when using float predictor.
|
||||||
|
[#2502](https://github.com/lovell/sharp/pull/2502)
|
||||||
|
[@randyridge](https://github.com/randyridge)
|
||||||
|
|
||||||
|
* Add support for Uint8Array and Uint8ClampedArray input.
|
||||||
|
[#2511](https://github.com/lovell/sharp/pull/2511)
|
||||||
|
[@leon](https://github.com/leon)
|
||||||
|
|
||||||
|
* Revert: ensure all platforms use fontconfig for font rendering.
|
||||||
|
[#2515](https://github.com/lovell/sharp/issues/2515)
|
||||||
|
|
||||||
|
* Expose libvips gaussnoise operation to allow creation of Gaussian noise.
|
||||||
|
[#2527](https://github.com/lovell/sharp/pull/2527)
|
||||||
|
[@alza54](https://github.com/alza54)
|
||||||
|
|
||||||
|
### v0.27.0 - 22nd December 2020
|
||||||
|
|
||||||
|
* Add support for AVIF to prebuilt binaries.
|
||||||
|
|
||||||
|
* Remove experimental status from `heif` output, defaults are now AVIF-centric.
|
||||||
|
|
||||||
|
* Allow negative top/left offsets for composite operation.
|
||||||
|
[#2391](https://github.com/lovell/sharp/pull/2391)
|
||||||
|
[@CurosMJ](https://github.com/CurosMJ)
|
||||||
|
|
||||||
|
* Ensure all platforms use fontconfig for font rendering.
|
||||||
|
[#2399](https://github.com/lovell/sharp/issues/2399)
|
||||||
|
|
||||||
|
## v0.26 - *zoom*
|
||||||
|
|
||||||
|
Requires libvips v8.10.0
|
||||||
|
|
||||||
|
### v0.26.3 - 16th November 2020
|
||||||
|
|
||||||
|
* Expose libvips' affine operation.
|
||||||
|
[#2336](https://github.com/lovell/sharp/pull/2336)
|
||||||
|
[@guillevc](https://github.com/guillevc)
|
||||||
|
|
||||||
|
* Fallback to tar.gz for prebuilt libvips when Brotli not available.
|
||||||
|
[#2412](https://github.com/lovell/sharp/pull/2412)
|
||||||
|
[@ascorbic](https://github.com/ascorbic)
|
||||||
|
|
||||||
|
### v0.26.2 - 14th October 2020
|
||||||
|
|
||||||
|
* Add support for EXR input. Requires libvips compiled with OpenEXR.
|
||||||
|
[#698](https://github.com/lovell/sharp/issues/698)
|
||||||
|
|
||||||
|
* Ensure support for yarn v2.
|
||||||
|
[#2379](https://github.com/lovell/sharp/pull/2379)
|
||||||
|
[@jalovatt](https://github.com/jalovatt)
|
||||||
|
|
||||||
|
* Add centre/center option to tile-based output.
|
||||||
|
[#2397](https://github.com/lovell/sharp/pull/2397)
|
||||||
|
[@beig](https://github.com/beig)
|
||||||
|
|
||||||
|
### v0.26.1 - 20th September 2020
|
||||||
|
|
||||||
|
* Ensure correct pageHeight when verifying multi-page image dimensions.
|
||||||
|
[#2343](https://github.com/lovell/sharp/pull/2343)
|
||||||
|
[@derom](https://github.com/derom)
|
||||||
|
|
||||||
|
* Allow input density range up to 100000 DPI.
|
||||||
|
[#2348](https://github.com/lovell/sharp/pull/2348)
|
||||||
|
[@stefanprobst](https://github.com/stefanprobst)
|
||||||
|
|
||||||
|
* Ensure animation-related properties can be set for Stream-based input.
|
||||||
|
[#2369](https://github.com/lovell/sharp/pull/2369)
|
||||||
|
[@AcrylicShrimp](https://github.com/AcrylicShrimp)
|
||||||
|
|
||||||
|
* Ensure `stats` can be calculated for 1x1 input.
|
||||||
|
[#2372](https://github.com/lovell/sharp/issues/2372)
|
||||||
|
|
||||||
|
* Ensure animated GIF output is optimised.
|
||||||
|
[#2376](https://github.com/lovell/sharp/issues/2376)
|
||||||
|
|
||||||
|
### v0.26.0 - 25th August 2020
|
||||||
|
|
||||||
|
* Prebuilt libvips binaries are now statically-linked and Brotli-compressed, requiring Node.js 10.16.0+.
|
||||||
|
|
||||||
|
* TIFF output `squash` is replaced by `bitdepth` to reduce to 1, 2 or 4 bit.
|
||||||
|
|
||||||
|
* JPEG output `quality` >= 90 no longer automatically sets `chromaSubsampling` to `4:4:4`.
|
||||||
|
|
||||||
|
* Add most `dominant` colour to image `stats`.
|
||||||
|
[#640](https://github.com/lovell/sharp/issues/640)
|
||||||
|
|
||||||
|
* Add support for animated GIF (requires \*magick) and WebP output.
|
||||||
|
[#2012](https://github.com/lovell/sharp/pull/2012)
|
||||||
|
[@deftomat](https://github.com/deftomat)
|
||||||
|
|
||||||
|
* Add support for libvips ImageMagick v7 loaders.
|
||||||
|
[#2258](https://github.com/lovell/sharp/pull/2258)
|
||||||
|
[@vouillon](https://github.com/vouillon)
|
||||||
|
|
||||||
|
* Allow multi-page input via \*magick.
|
||||||
|
[#2259](https://github.com/lovell/sharp/pull/2259)
|
||||||
|
[@vouillon](https://github.com/vouillon)
|
||||||
|
|
||||||
|
* Add support to `withMetadata` for custom ICC profile.
|
||||||
|
[#2271](https://github.com/lovell/sharp/pull/2271)
|
||||||
|
[@roborourke](https://github.com/roborourke)
|
||||||
|
|
||||||
|
* Ensure prebuilt binaries for ARM default to v7 when using Electron.
|
||||||
|
[#2292](https://github.com/lovell/sharp/pull/2292)
|
||||||
|
[@diegodev3](https://github.com/diegodev3)
|
||||||
|
|
||||||
|
## v0.25 - *yield*
|
||||||
|
|
||||||
|
Requires libvips v8.9.1
|
||||||
|
|
||||||
|
### v0.25.4 - 12th June 2020
|
||||||
|
|
||||||
|
* Allow libvips binary location override where version is appended.
|
||||||
|
[#2217](https://github.com/lovell/sharp/pull/2217)
|
||||||
|
[@malice00](https://github.com/malice00)
|
||||||
|
|
||||||
|
* Enable PNG palette when setting quality, colours, colors or dither.
|
||||||
|
[#2226](https://github.com/lovell/sharp/pull/2226)
|
||||||
|
[@romaleev](https://github.com/romaleev)
|
||||||
|
|
||||||
|
* Add `level` constructor option to use a specific level of a multi-level image.
|
||||||
|
Expose `levels` metadata for multi-level images.
|
||||||
|
[#2222](https://github.com/lovell/sharp/issues/2222)
|
||||||
|
|
||||||
|
* Add support for named `alpha` channel to `extractChannel` operation.
|
||||||
|
[#2138](https://github.com/lovell/sharp/issues/2138)
|
||||||
|
|
||||||
|
* Add experimental `sharpness` calculation to `stats()` response.
|
||||||
|
[#2251](https://github.com/lovell/sharp/issues/2251)
|
||||||
|
|
||||||
|
* Emit `warning` event for non-critical processing problems.
|
||||||
|
[#2032](https://github.com/lovell/sharp/issues/2032)
|
||||||
|
|
||||||
|
### v0.25.3 - 17th May 2020
|
||||||
|
|
||||||
|
* Ensure libvips is initialised only once, improves worker thread safety.
|
||||||
|
[#2143](https://github.com/lovell/sharp/issues/2143)
|
||||||
|
|
||||||
|
* Ensure npm platform flag is respected when copying DLLs.
|
||||||
|
[#2188](https://github.com/lovell/sharp/pull/2188)
|
||||||
|
[@dimadeveatii](https://github.com/dimadeveatii)
|
||||||
|
|
||||||
|
* Allow SVG input with large inline images to be parsed.
|
||||||
|
[#2195](https://github.com/lovell/sharp/issues/2195)
|
||||||
|
|
||||||
|
### v0.25.2 - 20th March 2020
|
||||||
|
|
||||||
|
* Provide prebuilt binaries for Linux ARM64v8.
|
||||||
|
|
||||||
|
* Add IIIF layout support to tile-based output.
|
||||||
|
[#2098](https://github.com/lovell/sharp/pull/2098)
|
||||||
|
[@edsilv](https://github.com/edsilv)
|
||||||
|
|
||||||
|
* Ensure input options are consistently and correctly detected.
|
||||||
|
[#2118](https://github.com/lovell/sharp/issues/2118)
|
||||||
|
|
||||||
|
* Ensure N-API prebuilt binaries work on RHEL7 and its derivatives.
|
||||||
|
[#2119](https://github.com/lovell/sharp/issues/2119)
|
||||||
|
|
||||||
|
* Ensure AsyncWorker options are persisted.
|
||||||
|
[#2130](https://github.com/lovell/sharp/issues/2130)
|
||||||
|
|
||||||
|
### v0.25.1 - 7th March 2020
|
||||||
|
|
||||||
|
* Ensure prebuilt binaries are fetched based on N-API version.
|
||||||
|
[#2117](https://github.com/lovell/sharp/issues/2117)
|
||||||
|
|
||||||
|
### v0.25.0 - 7th March 2020
|
||||||
|
|
||||||
|
* Remove `limitInputPixels` and `sequentialRead` previously deprecated in v0.24.0.
|
||||||
|
|
||||||
|
* Migrate internals to N-API.
|
||||||
|
[#1282](https://github.com/lovell/sharp/issues/1282)
|
||||||
|
|
||||||
|
* Add support for 32-bit Windows.
|
||||||
|
[#2088](https://github.com/lovell/sharp/issues/2088)
|
||||||
|
|
||||||
|
* Ensure correct ordering of rotate-then-trim operations.
|
||||||
|
[#2087](https://github.com/lovell/sharp/issues/2087)
|
||||||
|
|
||||||
|
* Ensure composite accepts `limitInputPixels` and `sequentialRead` input options.
|
||||||
|
[#2099](https://github.com/lovell/sharp/issues/2099)
|
||||||
|
|
||||||
|
## v0.24 - "*wit*"
|
||||||
|
|
||||||
|
Requires libvips v8.9.0.
|
||||||
|
|
||||||
|
### v0.24.1 - 15<sup>th</sup> February 2020
|
||||||
|
|
||||||
|
* Prevent use of sequentialRead for EXIF-based rotate operation.
|
||||||
|
[#2042](https://github.com/lovell/sharp/issues/2042)
|
||||||
|
|
||||||
|
* Ensure RGBA LZW TIFF returns correct channel count.
|
||||||
|
[#2064](https://github.com/lovell/sharp/issues/2064)
|
||||||
|
|
||||||
|
### v0.24.0 - 16<sup>th</sup> January 2020
|
||||||
|
|
||||||
|
* Drop support for Node.js 8.
|
||||||
|
[#1910](https://github.com/lovell/sharp/issues/1910)
|
||||||
|
|
||||||
|
* Drop support for undefined input where options also provided.
|
||||||
|
[#1768](https://github.com/lovell/sharp/issues/1768)
|
||||||
|
|
||||||
|
* Move `limitInputPixels` and `sequentialRead` to input options, deprecating functions of the same name.
|
||||||
|
|
||||||
|
* Expose `delay` and `loop` metadata for animated images.
|
||||||
|
[#1905](https://github.com/lovell/sharp/issues/1905)
|
||||||
|
|
||||||
|
* Ensure correct colour output for 16-bit, 2-channel PNG input with ICC profile.
|
||||||
|
[#2013](https://github.com/lovell/sharp/issues/2013)
|
||||||
|
|
||||||
|
* Prevent use of sequentialRead for rotate operations.
|
||||||
|
[#2016](https://github.com/lovell/sharp/issues/2016)
|
||||||
|
|
||||||
|
* Correctly bind max width and height values when using withoutEnlargement.
|
||||||
|
[#2024](https://github.com/lovell/sharp/pull/2024)
|
||||||
|
[@BrychanOdlum](https://github.com/BrychanOdlum)
|
||||||
|
|
||||||
|
* Add support for input with 16-bit RGB profile.
|
||||||
|
[#2037](https://github.com/lovell/sharp/issues/2037)
|
||||||
|
|
||||||
|
## v0.23 - "*vision*"
|
||||||
|
|
||||||
|
Requires libvips v8.8.1.
|
||||||
|
|
||||||
|
### v0.23.4 - 5<sup>th</sup> December 2019
|
||||||
|
|
||||||
|
* Handle zero-length Buffer objects when using Node.js v13.2.0+.
|
||||||
|
|
||||||
|
* Expose raw TIFFTAG_PHOTOSHOP metadata.
|
||||||
|
[#1600](https://github.com/lovell/sharp/issues/1600)
|
||||||
|
|
||||||
|
* Improve thread safety by using copy-on-write when updating metadata.
|
||||||
|
[#1986](https://github.com/lovell/sharp/issues/1986)
|
||||||
|
|
||||||
|
### v0.23.3 - 17<sup>th</sup> November 2019
|
||||||
|
|
||||||
|
* Ensure `trim` operation supports images contained in the alpha channel.
|
||||||
|
[#1597](https://github.com/lovell/sharp/issues/1597)
|
||||||
|
|
||||||
|
* Ensure tile `overlap` option works as expected.
|
||||||
|
[#1921](https://github.com/lovell/sharp/pull/1921)
|
||||||
|
[@rustyguts](https://github.com/rustyguts)
|
||||||
|
|
||||||
|
* Allow compilation on FreeBSD and variants (broken since v0.23.0)
|
||||||
|
[#1952](https://github.com/lovell/sharp/pull/1952)
|
||||||
|
[@pouya-eghbali](https://github.com/pouya-eghbali)
|
||||||
|
|
||||||
|
* Ensure `modulate` and other colour-based operations can co-exist.
|
||||||
|
[#1958](https://github.com/lovell/sharp/issues/1958)
|
||||||
|
|
||||||
|
### v0.23.2 - 28<sup>th</sup> October 2019
|
||||||
|
|
||||||
|
* Add `background` option to tile output operation.
|
||||||
|
[#1924](https://github.com/lovell/sharp/pull/1924)
|
||||||
|
[@neave](https://github.com/neave)
|
||||||
|
|
||||||
|
* Add support for Node.js 13.
|
||||||
|
[#1932](https://github.com/lovell/sharp/pull/1932)
|
||||||
|
[@MayhemYDG](https://github.com/MayhemYDG)
|
||||||
|
|
||||||
|
### v0.23.1 - 26<sup>th</sup> September 2019
|
||||||
|
|
||||||
|
* Ensure `sharp.format.vips` is present and correct (filesystem only).
|
||||||
|
[#1813](https://github.com/lovell/sharp/issues/1813)
|
||||||
|
|
||||||
|
* Ensure invalid `width` and `height` provided as options to `resize` throw.
|
||||||
|
[#1817](https://github.com/lovell/sharp/issues/1817)
|
||||||
|
|
||||||
|
* Allow use of 'heic' and 'heif' identifiers with `toFormat`.
|
||||||
|
[#1834](https://github.com/lovell/sharp/pull/1834)
|
||||||
|
[@jaubourg](https://github.com/jaubourg)
|
||||||
|
|
||||||
|
* Add `premultiplied` option to `composite` operation.
|
||||||
|
[#1835](https://github.com/lovell/sharp/pull/1835)
|
||||||
|
[@Andargor](https://github.com/Andargor)
|
||||||
|
|
||||||
|
* Allow instance reuse with differing `toBuffer` options.
|
||||||
|
[#1860](https://github.com/lovell/sharp/pull/1860)
|
||||||
|
[@RaboliotTheGrey](https://github.com/RaboliotTheGrey)
|
||||||
|
|
||||||
|
* Ensure image is at least 3x3 pixels before attempting trim operation.
|
||||||
|
|
||||||
|
### v0.23.0 - 29<sup>th</sup> July 2019
|
||||||
|
|
||||||
|
* Remove `overlayWith` previously deprecated in v0.22.0.
|
||||||
|
|
||||||
|
* Add experimental support for HEIF images. Requires libvips compiled with libheif.
|
||||||
|
[#1105](https://github.com/lovell/sharp/issues/1105)
|
||||||
|
|
||||||
|
* Expose libwebp `smartSubsample` and `reductionEffort` options.
|
||||||
|
[#1545](https://github.com/lovell/sharp/issues/1545)
|
||||||
|
|
||||||
|
* Add experimental support for Worker Threads.
|
||||||
|
[#1558](https://github.com/lovell/sharp/issues/1558)
|
||||||
|
|
||||||
|
* Use libvips' built-in CMYK and sRGB profiles when required.
|
||||||
|
[#1619](https://github.com/lovell/sharp/issues/1619)
|
||||||
|
|
||||||
|
* Drop support for Node.js versions 6 and 11.
|
||||||
|
[#1674](https://github.com/lovell/sharp/issues/1674)
|
||||||
|
|
||||||
|
* Expose `skipBlanks` option for tile-based output.
|
||||||
|
[#1687](https://github.com/lovell/sharp/pull/1687)
|
||||||
|
[@RaboliotTheGrey](https://github.com/RaboliotTheGrey)
|
||||||
|
|
||||||
|
* Allow use of `failOnError` option with Stream-based input.
|
||||||
|
[#1691](https://github.com/lovell/sharp/issues/1691)
|
||||||
|
|
||||||
|
* Fix rotate/extract ordering for non-90 angles.
|
||||||
|
[#1755](https://github.com/lovell/sharp/pull/1755)
|
||||||
|
[@iovdin](https://github.com/iovdin)
|
||||||
|
|
||||||
|
## v0.22 - "*uptake*"
|
||||||
|
|
||||||
Requires libvips v8.7.4.
|
Requires libvips v8.7.4.
|
||||||
|
|
||||||
#### v0.22.1 - 25<sup>th</sup> April 2019
|
### v0.22.1 - 25<sup>th</sup> April 2019
|
||||||
|
|
||||||
* Add `modulate` operation for brightness, saturation and hue.
|
* Add `modulate` operation for brightness, saturation and hue.
|
||||||
[#1601](https://github.com/lovell/sharp/pull/1601)
|
[#1601](https://github.com/lovell/sharp/pull/1601)
|
||||||
@@ -17,7 +436,7 @@ Requires libvips v8.7.4.
|
|||||||
* Add support for Node 12.
|
* Add support for Node 12.
|
||||||
[#1668](https://github.com/lovell/sharp/issues/1668)
|
[#1668](https://github.com/lovell/sharp/issues/1668)
|
||||||
|
|
||||||
#### v0.22.0 - 18<sup>th</sup> March 2019
|
### v0.22.0 - 18<sup>th</sup> March 2019
|
||||||
|
|
||||||
* Remove functions previously deprecated in v0.21.0:
|
* Remove functions previously deprecated in v0.21.0:
|
||||||
`background`, `crop`, `embed`, `ignoreAspectRatio`, `max`, `min` and `withoutEnlargement`.
|
`background`, `crop`, `embed`, `ignoreAspectRatio`, `max`, `min` and `withoutEnlargement`.
|
||||||
@@ -35,18 +454,18 @@ Requires libvips v8.7.4.
|
|||||||
[#1595](https://github.com/lovell/sharp/pull/1595)
|
[#1595](https://github.com/lovell/sharp/pull/1595)
|
||||||
[@ramiel](https://github.com/ramiel)
|
[@ramiel](https://github.com/ramiel)
|
||||||
|
|
||||||
### v0.21 - "*teeth*"
|
## v0.21 - "*teeth*"
|
||||||
|
|
||||||
Requires libvips v8.7.0.
|
Requires libvips v8.7.0.
|
||||||
|
|
||||||
#### v0.21.3 - 19<sup>th</sup> January 2019
|
### v0.21.3 - 19<sup>th</sup> January 2019
|
||||||
|
|
||||||
* Input image decoding now fails fast, set `failOnError` to change this behaviour.
|
* Input image decoding now fails fast, set `failOnError` to change this behaviour.
|
||||||
|
|
||||||
* Failed filesystem-based input now separates missing file and invalid format errors.
|
* Failed filesystem-based input now separates missing file and invalid format errors.
|
||||||
[#1542](https://github.com/lovell/sharp/issues/1542)
|
[#1542](https://github.com/lovell/sharp/issues/1542)
|
||||||
|
|
||||||
#### v0.21.2 - 13<sup>th</sup> January 2019
|
### v0.21.2 - 13<sup>th</sup> January 2019
|
||||||
|
|
||||||
* Ensure all metadata is removed from PNG output unless `withMetadata` used.
|
* Ensure all metadata is removed from PNG output unless `withMetadata` used.
|
||||||
|
|
||||||
@@ -71,7 +490,7 @@ Requires libvips v8.7.0.
|
|||||||
* Ensure forced output format applied correctly when output chaining.
|
* Ensure forced output format applied correctly when output chaining.
|
||||||
[#1528](https://github.com/lovell/sharp/issues/1528)
|
[#1528](https://github.com/lovell/sharp/issues/1528)
|
||||||
|
|
||||||
#### v0.21.1 - 7<sup>th</sup> December 2018
|
### v0.21.1 - 7<sup>th</sup> December 2018
|
||||||
|
|
||||||
* Install: support `sharp_dist_base_url` npm config, like existing `SHARP_DIST_BASE_URL`.
|
* Install: support `sharp_dist_base_url` npm config, like existing `SHARP_DIST_BASE_URL`.
|
||||||
[#1422](https://github.com/lovell/sharp/pull/1422)
|
[#1422](https://github.com/lovell/sharp/pull/1422)
|
||||||
@@ -100,7 +519,7 @@ Requires libvips v8.7.0.
|
|||||||
[#1483](https://github.com/lovell/sharp/pull/1483)
|
[#1483](https://github.com/lovell/sharp/pull/1483)
|
||||||
[@mbklein](https://github.com/mbklein)
|
[@mbklein](https://github.com/mbklein)
|
||||||
|
|
||||||
#### v0.21.0 - 4<sup>th</sup> October 2018
|
### v0.21.0 - 4<sup>th</sup> October 2018
|
||||||
|
|
||||||
* Deprecate the following resize-related functions:
|
* Deprecate the following resize-related functions:
|
||||||
`crop`, `embed`, `ignoreAspectRatio`, `max`, `min` and `withoutEnlargement`.
|
`crop`, `embed`, `ignoreAspectRatio`, `max`, `min` and `withoutEnlargement`.
|
||||||
@@ -137,11 +556,11 @@ Requires libvips v8.7.0.
|
|||||||
[#1385](https://github.com/lovell/sharp/pull/1385)
|
[#1385](https://github.com/lovell/sharp/pull/1385)
|
||||||
[@freezy](https://github.com/freezy)
|
[@freezy](https://github.com/freezy)
|
||||||
|
|
||||||
### v0.20 - "*prebuild*"
|
## v0.20 - "*prebuild*"
|
||||||
|
|
||||||
Requires libvips v8.6.1.
|
Requires libvips v8.6.1.
|
||||||
|
|
||||||
#### v0.20.8 - 5<sup>th</sup> September 2018
|
### v0.20.8 - 5<sup>th</sup> September 2018
|
||||||
|
|
||||||
* Avoid race conditions when creating directories during installation.
|
* Avoid race conditions when creating directories during installation.
|
||||||
[#1358](https://github.com/lovell/sharp/pull/1358)
|
[#1358](https://github.com/lovell/sharp/pull/1358)
|
||||||
@@ -151,12 +570,12 @@ Requires libvips v8.6.1.
|
|||||||
[#1362](https://github.com/lovell/sharp/pull/1362)
|
[#1362](https://github.com/lovell/sharp/pull/1362)
|
||||||
[@aeirola](https://github.com/aeirola)
|
[@aeirola](https://github.com/aeirola)
|
||||||
|
|
||||||
#### v0.20.7 - 21<sup>st</sup> August 2018
|
### v0.20.7 - 21<sup>st</sup> August 2018
|
||||||
|
|
||||||
* Use copy+unlink if rename operation fails during installation.
|
* Use copy+unlink if rename operation fails during installation.
|
||||||
[#1345](https://github.com/lovell/sharp/issues/1345)
|
[#1345](https://github.com/lovell/sharp/issues/1345)
|
||||||
|
|
||||||
#### v0.20.6 - 20<sup>th</sup> August 2018
|
### v0.20.6 - 20<sup>th</sup> August 2018
|
||||||
|
|
||||||
* Add removeAlpha operation to remove alpha channel, if any.
|
* Add removeAlpha operation to remove alpha channel, if any.
|
||||||
[#1248](https://github.com/lovell/sharp/issues/1248)
|
[#1248](https://github.com/lovell/sharp/issues/1248)
|
||||||
@@ -187,13 +606,13 @@ Requires libvips v8.6.1.
|
|||||||
|
|
||||||
* Add experimental entropy field to stats response.
|
* Add experimental entropy field to stats response.
|
||||||
|
|
||||||
#### v0.20.5 - 27<sup>th</sup> June 2018
|
### v0.20.5 - 27<sup>th</sup> June 2018
|
||||||
|
|
||||||
* Expose libjpeg optimize_coding flag.
|
* Expose libjpeg optimize_coding flag.
|
||||||
[#1265](https://github.com/lovell/sharp/pull/1265)
|
[#1265](https://github.com/lovell/sharp/pull/1265)
|
||||||
[@tomlokhorst](https://github.com/tomlokhorst)
|
[@tomlokhorst](https://github.com/tomlokhorst)
|
||||||
|
|
||||||
#### v0.20.4 - 20<sup>th</sup> June 2018
|
### v0.20.4 - 20<sup>th</sup> June 2018
|
||||||
|
|
||||||
* Prevent possible rounding error when using shrink-on-load and 90/270 degree rotation.
|
* Prevent possible rounding error when using shrink-on-load and 90/270 degree rotation.
|
||||||
[#1241](https://github.com/lovell/sharp/issues/1241)
|
[#1241](https://github.com/lovell/sharp/issues/1241)
|
||||||
@@ -203,13 +622,13 @@ Requires libvips v8.6.1.
|
|||||||
[#1257](https://github.com/lovell/sharp/issues/1257)
|
[#1257](https://github.com/lovell/sharp/issues/1257)
|
||||||
[@jeremychone](https://github.com/jeremychone)
|
[@jeremychone](https://github.com/jeremychone)
|
||||||
|
|
||||||
#### v0.20.3 - 29<sup>th</sup> May 2018
|
### v0.20.3 - 29<sup>th</sup> May 2018
|
||||||
|
|
||||||
* Fix tint operation by ensuring LAB interpretation and allowing negative values.
|
* Fix tint operation by ensuring LAB interpretation and allowing negative values.
|
||||||
[#1235](https://github.com/lovell/sharp/issues/1235)
|
[#1235](https://github.com/lovell/sharp/issues/1235)
|
||||||
[@wezside](https://github.com/wezside)
|
[@wezside](https://github.com/wezside)
|
||||||
|
|
||||||
#### v0.20.2 - 28<sup>th</sup> April 2018
|
### v0.20.2 - 28<sup>th</sup> April 2018
|
||||||
|
|
||||||
* Add tint operation to set image chroma.
|
* Add tint operation to set image chroma.
|
||||||
[#825](https://github.com/lovell/sharp/pull/825)
|
[#825](https://github.com/lovell/sharp/pull/825)
|
||||||
@@ -227,7 +646,7 @@ Requires libvips v8.6.1.
|
|||||||
[#1208](https://github.com/lovell/sharp/pull/1208)
|
[#1208](https://github.com/lovell/sharp/pull/1208)
|
||||||
[@woolite64](https://github.com/woolite64)
|
[@woolite64](https://github.com/woolite64)
|
||||||
|
|
||||||
#### v0.20.1 - 17<sup>th</sup> March 2018
|
### v0.20.1 - 17<sup>th</sup> March 2018
|
||||||
|
|
||||||
* Improve installation experience when a globally-installed libvips below the minimum required version is found.
|
* Improve installation experience when a globally-installed libvips below the minimum required version is found.
|
||||||
[#1148](https://github.com/lovell/sharp/issues/1148)
|
[#1148](https://github.com/lovell/sharp/issues/1148)
|
||||||
@@ -240,16 +659,16 @@ Requires libvips v8.6.1.
|
|||||||
[#1161](https://github.com/lovell/sharp/pull/1161)
|
[#1161](https://github.com/lovell/sharp/pull/1161)
|
||||||
[@BiancoA](https://github.com/BiancoA)
|
[@BiancoA](https://github.com/BiancoA)
|
||||||
|
|
||||||
#### v0.20.0 - 5<sup>th</sup> March 2018
|
### v0.20.0 - 5<sup>th</sup> March 2018
|
||||||
|
|
||||||
* Add support for prebuilt sharp binaries on common platforms.
|
* Add support for prebuilt sharp binaries on common platforms.
|
||||||
[#186](https://github.com/lovell/sharp/issues/186)
|
[#186](https://github.com/lovell/sharp/issues/186)
|
||||||
|
|
||||||
### v0.19 - "*suit*"
|
## v0.19 - "*suit*"
|
||||||
|
|
||||||
Requires libvips v8.6.1.
|
Requires libvips v8.6.1.
|
||||||
|
|
||||||
#### v0.19.1 - 24<sup>th</sup> February 2018
|
### v0.19.1 - 24<sup>th</sup> February 2018
|
||||||
|
|
||||||
* Expose libvips' linear transform feature.
|
* Expose libvips' linear transform feature.
|
||||||
[#1024](https://github.com/lovell/sharp/pull/1024)
|
[#1024](https://github.com/lovell/sharp/pull/1024)
|
||||||
@@ -263,7 +682,7 @@ Requires libvips v8.6.1.
|
|||||||
[#1134](https://github.com/lovell/sharp/issues/1134)
|
[#1134](https://github.com/lovell/sharp/issues/1134)
|
||||||
[@pieh](https://github.com/pieh)
|
[@pieh](https://github.com/pieh)
|
||||||
|
|
||||||
#### v0.19.0 - 11<sup>th</sup> January 2018
|
### v0.19.0 - 11<sup>th</sup> January 2018
|
||||||
|
|
||||||
* Expose offset coordinates of strategy-based crop.
|
* Expose offset coordinates of strategy-based crop.
|
||||||
[#868](https://github.com/lovell/sharp/issues/868)
|
[#868](https://github.com/lovell/sharp/issues/868)
|
||||||
@@ -307,17 +726,17 @@ Requires libvips v8.6.1.
|
|||||||
|
|
||||||
* TIFF output: switch default predictor from 'none' to 'horizontal' to match libvips' behaviour.
|
* TIFF output: switch default predictor from 'none' to 'horizontal' to match libvips' behaviour.
|
||||||
|
|
||||||
### v0.18 - "*ridge*"
|
## v0.18 - "*ridge*"
|
||||||
|
|
||||||
Requires libvips v8.5.5.
|
Requires libvips v8.5.5.
|
||||||
|
|
||||||
#### v0.18.4 - 18<sup>th</sup> September 2017
|
### v0.18.4 - 18<sup>th</sup> September 2017
|
||||||
|
|
||||||
* Ensure input Buffer really is marked as Persistent, prevents mark-sweep GC.
|
* Ensure input Buffer really is marked as Persistent, prevents mark-sweep GC.
|
||||||
[#950](https://github.com/lovell/sharp/issues/950)
|
[#950](https://github.com/lovell/sharp/issues/950)
|
||||||
[@lfdoherty](https://github.com/lfdoherty)
|
[@lfdoherty](https://github.com/lfdoherty)
|
||||||
|
|
||||||
#### v0.18.3 - 13<sup>th</sup> September 2017
|
### v0.18.3 - 13<sup>th</sup> September 2017
|
||||||
|
|
||||||
* Skip shrink-on-load when trimming.
|
* Skip shrink-on-load when trimming.
|
||||||
[#888](https://github.com/lovell/sharp/pull/888)
|
[#888](https://github.com/lovell/sharp/pull/888)
|
||||||
@@ -327,7 +746,7 @@ Requires libvips v8.5.5.
|
|||||||
[#945](https://github.com/lovell/sharp/pull/945)
|
[#945](https://github.com/lovell/sharp/pull/945)
|
||||||
[@pbomb](https://github.com/pbomb)
|
[@pbomb](https://github.com/pbomb)
|
||||||
|
|
||||||
#### v0.18.2 - 1<sup>st</sup> July 2017
|
### v0.18.2 - 1<sup>st</sup> July 2017
|
||||||
|
|
||||||
* Expose libvips' xres and yres properties for TIFF output.
|
* Expose libvips' xres and yres properties for TIFF output.
|
||||||
[#828](https://github.com/lovell/sharp/pull/828)
|
[#828](https://github.com/lovell/sharp/pull/828)
|
||||||
@@ -344,13 +763,13 @@ Requires libvips v8.5.5.
|
|||||||
[#857](https://github.com/lovell/sharp/pull/857)
|
[#857](https://github.com/lovell/sharp/pull/857)
|
||||||
[@ekremkaraca](https://github.com/ekremkaraca)
|
[@ekremkaraca](https://github.com/ekremkaraca)
|
||||||
|
|
||||||
#### v0.18.1 - 30<sup>th</sup> May 2017
|
### v0.18.1 - 30<sup>th</sup> May 2017
|
||||||
|
|
||||||
* Remove regression from #781 that could cause incorrect shrink calculation.
|
* Remove regression from #781 that could cause incorrect shrink calculation.
|
||||||
[#831](https://github.com/lovell/sharp/issues/831)
|
[#831](https://github.com/lovell/sharp/issues/831)
|
||||||
[@suprMax](https://github.com/suprMax)
|
[@suprMax](https://github.com/suprMax)
|
||||||
|
|
||||||
#### v0.18.0 - 30<sup>th</sup> May 2017
|
### v0.18.0 - 30<sup>th</sup> May 2017
|
||||||
|
|
||||||
* Remove the previously-deprecated output format "option" functions:
|
* Remove the previously-deprecated output format "option" functions:
|
||||||
quality, progressive, compressionLevel, withoutAdaptiveFiltering,
|
quality, progressive, compressionLevel, withoutAdaptiveFiltering,
|
||||||
@@ -408,11 +827,11 @@ Requires libvips v8.5.5.
|
|||||||
[#814](https://github.com/lovell/sharp/pull/814)
|
[#814](https://github.com/lovell/sharp/pull/814)
|
||||||
[@jingsam](https://github.com/jingsam)
|
[@jingsam](https://github.com/jingsam)
|
||||||
|
|
||||||
### v0.17 - "*quill*"
|
## v0.17 - "*quill*"
|
||||||
|
|
||||||
Requires libvips v8.4.2.
|
Requires libvips v8.4.2.
|
||||||
|
|
||||||
#### v0.17.3 - 1<sup>st</sup> April 2017
|
### v0.17.3 - 1<sup>st</sup> April 2017
|
||||||
|
|
||||||
* Allow toBuffer to optionally resolve a Promise with both info and data.
|
* Allow toBuffer to optionally resolve a Promise with both info and data.
|
||||||
[#143](https://github.com/lovell/sharp/issues/143)
|
[#143](https://github.com/lovell/sharp/issues/143)
|
||||||
@@ -430,7 +849,7 @@ Requires libvips v8.4.2.
|
|||||||
[#738](https://github.com/lovell/sharp/pull/738)
|
[#738](https://github.com/lovell/sharp/pull/738)
|
||||||
[@kristojorg](https://github.com/kristojorg)
|
[@kristojorg](https://github.com/kristojorg)
|
||||||
|
|
||||||
#### v0.17.2 - 11<sup>th</sup> February 2017
|
### v0.17.2 - 11<sup>th</sup> February 2017
|
||||||
|
|
||||||
* Ensure Readable side of Stream can start flowing after Writable side has finished.
|
* Ensure Readable side of Stream can start flowing after Writable side has finished.
|
||||||
[#671](https://github.com/lovell/sharp/issues/671)
|
[#671](https://github.com/lovell/sharp/issues/671)
|
||||||
@@ -440,7 +859,7 @@ Requires libvips v8.4.2.
|
|||||||
[#685](https://github.com/lovell/sharp/pull/685)
|
[#685](https://github.com/lovell/sharp/pull/685)
|
||||||
[@rnanwani](https://github.com/rnanwani)
|
[@rnanwani](https://github.com/rnanwani)
|
||||||
|
|
||||||
#### v0.17.1 - 15<sup>th</sup> January 2017
|
### v0.17.1 - 15<sup>th</sup> January 2017
|
||||||
|
|
||||||
* Improve error messages for invalid parameters.
|
* Improve error messages for invalid parameters.
|
||||||
[@spikeon](https://github.com/spikeon)
|
[@spikeon](https://github.com/spikeon)
|
||||||
@@ -453,7 +872,7 @@ Requires libvips v8.4.2.
|
|||||||
[@wangzhiwei1888](https://github.com/wangzhiwei1888)
|
[@wangzhiwei1888](https://github.com/wangzhiwei1888)
|
||||||
[#679](https://github.com/lovell/sharp/issues/679)
|
[#679](https://github.com/lovell/sharp/issues/679)
|
||||||
|
|
||||||
#### v0.17.0 - 11<sup>th</sup> December 2016
|
### v0.17.0 - 11<sup>th</sup> December 2016
|
||||||
|
|
||||||
* Drop support for versions of Node prior to v4.
|
* Drop support for versions of Node prior to v4.
|
||||||
|
|
||||||
@@ -490,17 +909,17 @@ Requires libvips v8.4.2.
|
|||||||
[#646](https://github.com/lovell/sharp/issues/646)
|
[#646](https://github.com/lovell/sharp/issues/646)
|
||||||
[@DaGaMs](https://github.com/DaGaMs)
|
[@DaGaMs](https://github.com/DaGaMs)
|
||||||
|
|
||||||
### v0.16 - "*pencil*"
|
## v0.16 - "*pencil*"
|
||||||
|
|
||||||
Requires libvips v8.3.3
|
Requires libvips v8.3.3
|
||||||
|
|
||||||
#### v0.16.2 - 22<sup>nd</sup> October 2016
|
### v0.16.2 - 22<sup>nd</sup> October 2016
|
||||||
|
|
||||||
* Restrict readelf usage to Linux only when detecting global libvips version.
|
* Restrict readelf usage to Linux only when detecting global libvips version.
|
||||||
[#602](https://github.com/lovell/sharp/issues/602)
|
[#602](https://github.com/lovell/sharp/issues/602)
|
||||||
[@caoko](https://github.com/caoko)
|
[@caoko](https://github.com/caoko)
|
||||||
|
|
||||||
#### v0.16.1 - 13<sup>th</sup> October 2016
|
### v0.16.1 - 13<sup>th</sup> October 2016
|
||||||
|
|
||||||
* C++11 ABI version is now auto-detected, remove sharp-cxx11 installation flag.
|
* C++11 ABI version is now auto-detected, remove sharp-cxx11 installation flag.
|
||||||
|
|
||||||
@@ -519,7 +938,7 @@ Requires libvips v8.3.3
|
|||||||
[#566](https://github.com/lovell/sharp/issues/566)
|
[#566](https://github.com/lovell/sharp/issues/566)
|
||||||
[@Nateowami](https://github.com/Nateowami)
|
[@Nateowami](https://github.com/Nateowami)
|
||||||
|
|
||||||
#### v0.16.0 - 18<sup>th</sup> August 2016
|
### v0.16.0 - 18<sup>th</sup> August 2016
|
||||||
|
|
||||||
* Add pre-compiled libvips for OS X, ARMv7 and ARMv8.
|
* Add pre-compiled libvips for OS X, ARMv7 and ARMv8.
|
||||||
[#312](https://github.com/lovell/sharp/issues/312)
|
[#312](https://github.com/lovell/sharp/issues/312)
|
||||||
@@ -559,11 +978,11 @@ Requires libvips v8.3.3
|
|||||||
* Remove deprecated interpolateWith method - use resize(w, h, { interpolator: ... })
|
* Remove deprecated interpolateWith method - use resize(w, h, { interpolator: ... })
|
||||||
[#310](https://github.com/lovell/sharp/issues/310)
|
[#310](https://github.com/lovell/sharp/issues/310)
|
||||||
|
|
||||||
### v0.15 - "*outfit*"
|
## v0.15 - "*outfit*"
|
||||||
|
|
||||||
Requires libvips v8.3.1
|
Requires libvips v8.3.1
|
||||||
|
|
||||||
#### v0.15.1 - 12<sup>th</sup> July 2016
|
### v0.15.1 - 12<sup>th</sup> July 2016
|
||||||
|
|
||||||
* Concat Stream-based input in single operation for ~+3% perf and less GC.
|
* Concat Stream-based input in single operation for ~+3% perf and less GC.
|
||||||
[#429](https://github.com/lovell/sharp/issues/429)
|
[#429](https://github.com/lovell/sharp/issues/429)
|
||||||
@@ -629,7 +1048,7 @@ Requires libvips v8.3.1
|
|||||||
[#501](https://github.com/lovell/sharp/pull/501)
|
[#501](https://github.com/lovell/sharp/pull/501)
|
||||||
[@mhirsch](https://github.com/mhirsch)
|
[@mhirsch](https://github.com/mhirsch)
|
||||||
|
|
||||||
#### v0.15.0 - 21<sup>st</sup> May 2016
|
### v0.15.0 - 21<sup>st</sup> May 2016
|
||||||
|
|
||||||
* Use libvips' new Lanczos 3 kernel as default for image reduction.
|
* Use libvips' new Lanczos 3 kernel as default for image reduction.
|
||||||
Deprecate interpolateWith method, now provided as a resize option.
|
Deprecate interpolateWith method, now provided as a resize option.
|
||||||
@@ -647,11 +1066,11 @@ Requires libvips v8.3.1
|
|||||||
[#413](https://github.com/lovell/sharp/issues/413)
|
[#413](https://github.com/lovell/sharp/issues/413)
|
||||||
[@jardakotesovec](https://github.com/jardakotesovec)
|
[@jardakotesovec](https://github.com/jardakotesovec)
|
||||||
|
|
||||||
### v0.14 - "*needle*"
|
## v0.14 - "*needle*"
|
||||||
|
|
||||||
Requires libvips v8.2.3
|
Requires libvips v8.2.3
|
||||||
|
|
||||||
#### v0.14.1 - 16<sup>th</sup> April 2016
|
### v0.14.1 - 16<sup>th</sup> April 2016
|
||||||
|
|
||||||
* Allow removal of limitation on input pixel count via limitInputPixels. Use with care.
|
* Allow removal of limitation on input pixel count via limitInputPixels. Use with care.
|
||||||
[#250](https://github.com/lovell/sharp/issues/250)
|
[#250](https://github.com/lovell/sharp/issues/250)
|
||||||
@@ -675,7 +1094,7 @@ Requires libvips v8.2.3
|
|||||||
[#412](https://github.com/lovell/sharp/issues/412)
|
[#412](https://github.com/lovell/sharp/issues/412)
|
||||||
[@nouh](https://github.com/nouh)
|
[@nouh](https://github.com/nouh)
|
||||||
|
|
||||||
#### v0.14.0 - 2<sup>nd</sup> April 2016
|
### v0.14.0 - 2<sup>nd</sup> April 2016
|
||||||
|
|
||||||
* Add ability to extend (pad) the edges of an image.
|
* Add ability to extend (pad) the edges of an image.
|
||||||
[#128](https://github.com/lovell/sharp/issues/128)
|
[#128](https://github.com/lovell/sharp/issues/128)
|
||||||
@@ -712,17 +1131,17 @@ Requires libvips v8.2.3
|
|||||||
* Remove deprecated style of calling extract API. Breaks calls using positional arguments.
|
* Remove deprecated style of calling extract API. Breaks calls using positional arguments.
|
||||||
[#276](https://github.com/lovell/sharp/issues/276)
|
[#276](https://github.com/lovell/sharp/issues/276)
|
||||||
|
|
||||||
### v0.13 - "*mind*"
|
## v0.13 - "*mind*"
|
||||||
|
|
||||||
Requires libvips v8.2.2
|
Requires libvips v8.2.2
|
||||||
|
|
||||||
#### v0.13.1 - 27<sup>th</sup> February 2016
|
### v0.13.1 - 27<sup>th</sup> February 2016
|
||||||
|
|
||||||
* Fix embedding onto transparent backgrounds; regression introduced in v0.13.0.
|
* Fix embedding onto transparent backgrounds; regression introduced in v0.13.0.
|
||||||
[#366](https://github.com/lovell/sharp/issues/366)
|
[#366](https://github.com/lovell/sharp/issues/366)
|
||||||
[@diegocsandrim](https://github.com/diegocsandrim)
|
[@diegocsandrim](https://github.com/diegocsandrim)
|
||||||
|
|
||||||
#### v0.13.0 - 15<sup>th</sup> February 2016
|
### v0.13.0 - 15<sup>th</sup> February 2016
|
||||||
|
|
||||||
* Improve vector image support by allowing control of density/DPI.
|
* Improve vector image support by allowing control of density/DPI.
|
||||||
Switch pre-built libs from Imagemagick to Graphicsmagick.
|
Switch pre-built libs from Imagemagick to Graphicsmagick.
|
||||||
@@ -767,11 +1186,11 @@ Requires libvips v8.2.2
|
|||||||
|
|
||||||
* Add support for gamma correction of images with an alpha channel.
|
* Add support for gamma correction of images with an alpha channel.
|
||||||
|
|
||||||
### v0.12 - "*look*"
|
## v0.12 - "*look*"
|
||||||
|
|
||||||
Requires libvips v8.2.0
|
Requires libvips v8.2.0
|
||||||
|
|
||||||
#### v0.12.2 - 16<sup>th</sup> January 2016
|
### v0.12.2 - 16<sup>th</sup> January 2016
|
||||||
|
|
||||||
* Upgrade libvips to v8.2.0 for improved vips_shrink.
|
* Upgrade libvips to v8.2.0 for improved vips_shrink.
|
||||||
|
|
||||||
@@ -789,7 +1208,7 @@ Requires libvips v8.2.0
|
|||||||
[#331](https://github.com/lovell/sharp/issues/331)
|
[#331](https://github.com/lovell/sharp/issues/331)
|
||||||
[@dtoubelis](https://github.com/dtoubelis)
|
[@dtoubelis](https://github.com/dtoubelis)
|
||||||
|
|
||||||
#### v0.12.1 - 12<sup>th</sup> December 2015
|
### v0.12.1 - 12<sup>th</sup> December 2015
|
||||||
|
|
||||||
* Allow use of SIMD vector instructions (via liborc) to be toggled on/off.
|
* Allow use of SIMD vector instructions (via liborc) to be toggled on/off.
|
||||||
[#172](https://github.com/lovell/sharp/issues/172)
|
[#172](https://github.com/lovell/sharp/issues/172)
|
||||||
@@ -802,7 +1221,7 @@ Requires libvips v8.2.0
|
|||||||
|
|
||||||
* Use the NPM-configured HTTPS proxy, if any, for binary downloads.
|
* Use the NPM-configured HTTPS proxy, if any, for binary downloads.
|
||||||
|
|
||||||
#### v0.12.0 - 23<sup>rd</sup> November 2015
|
### v0.12.0 - 23<sup>rd</sup> November 2015
|
||||||
|
|
||||||
* Bundle pre-compiled libvips and its dependencies for 64-bit Linux and Windows.
|
* Bundle pre-compiled libvips and its dependencies for 64-bit Linux and Windows.
|
||||||
[#42](https://github.com/lovell/sharp/issues/42)
|
[#42](https://github.com/lovell/sharp/issues/42)
|
||||||
@@ -838,9 +1257,9 @@ Requires libvips v8.2.0
|
|||||||
[#309](https://github.com/lovell/sharp/pull/309)
|
[#309](https://github.com/lovell/sharp/pull/309)
|
||||||
[@papandreou](https://github.com/papandreou)
|
[@papandreou](https://github.com/papandreou)
|
||||||
|
|
||||||
### v0.11 - "*knife*"
|
## v0.11 - "*knife*"
|
||||||
|
|
||||||
#### v0.11.4 - 5<sup>th</sup> November 2015
|
### v0.11.4 - 5<sup>th</sup> November 2015
|
||||||
|
|
||||||
* Add corners, e.g. `northeast`, to existing `gravity` option.
|
* Add corners, e.g. `northeast`, to existing `gravity` option.
|
||||||
[#291](https://github.com/lovell/sharp/pull/291)
|
[#291](https://github.com/lovell/sharp/pull/291)
|
||||||
@@ -854,13 +1273,13 @@ Requires libvips v8.2.0
|
|||||||
[#287](https://github.com/lovell/sharp/pull/287)
|
[#287](https://github.com/lovell/sharp/pull/287)
|
||||||
[@vlapo](https://github.com/vlapo)
|
[@vlapo](https://github.com/vlapo)
|
||||||
|
|
||||||
#### v0.11.3 - 8<sup>th</sup> September 2015
|
### v0.11.3 - 8<sup>th</sup> September 2015
|
||||||
|
|
||||||
* Intrepret blurSigma, sharpenFlat, and sharpenJagged as double precision.
|
* Intrepret blurSigma, sharpenFlat, and sharpenJagged as double precision.
|
||||||
[#263](https://github.com/lovell/sharp/pull/263)
|
[#263](https://github.com/lovell/sharp/pull/263)
|
||||||
[@chrisriley](https://github.com/chrisriley)
|
[@chrisriley](https://github.com/chrisriley)
|
||||||
|
|
||||||
#### v0.11.2 - 28<sup>th</sup> August 2015
|
### v0.11.2 - 28<sup>th</sup> August 2015
|
||||||
|
|
||||||
* Allow crop gravity to be provided as a String.
|
* Allow crop gravity to be provided as a String.
|
||||||
[#255](https://github.com/lovell/sharp/pull/255)
|
[#255](https://github.com/lovell/sharp/pull/255)
|
||||||
@@ -868,7 +1287,7 @@ Requires libvips v8.2.0
|
|||||||
* Add support for io.js v3 and Node v4.
|
* Add support for io.js v3 and Node v4.
|
||||||
[#246](https://github.com/lovell/sharp/issues/246)
|
[#246](https://github.com/lovell/sharp/issues/246)
|
||||||
|
|
||||||
#### v0.11.1 - 12<sup>th</sup> August 2015
|
### v0.11.1 - 12<sup>th</sup> August 2015
|
||||||
|
|
||||||
* Silence MSVC warning: "C4530: C++ exception handler used, but unwind semantics are not enabled".
|
* Silence MSVC warning: "C4530: C++ exception handler used, but unwind semantics are not enabled".
|
||||||
[#244](https://github.com/lovell/sharp/pull/244)
|
[#244](https://github.com/lovell/sharp/pull/244)
|
||||||
@@ -878,7 +1297,7 @@ Requires libvips v8.2.0
|
|||||||
[#249](https://github.com/lovell/sharp/issues/249)
|
[#249](https://github.com/lovell/sharp/issues/249)
|
||||||
[@compeak](https://github.com/compeak)
|
[@compeak](https://github.com/compeak)
|
||||||
|
|
||||||
#### v0.11.0 - 15<sup>th</sup> July 2015
|
### v0.11.0 - 15<sup>th</sup> July 2015
|
||||||
|
|
||||||
* Allow alpha transparency compositing via new `overlayWith` method.
|
* Allow alpha transparency compositing via new `overlayWith` method.
|
||||||
[#97](https://github.com/lovell/sharp/issues/97)
|
[#97](https://github.com/lovell/sharp/issues/97)
|
||||||
@@ -906,9 +1325,9 @@ Requires libvips v8.2.0
|
|||||||
[#238](https://github.com/lovell/sharp/issues/238)
|
[#238](https://github.com/lovell/sharp/issues/238)
|
||||||
[@richardadjogah](https://github.com/richardadjogah)
|
[@richardadjogah](https://github.com/richardadjogah)
|
||||||
|
|
||||||
### v0.10 - "*judgment*"
|
## v0.10 - "*judgment*"
|
||||||
|
|
||||||
#### v0.10.1 - 1<sup>st</sup> June 2015
|
### v0.10.1 - 1<sup>st</sup> June 2015
|
||||||
|
|
||||||
* Allow embed of image with alpha transparency onto non-transparent background.
|
* Allow embed of image with alpha transparency onto non-transparent background.
|
||||||
[#204](https://github.com/lovell/sharp/issues/204)
|
[#204](https://github.com/lovell/sharp/issues/204)
|
||||||
@@ -918,7 +1337,7 @@ Requires libvips v8.2.0
|
|||||||
[#228](https://github.com/lovell/sharp/issues/228)
|
[#228](https://github.com/lovell/sharp/issues/228)
|
||||||
[@doggan](https://github.com/doggan)
|
[@doggan](https://github.com/doggan)
|
||||||
|
|
||||||
#### v0.10.0 - 23<sup>rd</sup> April 2015
|
### v0.10.0 - 23<sup>rd</sup> April 2015
|
||||||
|
|
||||||
* Add support for Windows (x86).
|
* Add support for Windows (x86).
|
||||||
[#19](https://github.com/lovell/sharp/issues/19)
|
[#19](https://github.com/lovell/sharp/issues/19)
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
/* Nest document subheadings in navigation */
|
|
||||||
ul.subnav ul:not(.subnav) {
|
|
||||||
padding-left: 2em;
|
|
||||||
font-size: 80%;
|
|
||||||
}
|
|
||||||
118
docs/firebase.json
Normal file
@@ -0,0 +1,118 @@
|
|||||||
|
{
|
||||||
|
"hosting": {
|
||||||
|
"site": "pixelplumbing-sharp",
|
||||||
|
"public": ".",
|
||||||
|
"ignore": [
|
||||||
|
".*",
|
||||||
|
"build.js",
|
||||||
|
"firebase.json",
|
||||||
|
"*.md",
|
||||||
|
"image/**",
|
||||||
|
"search-index/**"
|
||||||
|
],
|
||||||
|
"headers": [
|
||||||
|
{
|
||||||
|
"source": "**",
|
||||||
|
"headers": [
|
||||||
|
{
|
||||||
|
"key": "Cache-Control",
|
||||||
|
"value": "max-age=86400"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"redirects": [
|
||||||
|
{
|
||||||
|
"source": "**/install/**",
|
||||||
|
"destination": "/install",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "/page/install",
|
||||||
|
"destination": "/install",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-constructor/**",
|
||||||
|
"destination": "/api-constructor",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-input/**",
|
||||||
|
"destination": "/api-input",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-output/**",
|
||||||
|
"destination": "/api-output",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-resize/**",
|
||||||
|
"destination": "/api-resize",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-compsite/**",
|
||||||
|
"destination": "/api-compsite",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-operation/**",
|
||||||
|
"destination": "/api-operation",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-colour/**",
|
||||||
|
"destination": "/api-colour",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-channel/**",
|
||||||
|
"destination": "/api-channel",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/api-utility/**",
|
||||||
|
"destination": "/api-utility",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "/page/api",
|
||||||
|
"destination": "/api-constructor",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/performance/**",
|
||||||
|
"destination": "/performance",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "/page/performance",
|
||||||
|
"destination": "/performance",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "**/changelog/**",
|
||||||
|
"destination": "/changelog",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "/page/changelog",
|
||||||
|
"destination": "/changelog",
|
||||||
|
"type": 301
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"source": "/en/**",
|
||||||
|
"destination": "/",
|
||||||
|
"type": 301
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"rewrites": [
|
||||||
|
{
|
||||||
|
"source": "**",
|
||||||
|
"destination": "/index.html"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
214
docs/humans.txt
Normal file
@@ -0,0 +1,214 @@
|
|||||||
|
/* THANKS */
|
||||||
|
|
||||||
|
Name: John Cupitt
|
||||||
|
GitHub: https://github.com/jcupitt
|
||||||
|
|
||||||
|
Name: Pierre Inglebert
|
||||||
|
GitHub: https://github.com/pierreinglebert
|
||||||
|
|
||||||
|
Name: Jonathan Ong
|
||||||
|
GitHub: https://github.com/jonathanong
|
||||||
|
|
||||||
|
Name: Chanon Sajjamanochai
|
||||||
|
GitHub: https://github.com/chanon
|
||||||
|
|
||||||
|
Name: Juliano Julio
|
||||||
|
GitHub: https://github.com/julianojulio
|
||||||
|
|
||||||
|
Name: Daniel Gasienica
|
||||||
|
GitHub: https://github.com/gasi
|
||||||
|
|
||||||
|
Name: Julian Walker
|
||||||
|
GitHub: https://github.com/julianwa
|
||||||
|
|
||||||
|
Name: Amit Pitaru
|
||||||
|
GitHub: https://github.com/apitaru
|
||||||
|
|
||||||
|
Name: Brandon Aaron
|
||||||
|
GitHub: https://github.com/brandonaaron
|
||||||
|
|
||||||
|
Name: Andreas Lind
|
||||||
|
GitHub: https://github.com/papandreouGitHub:
|
||||||
|
|
||||||
|
Name: Maurus Cuelenaere
|
||||||
|
GitHub: https://github.com/mcuelenaere
|
||||||
|
|
||||||
|
Name: Linus Unnebäck
|
||||||
|
GitHub: https://github.com/LinusU
|
||||||
|
|
||||||
|
Name: Victor Mateevitsi
|
||||||
|
GitHub: https://github.com/mvictoras
|
||||||
|
|
||||||
|
Name: Alaric Holloway
|
||||||
|
GitHub: https://github.com/skedastik
|
||||||
|
|
||||||
|
Name: Bernhard K. Weisshuhn
|
||||||
|
GitHub: https://github.com/bkw
|
||||||
|
|
||||||
|
Name: David A. Carley
|
||||||
|
GitHub: https://github.com/dacarley
|
||||||
|
|
||||||
|
Name: John Tobin
|
||||||
|
GitHub: https://github.com/jtobinisaniceguy
|
||||||
|
|
||||||
|
Name: Kenton Gray
|
||||||
|
GitHub: https://github.com/kentongray
|
||||||
|
|
||||||
|
Name: Felix Bünemann
|
||||||
|
GitHub: https://github.com/felixbuenemann
|
||||||
|
|
||||||
|
Name: Samy Al Zahrani
|
||||||
|
GitHub: https://github.com/salzhrani
|
||||||
|
|
||||||
|
Name: Chintan Thakkar
|
||||||
|
GitHub: https://github.com/lemnisk8
|
||||||
|
|
||||||
|
Name: F. Orlando Galashan
|
||||||
|
GitHub: https://github.com/frulo
|
||||||
|
|
||||||
|
Name: Kleis Auke Wolthuizen
|
||||||
|
GitHub: https://github.com/kleisauke
|
||||||
|
|
||||||
|
Name: Matt Hirsch
|
||||||
|
GitHub: https://github.com/mhirsch
|
||||||
|
|
||||||
|
Name: Rahul Nanwani
|
||||||
|
GitHub: https://github.com/rnanwani
|
||||||
|
|
||||||
|
Name: Matthias Thoemmes
|
||||||
|
GitHub: https://github.com/cmtt
|
||||||
|
|
||||||
|
Name: Patrick Paskaris
|
||||||
|
GitHub: https://github.com/ppaskaris
|
||||||
|
|
||||||
|
Name: Jérémy Lal
|
||||||
|
GitHub: https://github.com/kapouer
|
||||||
|
|
||||||
|
Name: Alice Monday
|
||||||
|
GitHub: https://github.com/alice0meta
|
||||||
|
|
||||||
|
Name: Kristo Jorgenson
|
||||||
|
GitHub: https://github.com/kristojorg
|
||||||
|
|
||||||
|
Name: Yves Bos
|
||||||
|
GitHub: https://github.com/YvesBos
|
||||||
|
|
||||||
|
Name: Nicolas Coden
|
||||||
|
GitHub: https://github.com/ncoden
|
||||||
|
|
||||||
|
Name: Matt Parrish
|
||||||
|
GitHub: https://github.com/pbomb
|
||||||
|
|
||||||
|
Name: Matthew McEachen
|
||||||
|
GitHub: https://github.com/mceachen
|
||||||
|
|
||||||
|
Name: Jarda Kotěšovec
|
||||||
|
GitHub: https://github.com/jardakotesovec
|
||||||
|
|
||||||
|
Name: Kenric D'Souza
|
||||||
|
GitHub: https://github.com/AzureByte
|
||||||
|
|
||||||
|
Name: Oleh Aleinyk
|
||||||
|
GitHub: https://github.com/oaleynik
|
||||||
|
|
||||||
|
Name: Marcel Bretschneider
|
||||||
|
GitHub: https://github.com/3epnm
|
||||||
|
|
||||||
|
Name: Andrea Bianco
|
||||||
|
GitHub: https://github.com/BiancoA
|
||||||
|
|
||||||
|
Name: Rik Heywood
|
||||||
|
GitHub: https://github.com/rikh42
|
||||||
|
|
||||||
|
Name: Thomas Parisot
|
||||||
|
GitHub: https://github.com/oncletom
|
||||||
|
|
||||||
|
Name: Nathan Graves
|
||||||
|
GitHub: https://github.com/woolite64
|
||||||
|
|
||||||
|
Name: Tom Lokhorst
|
||||||
|
GitHub: https://github.com/tomlokhorst
|
||||||
|
|
||||||
|
Name: Espen Hovlandsdal
|
||||||
|
GitHub: https://github.com/rexxars
|
||||||
|
|
||||||
|
Name: Sylvain Dumont
|
||||||
|
GitHub: https://github.com/sylvaindumont
|
||||||
|
|
||||||
|
Name: Alun Davies
|
||||||
|
GitHub: https://github.com/alundavies
|
||||||
|
|
||||||
|
Name: Aidan Hoolachan
|
||||||
|
GitHub: https://github.com/ajhool
|
||||||
|
|
||||||
|
Name: Axel Eirola
|
||||||
|
GitHub: https://github.com/aeirola
|
||||||
|
|
||||||
|
Name: Freezy
|
||||||
|
GitHub: https://github.com/freezy
|
||||||
|
|
||||||
|
Name: Julian Aubourg
|
||||||
|
GitHub: https://github.com/jaubourg
|
||||||
|
|
||||||
|
Name: Keith Belovay
|
||||||
|
GitHub: https://github.com/fromkeith
|
||||||
|
|
||||||
|
Name: Michael B. Klein
|
||||||
|
GitHub: https://github.com/mbklein
|
||||||
|
|
||||||
|
Name: Jakub Michálek
|
||||||
|
GitHub: https://github.com/Goues
|
||||||
|
|
||||||
|
Name: Ilya Ovdin
|
||||||
|
GitHub: https://github.com/iovdin
|
||||||
|
|
||||||
|
Name: Andargor
|
||||||
|
GitHub: https://github.com/Andargor
|
||||||
|
|
||||||
|
Name: Nicolas Stepien
|
||||||
|
GitHub: https://github.com/MayhemYDG
|
||||||
|
|
||||||
|
Name: Paul Neave
|
||||||
|
GitHub: https://github.com/neave
|
||||||
|
|
||||||
|
Name: Brendan Kennedy
|
||||||
|
GitHub: https://github.com/rustyguts
|
||||||
|
|
||||||
|
Name: Brychan Bennett-Odlum
|
||||||
|
GitHub: https://github.com/BrychanOdlum
|
||||||
|
|
||||||
|
Name: Edward Silverton
|
||||||
|
GitHub: https://github.com/edsilv
|
||||||
|
|
||||||
|
Name: Dumitru Deveatii
|
||||||
|
GitHub: https://github.com/dimadeveatii
|
||||||
|
|
||||||
|
Name: Roland Asmann
|
||||||
|
GitHub: https://github.com/malice00
|
||||||
|
|
||||||
|
Name: Roman Malieiev
|
||||||
|
GitHub: https://github.com/romaleev
|
||||||
|
|
||||||
|
Name: Jerome Vouillon
|
||||||
|
GitHub: https://github.com/vouillon
|
||||||
|
|
||||||
|
Name: Tomáš Szabo
|
||||||
|
GitHub: https://github.com/deftomat
|
||||||
|
|
||||||
|
Name: Robert O'Rourke
|
||||||
|
GitHub: https://github.com/roborourke
|
||||||
|
|
||||||
|
Name: Denis Soldatov
|
||||||
|
GitHub: https://github.com/derom
|
||||||
|
|
||||||
|
Name: Stefan Probst
|
||||||
|
GitHub: https://github.com/stefanprobst
|
||||||
|
|
||||||
|
Name: Thomas Beiganz
|
||||||
|
GitHub: https://github.com/beig
|
||||||
|
|
||||||
|
Name: Florian Busch
|
||||||
|
GitHub: https://github.com/florian-busch
|
||||||
|
|
||||||
|
Name: Matthieu Salettes
|
||||||
|
GitHub: https://github.com/msalettes
|
||||||
11
docs/image/sharp-logo-mono.svg
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="86 86 550 550">
|
||||||
|
<!-- Creative Commons CC0 1.0 Universal Public Domain Dedication -->
|
||||||
|
<defs>
|
||||||
|
<mask id="c">
|
||||||
|
<path fill="none" stroke="#fff" stroke-width="80" d="M258.411 285.777l200.176-26.8M244.113 466.413L451.44 438.66m.001 0V238.484m0-150.121v171.572l178.725-23.917m-359.843 19.584V477.22m2.387 156.95V462.591L93.984 486.515"/>
|
||||||
|
<path fill="none" stroke="#000" stroke-width="112" d="M451.441 610.246V438.66l178.725-23.91M269.688 112.59v171.58L90.964 308.093"/>
|
||||||
|
</mask>
|
||||||
|
</defs>
|
||||||
|
<path mask="url(#c)" fill="none" stroke="#000" stroke-width="80" d="M258.411 285.777l200.176-26.8M244.113 466.413L451.44 438.66m.001 0V238.484m0-150.121v171.572l178.725-23.917m-359.843 19.584V477.22m2.387 156.95V462.591L93.984 486.515"/>
|
||||||
|
<path fill="none" stroke="#000" stroke-width="80" d="M451.441 610.246V438.66l178.725-23.91M269.688 112.59v171.58L90.964 308.093"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 929 B |
@@ -1,5 +1,5 @@
|
|||||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="86 86 550 550">
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="86 86 550 550">
|
||||||
<!-- Copyright 2019 Lovell Fuller. This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0) License. -->
|
<!-- Creative Commons CC0 1.0 Universal Public Domain Dedication -->
|
||||||
<path fill="none" stroke="#9c0" stroke-width="80" d="M258.411 285.777l200.176-26.8M244.113 466.413L451.44 438.66M451.441 438.66V238.484M451.441 88.363v171.572l178.725-23.917M270.323 255.602V477.22M272.71 634.17V462.591L93.984 486.515"/>
|
<path fill="none" stroke="#9c0" stroke-width="80" d="M258.411 285.777l200.176-26.8M244.113 466.413L451.44 438.66M451.441 438.66V238.484M451.441 88.363v171.572l178.725-23.917M270.323 255.602V477.22M272.71 634.17V462.591L93.984 486.515"/>
|
||||||
<path fill="none" stroke="#090" stroke-width="80" d="M451.441 610.246V438.66l178.725-23.91M269.688 112.59v171.58L90.964 308.093"/>
|
<path fill="none" stroke="#090" stroke-width="80" d="M451.441 610.246V438.66l178.725-23.91M269.688 112.59v171.58L90.964 308.093"/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 592 B After Width: | Height: | Size: 508 B |
216
docs/index.html
Normal file
144
docs/index.md
@@ -1,144 +0,0 @@
|
|||||||
# sharp
|
|
||||||
|
|
||||||
<img src="image/sharp-logo.svg" width="160" height="160" alt="sharp logo" align="right">
|
|
||||||
|
|
||||||
The typical use case for this high speed Node.js module
|
|
||||||
is to convert large images in common formats to
|
|
||||||
smaller, web-friendly JPEG, PNG and WebP images of varying dimensions.
|
|
||||||
|
|
||||||
Resizing an image is typically 4x-5x faster than using the
|
|
||||||
quickest ImageMagick and GraphicsMagick settings.
|
|
||||||
|
|
||||||
Colour spaces, embedded ICC profiles and alpha transparency channels are all handled correctly.
|
|
||||||
Lanczos resampling ensures quality is not sacrificed for speed.
|
|
||||||
|
|
||||||
As well as image resizing, operations such as
|
|
||||||
rotation, extraction, compositing and gamma correction are available.
|
|
||||||
|
|
||||||
Most modern 64-bit OS X, Windows and Linux systems running
|
|
||||||
Node versions 6, 8, 10, 11 and 12
|
|
||||||
do not require any additional install or runtime dependencies.
|
|
||||||
|
|
||||||
[](https://coveralls.io/r/lovell/sharp?branch=master)
|
|
||||||
|
|
||||||
### Formats
|
|
||||||
|
|
||||||
This module supports reading JPEG, PNG, WebP, TIFF, GIF and SVG images.
|
|
||||||
|
|
||||||
Output images can be in JPEG, PNG, WebP and TIFF formats as well as uncompressed raw pixel data.
|
|
||||||
|
|
||||||
Streams, Buffer objects and the filesystem can be used for input and output.
|
|
||||||
|
|
||||||
A single input Stream can be split into multiple processing pipelines and output Streams.
|
|
||||||
|
|
||||||
Deep Zoom image pyramids can be generated,
|
|
||||||
suitable for use with "slippy map" tile viewers like
|
|
||||||
[OpenSeadragon](https://github.com/openseadragon/openseadragon)
|
|
||||||
and [Leaflet](https://github.com/turban/Leaflet.Zoomify).
|
|
||||||
|
|
||||||
### Fast
|
|
||||||
|
|
||||||
This module is powered by the blazingly fast
|
|
||||||
[libvips](https://github.com/libvips/libvips) image processing library,
|
|
||||||
originally created in 1989 at Birkbeck College
|
|
||||||
and currently maintained by
|
|
||||||
[John Cupitt](https://github.com/jcupitt).
|
|
||||||
|
|
||||||
Only small regions of uncompressed image data
|
|
||||||
are held in memory and processed at a time,
|
|
||||||
taking full advantage of multiple CPU cores and L1/L2/L3 cache.
|
|
||||||
|
|
||||||
Everything remains non-blocking thanks to _libuv_,
|
|
||||||
no child processes are spawned and Promises/async/await are supported.
|
|
||||||
|
|
||||||
### Optimal
|
|
||||||
|
|
||||||
Huffman tables are optimised when generating JPEG output images
|
|
||||||
without having to use separate command line tools like
|
|
||||||
[jpegoptim](https://github.com/tjko/jpegoptim) and
|
|
||||||
[jpegtran](http://jpegclub.org/jpegtran/).
|
|
||||||
|
|
||||||
PNG filtering is disabled by default,
|
|
||||||
which for diagrams and line art often produces the same result
|
|
||||||
as [pngcrush](https://pmt.sourceforge.io/pngcrush/).
|
|
||||||
|
|
||||||
### Contributing
|
|
||||||
|
|
||||||
A [guide for contributors](https://github.com/lovell/sharp/blob/master/.github/CONTRIBUTING.md)
|
|
||||||
covers reporting bugs, requesting features and submitting code changes.
|
|
||||||
|
|
||||||
### Credits
|
|
||||||
|
|
||||||
This module would never have been possible without
|
|
||||||
the help and code contributions of the following people:
|
|
||||||
|
|
||||||
* [John Cupitt](https://github.com/jcupitt)
|
|
||||||
* [Pierre Inglebert](https://github.com/pierreinglebert)
|
|
||||||
* [Jonathan Ong](https://github.com/jonathanong)
|
|
||||||
* [Chanon Sajjamanochai](https://github.com/chanon)
|
|
||||||
* [Juliano Julio](https://github.com/julianojulio)
|
|
||||||
* [Daniel Gasienica](https://github.com/gasi)
|
|
||||||
* [Julian Walker](https://github.com/julianwa)
|
|
||||||
* [Amit Pitaru](https://github.com/apitaru)
|
|
||||||
* [Brandon Aaron](https://github.com/brandonaaron)
|
|
||||||
* [Andreas Lind](https://github.com/papandreou)
|
|
||||||
* [Maurus Cuelenaere](https://github.com/mcuelenaere)
|
|
||||||
* [Linus Unnebäck](https://github.com/LinusU)
|
|
||||||
* [Victor Mateevitsi](https://github.com/mvictoras)
|
|
||||||
* [Alaric Holloway](https://github.com/skedastik)
|
|
||||||
* [Bernhard K. Weisshuhn](https://github.com/bkw)
|
|
||||||
* [David A. Carley](https://github.com/dacarley)
|
|
||||||
* [John Tobin](https://github.com/jtobinisaniceguy)
|
|
||||||
* [Kenton Gray](https://github.com/kentongray)
|
|
||||||
* [Felix Bünemann](https://github.com/felixbuenemann)
|
|
||||||
* [Samy Al Zahrani](https://github.com/salzhrani)
|
|
||||||
* [Chintan Thakkar](https://github.com/lemnisk8)
|
|
||||||
* [F. Orlando Galashan](https://github.com/frulo)
|
|
||||||
* [Kleis Auke Wolthuizen](https://github.com/kleisauke)
|
|
||||||
* [Matt Hirsch](https://github.com/mhirsch)
|
|
||||||
* [Rahul Nanwani](https://github.com/rnanwani)
|
|
||||||
* [Matthias Thoemmes](https://github.com/cmtt)
|
|
||||||
* [Patrick Paskaris](https://github.com/ppaskaris)
|
|
||||||
* [Jérémy Lal](https://github.com/kapouer)
|
|
||||||
* [Alice Monday](https://github.com/alice0meta)
|
|
||||||
* [Kristo Jorgenson](https://github.com/kristojorg)
|
|
||||||
* [Yves Bos](https://github.com/YvesBos)
|
|
||||||
* [Nicolas Coden](https://github.com/ncoden)
|
|
||||||
* [Matt Parrish](https://github.com/pbomb)
|
|
||||||
* [Matthew McEachen](https://github.com/mceachen)
|
|
||||||
* [Jarda Kotěšovec](https://github.com/jardakotesovec)
|
|
||||||
* [Kenric D'Souza](https://github.com/AzureByte)
|
|
||||||
* [Oleh Aleinyk](https://github.com/oaleynik)
|
|
||||||
* [Marcel Bretschneider](https://github.com/3epnm)
|
|
||||||
* [Andrea Bianco](https://github.com/BiancoA)
|
|
||||||
* [Rik Heywood](https://github.com/rikh42)
|
|
||||||
* [Thomas Parisot](https://github.com/oncletom)
|
|
||||||
* [Nathan Graves](https://github.com/woolite64)
|
|
||||||
* [Tom Lokhorst](https://github.com/tomlokhorst)
|
|
||||||
* [Espen Hovlandsdal](https://github.com/rexxars)
|
|
||||||
* [Sylvain Dumont](https://github.com/sylvaindumont)
|
|
||||||
* [Alun Davies](https://github.com/alundavies)
|
|
||||||
* [Aidan Hoolachan](https://github.com/ajhool)
|
|
||||||
* [Axel Eirola](https://github.com/aeirola)
|
|
||||||
* [Freezy](https://github.com/freezy)
|
|
||||||
* [Julian Aubourg](https://github.com/jaubourg)
|
|
||||||
* [Keith Belovay](https://github.com/fromkeith)
|
|
||||||
* [Michael B. Klein](https://github.com/mbklein)
|
|
||||||
* [Jakub Michálek](https://github.com/Goues)
|
|
||||||
|
|
||||||
Thank you!
|
|
||||||
|
|
||||||
### Licensing
|
|
||||||
|
|
||||||
Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
[https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
397
docs/install.md
@@ -10,104 +10,168 @@ yarn add sharp
|
|||||||
|
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
* Node.js v6+
|
* Node.js v10+
|
||||||
|
|
||||||
### Building from source
|
## Prebuilt binaries
|
||||||
|
|
||||||
Pre-compiled binaries for sharp are provided for use with
|
Ready-compiled sharp and libvips binaries are provided for use with
|
||||||
Node versions 6, 8, 10, 11 and 12 on
|
Node.js v10+ on the most common platforms:
|
||||||
64-bit Windows, OS X and Linux platforms.
|
|
||||||
|
|
||||||
Sharp will be built from source at install time when:
|
* macOS x64 (>= 10.13)
|
||||||
|
* Linux x64 (glibc >= 2.17, musl >= 1.1.24)
|
||||||
|
* Linux ARM64 (glibc >= 2.29, musl >= 1.1.24)
|
||||||
|
* Windows x64
|
||||||
|
* Windows x86
|
||||||
|
|
||||||
* a globally-installed libvips is detected,
|
An ~7.5MB tarball containing libvips and its most commonly used dependencies
|
||||||
* pre-compiled binaries do not exist for the current platform and Node version, or
|
is downloaded via HTTPS and stored within `node_modules/sharp/vendor` during `npm install`.
|
||||||
|
|
||||||
|
This provides support for the
|
||||||
|
JPEG, PNG, WebP, AVIF, TIFF, GIF (input) and SVG (input) image formats.
|
||||||
|
|
||||||
|
The following platforms have prebuilt libvips but not sharp:
|
||||||
|
|
||||||
|
* macOS ARM64
|
||||||
|
* Linux ARMv6
|
||||||
|
* Linux ARMv7 (glibc >= 2.28)
|
||||||
|
* Windows ARM64
|
||||||
|
|
||||||
|
The following platforms require compilation of both libvips and sharp from source:
|
||||||
|
|
||||||
|
* Linux x86
|
||||||
|
* Linux x64 (glibc <= 2.16, includes RHEL/CentOS 6)
|
||||||
|
* Linux ARM64 (glibc <= 2.28)
|
||||||
|
* Linux PowerPC
|
||||||
|
* FreeBSD
|
||||||
|
* OpenBSD
|
||||||
|
|
||||||
|
## Common problems
|
||||||
|
|
||||||
|
The architecture and platform of Node.js used for `npm install`
|
||||||
|
must be the same as the architecture and platform of Node.js used at runtime.
|
||||||
|
See the [cross-platform](#cross-platform) section if this is not the case.
|
||||||
|
|
||||||
|
When using npm v6 or earlier, the `npm install --unsafe-perm` flag must be used when installing as `root` or a `sudo` user.
|
||||||
|
|
||||||
|
When using npm v7, the user running `npm install` must own the directory it is run in.
|
||||||
|
|
||||||
|
The `npm install --ignore-scripts=false` flag must be used when `npm` has been configured to ignore installation scripts.
|
||||||
|
|
||||||
|
Check the output of running `npm install --verbose sharp` for useful error messages.
|
||||||
|
|
||||||
|
## Apple M1
|
||||||
|
|
||||||
|
Prebuilt libvips binaries are provided for macOS on ARM64 (since sharp v0.28.0).
|
||||||
|
|
||||||
|
During `npm install` sharp will be built locally,
|
||||||
|
which requires Xcode and Python - see
|
||||||
|
[building from source](#building-from-source).
|
||||||
|
|
||||||
|
When this new ARM64 CPU is made freely available
|
||||||
|
to open source projects via a CI service
|
||||||
|
then prebuilt sharp binaries can also be provided.
|
||||||
|
|
||||||
|
## Cross-platform
|
||||||
|
|
||||||
|
At `npm install` time, prebuilt binaries are automatically selected for the
|
||||||
|
current OS platform and CPU architecture, where available.
|
||||||
|
|
||||||
|
The target platform and/or architecture can be manually selected using the following flags.
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm install --platform=... --arch=... --arm-version=... sharp
|
||||||
|
```
|
||||||
|
|
||||||
|
* `--platform`: one of `linux`, `linuxmusl`, `darwin` or `win32`.
|
||||||
|
* `--arch`: one of `x64`, `ia32`, `arm` or `arm64`.
|
||||||
|
* `--arm-version`: one of `6`, `7` or `8` (`arm` defaults to `6`, `arm64` defaults to `8`).
|
||||||
|
* `--sharp-install-force`: skip version compatibility checks.
|
||||||
|
|
||||||
|
These values can also be set via environment variables,
|
||||||
|
`npm_config_platform`, `npm_config_arch`, `npm_config_arm_version`
|
||||||
|
and `SHARP_INSTALL_FORCE` respectively.
|
||||||
|
|
||||||
|
For example, if the target machine has a 64-bit ARM CPU and is running Alpine Linux,
|
||||||
|
use the following flags:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
npm install --arch=arm64 --platform=linuxmusl sharp
|
||||||
|
```
|
||||||
|
|
||||||
|
## Custom libvips
|
||||||
|
|
||||||
|
To use a custom, globally-installed version of libvips instead of the provided binaries,
|
||||||
|
make sure it is at least the version listed under `config.libvips` in the `package.json` file
|
||||||
|
and that it can be located using `pkg-config --modversion vips-cpp`.
|
||||||
|
|
||||||
|
For help compiling libvips from source, please see
|
||||||
|
[https://libvips.github.io/libvips/install.html#building-libvips-from-a-source-tarball](https://libvips.github.io/libvips/install.html#building-libvips-from-a-source-tarball).
|
||||||
|
|
||||||
|
The use of a globally-installed libvips is unsupported on Windows.
|
||||||
|
|
||||||
|
## Building from source
|
||||||
|
|
||||||
|
This module will be compiled from source at `npm install` time when:
|
||||||
|
|
||||||
|
* a globally-installed libvips is detected (set the `SHARP_IGNORE_GLOBAL_LIBVIPS` environment variable to skip this),
|
||||||
|
* prebuilt sharp binaries do not exist for the current platform, or
|
||||||
* when the `npm install --build-from-source` flag is used.
|
* when the `npm install --build-from-source` flag is used.
|
||||||
|
|
||||||
Building from source requires:
|
Building from source requires:
|
||||||
|
|
||||||
* C++11 compatible compiler such as gcc 4.8+, clang 3.0+ or MSVC 2013+
|
* C++11 compiler
|
||||||
* [node-gyp](https://github.com/nodejs/node-gyp#installation) and its dependencies (includes Python 2.7)
|
* [node-gyp](https://github.com/nodejs/node-gyp#installation) and its dependencies
|
||||||
|
|
||||||
## libvips
|
## Custom prebuilt binaries
|
||||||
|
|
||||||
### Linux
|
This is an advanced approach that most people will not require.
|
||||||
|
|
||||||
[](https://travis-ci.org/lovell/sharp)
|
To install the prebuilt sharp binaries from a custom URL,
|
||||||
|
set the `sharp_binary_host` npm config option
|
||||||
|
or the `npm_config_sharp_binary_host` environment variable.
|
||||||
|
|
||||||
libvips and its dependencies are fetched and stored within `node_modules/sharp/vendor` during `npm install`.
|
To install the prebuilt sharp binaries from a directory on the local filesystem,
|
||||||
This involves an automated HTTPS download of approximately 9MB.
|
set the `sharp_local_prebuilds` npm config option
|
||||||
|
or the `npm_config_sharp_local_prebuilds` environment variable.
|
||||||
|
|
||||||
Most Linux-based (glibc, musl) operating systems running on x64 and ARMv6+ CPUs should "just work", e.g.:
|
To install the prebuilt libvips binaries from a custom URL,
|
||||||
|
set the `sharp_libvips_binary_host` npm config option
|
||||||
|
or the `npm_config_sharp_libvips_binary_host` environment variable.
|
||||||
|
|
||||||
* Debian 7+
|
The version subpath and file name are appended to these. There should be tarballs available
|
||||||
* Ubuntu 14.04+
|
that are compressed with both gzip and Brotli, as the format downloaded will vary depending
|
||||||
* Centos 7+
|
on whether the user's version of Node supports Brotli decompression (Node.js v10.16.0+)
|
||||||
* Alpine 3.8+ (Node 8+)
|
|
||||||
* Fedora
|
|
||||||
* openSUSE 13.2+
|
|
||||||
* Archlinux
|
|
||||||
* Raspbian Jessie
|
|
||||||
* Amazon Linux
|
|
||||||
* Solus
|
|
||||||
|
|
||||||
To use a globally-installed version of libvips instead of the provided binaries,
|
For example, if `sharp_libvips_binary_host` is set to `https://hostname/path`
|
||||||
make sure it is at least the version listed under `config.libvips` in the `package.json` file
|
and the libvips version is `1.2.3` then the resultant URL will be
|
||||||
and that it can be located using `pkg-config --modversion vips-cpp`.
|
`https://hostname/path/v1.2.3/libvips-1.2.3-platform-arch.tar.br` or
|
||||||
|
`https://hostname/path/v1.2.3/libvips-1.2.3-platform-arch.tar.gz`.
|
||||||
|
|
||||||
If you are using non-standard paths (anything other than `/usr` or `/usr/local`),
|
See the Chinese mirror below for a further example.
|
||||||
you might need to set `PKG_CONFIG_PATH` during `npm install`
|
|
||||||
and `LD_LIBRARY_PATH` at runtime.
|
|
||||||
|
|
||||||
This allows the use of newer versions of libvips with older versions of sharp.
|
## Chinese mirror
|
||||||
|
|
||||||
For 32-bit Intel CPUs and older Linux-based operating systems such as Centos 6,
|
A mirror site based in China, provided by Alibaba, contains binaries for both sharp and libvips.
|
||||||
compiling libvips from source is recommended.
|
|
||||||
|
|
||||||
[https://libvips.github.io/libvips/install.html#building-libvips-from-a-source-tarball](https://libvips.github.io/libvips/install.html#building-libvips-from-a-source-tarball)
|
To use this either set the following configuration:
|
||||||
|
|
||||||
#### Alpine Linux
|
|
||||||
|
|
||||||
libvips is available in the
|
|
||||||
[testing repository](https://pkgs.alpinelinux.org/packages?name=vips-dev):
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
apk add vips-dev fftw-dev build-base --update-cache \
|
npm config set sharp_binary_host "https://npm.taobao.org/mirrors/sharp"
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/edge/testing/ \
|
npm config set sharp_libvips_binary_host "https://npm.taobao.org/mirrors/sharp-libvips"
|
||||||
--repository https://alpine.global.ssl.fastly.net/alpine/edge/main
|
npm install sharp
|
||||||
```
|
```
|
||||||
|
|
||||||
The smaller stack size of musl libc means
|
or set the following environment variables:
|
||||||
libvips may need to be used without a cache
|
|
||||||
via `sharp.cache(false)` to avoid a stack overflow.
|
|
||||||
|
|
||||||
### Mac OS
|
```sh
|
||||||
|
npm_config_sharp_binary_host="https://npm.taobao.org/mirrors/sharp" \
|
||||||
|
npm_config_sharp_libvips_binary_host="https://npm.taobao.org/mirrors/sharp-libvips" \
|
||||||
|
npm install sharp
|
||||||
|
```
|
||||||
|
|
||||||
[](https://travis-ci.org/lovell/sharp)
|
## FreeBSD
|
||||||
|
|
||||||
libvips and its dependencies are fetched and stored within `node_modules/sharp/vendor` during `npm install`.
|
The `vips` package must be installed before `npm install` is run.
|
||||||
This involves an automated HTTPS download of approximately 8MB.
|
|
||||||
|
|
||||||
To use your own version of libvips instead of the provided binaries, make sure it is
|
|
||||||
at least the version listed under `config.libvips` in the `package.json` file and
|
|
||||||
that it can be located using `pkg-config --modversion vips-cpp`.
|
|
||||||
|
|
||||||
### Windows x64
|
|
||||||
|
|
||||||
[](https://ci.appveyor.com/project/lovell/sharp)
|
|
||||||
|
|
||||||
libvips and its dependencies are fetched and stored within `node_modules\sharp\vendor` during `npm install`.
|
|
||||||
This involves an automated HTTPS download of approximately 14MB.
|
|
||||||
If you are having issues during installation consider removing the directory
|
|
||||||
`C:\Users\[user]\AppData\Roaming\npm-cache\_libvips`.
|
|
||||||
|
|
||||||
Only 64-bit (x64) `node.exe` is supported.
|
|
||||||
|
|
||||||
### FreeBSD
|
|
||||||
|
|
||||||
libvips must be installed before `npm install` is run.
|
|
||||||
|
|
||||||
This can be achieved via package or ports:
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
pkg install -y pkgconf vips
|
pkg install -y pkgconf vips
|
||||||
@@ -117,169 +181,92 @@ pkg install -y pkgconf vips
|
|||||||
cd /usr/ports/graphics/vips/ && make install clean
|
cd /usr/ports/graphics/vips/ && make install clean
|
||||||
```
|
```
|
||||||
|
|
||||||
FreeBSD's gcc v4 and v5 need `CXXFLAGS=-D_GLIBCXX_USE_C99` set for C++11 support due to
|
## Linux memory allocator
|
||||||
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=193528
|
|
||||||
|
|
||||||
### Heroku
|
The default memory allocator on most glibc-based Linux systems
|
||||||
|
(e.g. Debian, Red Hat) is unsuitable for long-running, multi-threaded
|
||||||
|
processes that involve lots of small memory allocations.
|
||||||
|
|
||||||
Set [NODE_MODULES_CACHE](https://devcenter.heroku.com/articles/nodejs-support#cache-behavior)
|
For this reason, by default, sharp will limit the use of thread-based
|
||||||
|
[concurrency](api-utility#concurrency) when the glibc allocator is
|
||||||
|
detected at runtime.
|
||||||
|
|
||||||
|
To help avoid fragmentation and improve performance on these systems,
|
||||||
|
the use of an alternative memory allocator such as
|
||||||
|
[jemalloc](https://github.com/jemalloc/jemalloc) is recommended.
|
||||||
|
|
||||||
|
Those using musl-based Linux (e.g. Alpine) and non-Linux systems are
|
||||||
|
unaffected.
|
||||||
|
|
||||||
|
## Heroku
|
||||||
|
|
||||||
|
Add the
|
||||||
|
[jemalloc buildpack](https://github.com/gaffneyc/heroku-buildpack-jemalloc)
|
||||||
|
to reduce the effects of memory fragmentation.
|
||||||
|
|
||||||
|
Set
|
||||||
|
[NODE_MODULES_CACHE](https://devcenter.heroku.com/articles/nodejs-support#cache-behavior)
|
||||||
to `false` when using the `yarn` package manager.
|
to `false` when using the `yarn` package manager.
|
||||||
|
|
||||||
### Docker
|
## AWS Lambda
|
||||||
|
|
||||||
[Marc Bachmann](https://github.com/marcbachmann) maintains an
|
|
||||||
[Ubuntu-based Dockerfile for libvips](https://github.com/marcbachmann/dockerfile-libvips).
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker pull marcbachmann/libvips
|
|
||||||
```
|
|
||||||
|
|
||||||
[Will Jordan](https://github.com/wjordan) maintains an
|
|
||||||
[Alpine-based Dockerfile for libvips](https://github.com/wjordan/dockerfile-libvips).
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker pull wjordan/libvips
|
|
||||||
```
|
|
||||||
|
|
||||||
[Tailor Brands](https://github.com/TailorBrands) maintain
|
|
||||||
[Debian-based Dockerfiles for libvips and nodejs](https://github.com/TailorBrands/docker-libvips).
|
|
||||||
|
|
||||||
```sh
|
|
||||||
docker pull tailor/docker-libvips
|
|
||||||
```
|
|
||||||
|
|
||||||
### AWS Lambda
|
|
||||||
|
|
||||||
Set the Lambda runtime to Node.js 8.10.
|
|
||||||
|
|
||||||
The binaries in the `node_modules` directory of the
|
The binaries in the `node_modules` directory of the
|
||||||
[deployment package](https://docs.aws.amazon.com/lambda/latest/dg/nodejs-create-deployment-pkg.html)
|
[deployment package](https://docs.aws.amazon.com/lambda/latest/dg/nodejs-package.html)
|
||||||
must be for the Linux x64 platform/architecture.
|
must be for the Linux x64 platform.
|
||||||
|
|
||||||
On non-Linux machines such as OS X and Windows run the following:
|
When building your deployment package on machines other than Linux x64 (glibc),
|
||||||
|
run the following commands:
|
||||||
|
|
||||||
|
macOS:
|
||||||
```sh
|
```sh
|
||||||
rm -rf node_modules/sharp
|
rm -rf node_modules/sharp
|
||||||
npm install --arch=x64 --platform=linux --target=8.10.0 sharp
|
SHARP_IGNORE_GLOBAL_LIBVIPS=1 npm install --arch=x64 --platform=linux sharp
|
||||||
|
```
|
||||||
|
|
||||||
|
Windows:
|
||||||
|
```sh
|
||||||
|
rmdir /s /q node_modules/sharp
|
||||||
|
npm install --arch=x64 --platform=linux sharp
|
||||||
```
|
```
|
||||||
|
|
||||||
Alternatively a Docker container closely matching the Lambda runtime can be used:
|
Alternatively a Docker container closely matching the Lambda runtime can be used:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
rm -rf node_modules/sharp
|
rm -rf node_modules/sharp
|
||||||
docker run -v "$PWD":/var/task lambci/lambda:build-nodejs8.10 npm install sharp
|
docker run -v "$PWD":/var/task lambci/lambda:build-nodejs12.x npm install sharp
|
||||||
```
|
```
|
||||||
|
|
||||||
To get the best performance select the largest memory available.
|
To get the best performance select the largest memory available.
|
||||||
A 1536 MB function provides ~12x more CPU time than a 128 MB function.
|
A 1536 MB function provides ~12x more CPU time than a 128 MB function.
|
||||||
|
|
||||||
### NW.js
|
## Webpack
|
||||||
|
|
||||||
Run the `nw-gyp` tool after installation.
|
Ensure sharp is added to the
|
||||||
|
[externals](https://webpack.js.org/configuration/externals/)
|
||||||
|
configuration.
|
||||||
|
|
||||||
```sh
|
```js
|
||||||
cd node-modules/sharp
|
externals: {
|
||||||
nw-gyp rebuild --arch=x64 --target=[your nw version]
|
'sharp': 'commonjs sharp'
|
||||||
node node_modules/sharp/install/dll-copy
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
[http://docs.nwjs.io/en/latest/For%20Users/Advanced/Use%20Native%20Node%20Modules/](http://docs.nwjs.io/en/latest/For%20Users/Advanced/Use%20Native%20Node%20Modules/)
|
## Worker threads
|
||||||
|
|
||||||
### Build tools
|
The main thread must call `require('sharp')`
|
||||||
|
before worker threads are created
|
||||||
|
to ensure shared libraries remain loaded in memory
|
||||||
|
until after all threads are complete.
|
||||||
|
|
||||||
* [gulp-responsive](https://www.npmjs.com/package/gulp-responsive)
|
## Known conflicts
|
||||||
* [grunt-sharp](https://www.npmjs.com/package/grunt-sharp)
|
|
||||||
|
|
||||||
### Coding tools
|
### Canvas and Windows
|
||||||
|
|
||||||
* [Sharp TypeScript Types](https://www.npmjs.com/package/@types/sharp)
|
The prebuilt binaries provided by `canvas` for Windows depend on the unmaintained GTK 2, last updated in 2011.
|
||||||
|
|
||||||
### CLI tools
|
These conflict with the modern, up-to-date binaries provided by sharp.
|
||||||
|
|
||||||
* [sharp-cli](https://www.npmjs.com/package/sharp-cli)
|
If both modules are used in the same Windows process, the following error will occur:
|
||||||
|
|
||||||
### Security
|
|
||||||
|
|
||||||
Many users of this module process untrusted, user-supplied images,
|
|
||||||
but there are aspects of security to consider when doing so.
|
|
||||||
|
|
||||||
It is possible to compile libvips with support for various third-party image loaders.
|
|
||||||
Each of these libraries has undergone differing levels of security testing.
|
|
||||||
|
|
||||||
Whilst tools such as [American Fuzzy Lop](http://lcamtuf.coredump.cx/afl/)
|
|
||||||
and [Valgrind](http://valgrind.org/) have been used to test
|
|
||||||
the most popular web-based formats, as well as libvips itself,
|
|
||||||
you are advised to perform your own testing and sandboxing.
|
|
||||||
|
|
||||||
### Pre-compiled libvips binaries
|
|
||||||
|
|
||||||
This module will attempt to download a pre-compiled bundle of libvips
|
|
||||||
and its dependencies on Linux and Windows machines under either of these
|
|
||||||
conditions:
|
|
||||||
|
|
||||||
1. If a global installation of libvips that meets the
|
|
||||||
minimum version requirement cannot be found;
|
|
||||||
1. If `SHARP_IGNORE_GLOBAL_LIBVIPS` environment variable is set.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
SHARP_IGNORE_GLOBAL_LIBVIPS=1 npm install sharp
|
|
||||||
```
|
```
|
||||||
|
The specified procedure could not be found.
|
||||||
Should you need to manually download and inspect these files,
|
|
||||||
you can do so via
|
|
||||||
[https://github.com/lovell/sharp-libvips/releases](https://github.com/lovell/sharp-libvips/releases)
|
|
||||||
|
|
||||||
Should you wish to install these from your own location,
|
|
||||||
set the `sharp_dist_base_url` npm config option, e.g.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
npm config set sharp_dist_base_url "https://hostname/path/"
|
|
||||||
npm install sharp
|
|
||||||
```
|
```
|
||||||
|
|
||||||
or set the `SHARP_DIST_BASE_URL` environment variable, e.g.
|
|
||||||
|
|
||||||
```sh
|
|
||||||
SHARP_DIST_BASE_URL="https://hostname/path/" npm install sharp
|
|
||||||
```
|
|
||||||
|
|
||||||
to use `https://hostname/path/libvips-x.y.z-platform.tar.gz`.
|
|
||||||
|
|
||||||
### Licences
|
|
||||||
|
|
||||||
This module is licensed under the terms of the
|
|
||||||
[Apache 2.0 Licence](https://github.com/lovell/sharp/blob/master/LICENSE).
|
|
||||||
|
|
||||||
The libraries downloaded and used by this module
|
|
||||||
are done so under the terms of the following licences,
|
|
||||||
all of which are compatible with the Apache 2.0 Licence.
|
|
||||||
|
|
||||||
Use of libraries under the terms of the LGPLv3 is via the
|
|
||||||
"any later version" clause of the LGPLv2 or LGPLv2.1.
|
|
||||||
|
|
||||||
| Library | Used under the terms of |
|
|
||||||
|---------------|----------------------------------------------------------------------------------------------------------|
|
|
||||||
| cairo | Mozilla Public License 2.0 |
|
|
||||||
| expat | MIT Licence |
|
|
||||||
| fontconfig | [fontconfig Licence](https://cgit.freedesktop.org/fontconfig/tree/COPYING) (BSD-like) |
|
|
||||||
| freetype | [freetype Licence](http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/FTL.TXT) (BSD-like) |
|
|
||||||
| fribidi | LGPLv3 |
|
|
||||||
| gettext | LGPLv3 |
|
|
||||||
| giflib | MIT Licence |
|
|
||||||
| glib | LGPLv3 |
|
|
||||||
| harfbuzz | MIT Licence |
|
|
||||||
| lcms | MIT Licence |
|
|
||||||
| libcroco | LGPLv3 |
|
|
||||||
| libexif | LGPLv3 |
|
|
||||||
| libffi | MIT Licence |
|
|
||||||
| libgsf | LGPLv3 |
|
|
||||||
| libjpeg-turbo | [zlib License, IJG License](https://github.com/libjpeg-turbo/libjpeg-turbo/blob/master/LICENSE.md) |
|
|
||||||
| libpng | [libpng License](http://www.libpng.org/pub/png/src/libpng-LICENSE.txt) |
|
|
||||||
| librsvg | LGPLv3 |
|
|
||||||
| libtiff | [libtiff License](http://www.libtiff.org/misc.html) (BSD-like) |
|
|
||||||
| libvips | LGPLv3 |
|
|
||||||
| libwebp | New BSD License |
|
|
||||||
| libxml2 | MIT Licence |
|
|
||||||
| pango | LGPLv3 |
|
|
||||||
| pixman | MIT Licence |
|
|
||||||
| zlib | [zlib Licence](https://github.com/madler/zlib/blob/master/zlib.h) |
|
|
||||||
|
|||||||
@@ -1,45 +1,46 @@
|
|||||||
# Performance
|
# Performance
|
||||||
|
|
||||||
### Test environment
|
A test to benchmark the performance of this module relative to alternatives.
|
||||||
|
|
||||||
* AWS EC2 eu-west-1 [c5.large](https://aws.amazon.com/ec2/instance-types/c5/) (2x Xeon Platinum 8124M CPU @ 3.00GHz)
|
## The contenders
|
||||||
* Ubuntu 18.04 (hvm-ssd/ubuntu-bionic-18.04-amd64-server-20180912 ami-00035f41c82244dab)
|
|
||||||
* Node.js v10.11.0
|
|
||||||
|
|
||||||
### The contenders
|
* [jimp](https://www.npmjs.com/package/jimp) v0.16.1 - Image processing in pure JavaScript. Provides bicubic interpolation.
|
||||||
|
* [mapnik](https://www.npmjs.org/package/mapnik) v4.5.6 - Whilst primarily a map renderer, Mapnik contains bitmap image utilities.
|
||||||
* [jimp](https://www.npmjs.com/package/jimp) v0.5.3 - Image processing in pure JavaScript. Provides bicubic interpolation.
|
|
||||||
* [mapnik](https://www.npmjs.org/package/mapnik) v4.0.1 - Whilst primarily a map renderer, Mapnik contains bitmap image utilities.
|
|
||||||
* [imagemagick-native](https://www.npmjs.com/package/imagemagick-native) v1.9.3 - Wrapper around libmagick++, supports Buffers only.
|
|
||||||
* [imagemagick](https://www.npmjs.com/package/imagemagick) v0.1.3 - Supports filesystem only and "*has been unmaintained for a long time*".
|
* [imagemagick](https://www.npmjs.com/package/imagemagick) v0.1.3 - Supports filesystem only and "*has been unmaintained for a long time*".
|
||||||
* [gm](https://www.npmjs.com/package/gm) v1.23.1 - Fully featured wrapper around GraphicsMagick's `gm` command line utility.
|
* [gm](https://www.npmjs.com/package/gm) v1.23.1 - Fully featured wrapper around GraphicsMagick's `gm` command line utility.
|
||||||
* sharp v0.21.0 / libvips v8.7.0 - Caching within libvips disabled to ensure a fair comparison.
|
* sharp v0.28.0 / libvips v8.10.6 - Caching within libvips disabled to ensure a fair comparison.
|
||||||
|
|
||||||
### The task
|
## The task
|
||||||
|
|
||||||
Decompress a 2725x2225 JPEG image,
|
Decompress a 2725x2225 JPEG image,
|
||||||
resize to 720x588 using Lanczos 3 resampling (where available),
|
resize to 720x588 using Lanczos 3 resampling (where available),
|
||||||
then compress to JPEG at a "quality" setting of 80.
|
then compress to JPEG at a "quality" setting of 80.
|
||||||
|
|
||||||
### Results
|
## Test environment
|
||||||
|
|
||||||
|
* AWS EC2 eu-west-1 [c5ad.xlarge](https://aws.amazon.com/ec2/instance-types/c5/) (4x AMD EPYC 7R32)
|
||||||
|
* Ubuntu 20.10 (ami-03f10415e8b0bfb86)
|
||||||
|
* Node.js v14.16.0
|
||||||
|
|
||||||
|
## Results
|
||||||
|
|
||||||
| Module | Input | Output | Ops/sec | Speed-up |
|
| Module | Input | Output | Ops/sec | Speed-up |
|
||||||
| :----------------- | :----- | :----- | ------: | -------: |
|
| :----------------- | :----- | :----- | ------: | -------: |
|
||||||
| jimp | buffer | buffer | 0.71 | 1.0 |
|
| jimp | buffer | buffer | 0.78 | 1.0 |
|
||||||
| mapnik | buffer | buffer | 3.32 | 4.7 |
|
| mapnik | buffer | buffer | 3.39 | 4.3 |
|
||||||
| gm | buffer | buffer | 3.97 | 5.6 |
|
| gm | buffer | buffer | 7.84 | 10.1 |
|
||||||
| imagemagick-native | buffer | buffer | 4.06 | 5.7 |
|
| gm | file | file | 9.24 | 11.8 |
|
||||||
| imagemagick | file | file | 4.24 | 6.0 |
|
| imagemagick | file | file | 9.37 | 12.0 |
|
||||||
| sharp | stream | stream | 25.30 | 35.6 |
|
| sharp | stream | stream | 26.84 | 34.4 |
|
||||||
| sharp | file | file | 26.17 | 36.9 |
|
| sharp | file | file | 29.76 | 38.2 |
|
||||||
| sharp | buffer | buffer | 26.45 | 37.3 |
|
| sharp | buffer | buffer | 31.60 | 40.5 |
|
||||||
|
|
||||||
Greater libvips performance can be expected with caching enabled (default)
|
Greater libvips performance can be expected with caching enabled (default)
|
||||||
and using 8+ core machines, especially those with larger L1/L2 CPU caches.
|
and using 8+ core machines, especially those with larger L1/L2 CPU caches.
|
||||||
|
|
||||||
The I/O limits of the relevant (de)compression library will generally determine maximum throughput.
|
The I/O limits of the relevant (de)compression library will generally determine maximum throughput.
|
||||||
|
|
||||||
### Benchmark test prerequisites
|
## Running the benchmark test
|
||||||
|
|
||||||
Requires _ImageMagick_, _GraphicsMagick_ and _Mapnik_:
|
Requires _ImageMagick_, _GraphicsMagick_ and _Mapnik_:
|
||||||
|
|
||||||
@@ -50,19 +51,17 @@ brew install mapnik
|
|||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo apt-get install imagemagick libmagick++-dev graphicsmagick libmapnik-dev
|
sudo apt-get install build-essential imagemagick libmagick++-dev graphicsmagick libmapnik-dev
|
||||||
```
|
```
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
sudo yum install ImageMagick-devel ImageMagick-c++-devel GraphicsMagick mapnik-devel
|
sudo yum install ImageMagick-devel ImageMagick-c++-devel GraphicsMagick mapnik-devel
|
||||||
```
|
```
|
||||||
|
|
||||||
### Running the benchmark test
|
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git clone https://github.com/lovell/sharp.git
|
git clone https://github.com/lovell/sharp.git
|
||||||
cd sharp
|
cd sharp
|
||||||
npm install
|
npm install --build-from-source
|
||||||
cd test/bench
|
cd test/bench
|
||||||
npm install
|
npm install
|
||||||
npm test
|
npm test
|
||||||
|
|||||||
2
docs/robots.txt
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
User-agent: *
|
||||||
|
Disallow:
|
||||||
1
docs/search-index.json
Normal file
61
docs/search-index/build.js
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
const fs = require('fs');
|
||||||
|
const path = require('path');
|
||||||
|
const { extractDescription, extractKeywords, extractParameters } = require('./extract');
|
||||||
|
|
||||||
|
const searchIndex = [];
|
||||||
|
|
||||||
|
// Install
|
||||||
|
const contents = fs.readFileSync(path.join(__dirname, '..', 'install.md'), 'utf8');
|
||||||
|
const matches = contents.matchAll(
|
||||||
|
/## (?<title>[A-Za-z0-9 ]+)\n\n(?<body>[^#]+)/gs
|
||||||
|
);
|
||||||
|
for (const match of matches) {
|
||||||
|
const { title, body } = match.groups;
|
||||||
|
const description = extractDescription(body);
|
||||||
|
|
||||||
|
searchIndex.push({
|
||||||
|
t: title,
|
||||||
|
d: description,
|
||||||
|
k: extractKeywords(`${title} ${description}`),
|
||||||
|
l: `/install#${title.toLowerCase().replace(/ /g, '-')}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// API
|
||||||
|
[
|
||||||
|
'constructor',
|
||||||
|
'input',
|
||||||
|
'output',
|
||||||
|
'resize',
|
||||||
|
'composite',
|
||||||
|
'operation',
|
||||||
|
'channel',
|
||||||
|
'colour',
|
||||||
|
'utility'
|
||||||
|
].forEach((section) => {
|
||||||
|
const contents = fs.readFileSync(path.join(__dirname, '..', `api-${section}.md`), 'utf8');
|
||||||
|
const matches = contents.matchAll(
|
||||||
|
/\n## (?<title>[A-Za-z]+)\n\n(?<firstparagraph>.+?)\n\n(?<parameters>### Parameters.+?Returns)?/gs
|
||||||
|
);
|
||||||
|
for (const match of matches) {
|
||||||
|
const { title, firstparagraph, parameters } = match.groups;
|
||||||
|
const description = firstparagraph.startsWith('###')
|
||||||
|
? 'Constructor'
|
||||||
|
: extractDescription(firstparagraph);
|
||||||
|
const parameterNames = parameters ? extractParameters(parameters) : '';
|
||||||
|
|
||||||
|
searchIndex.push({
|
||||||
|
t: title,
|
||||||
|
d: description,
|
||||||
|
k: extractKeywords(`${title} ${description} ${parameterNames}`),
|
||||||
|
l: `/api-${section}#${title.toLowerCase()}`
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(__dirname, '..', 'search-index.json'),
|
||||||
|
JSON.stringify(searchIndex)
|
||||||
|
);
|
||||||
30
docs/search-index/extract.js
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
const stopWords = require('./stop-words');
|
||||||
|
|
||||||
|
const extractDescription = (str) =>
|
||||||
|
str
|
||||||
|
.replace(/### Examples.*/sg, '')
|
||||||
|
.replace(/\(http[^)]+/g, '')
|
||||||
|
.replace(/\s+/g, ' ')
|
||||||
|
.replace(/[^A-Za-z0-9_/\-,. ]/g, '')
|
||||||
|
.replace(/\s+/g, ' ')
|
||||||
|
.substr(0, 180)
|
||||||
|
.trim();
|
||||||
|
|
||||||
|
const extractParameters = (str) =>
|
||||||
|
[...str.matchAll(/options\.(?<name>[^.`]+)/gs)]
|
||||||
|
.map((match) => match.groups.name)
|
||||||
|
.join(' ');
|
||||||
|
|
||||||
|
const extractKeywords = (str) =>
|
||||||
|
[
|
||||||
|
...new Set(
|
||||||
|
str
|
||||||
|
.split(/[ -/]/)
|
||||||
|
.map((word) => word.toLowerCase().replace(/[^a-z]/g, ''))
|
||||||
|
.filter((word) => word.length > 2 && word.length < 15 && !stopWords.includes(word))
|
||||||
|
)
|
||||||
|
].join(' ');
|
||||||
|
|
||||||
|
module.exports = { extractDescription, extractKeywords, extractParameters };
|
||||||
100
docs/search-index/stop-words.js
Normal file
@@ -0,0 +1,100 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
module.exports = [
|
||||||
|
'about',
|
||||||
|
'after',
|
||||||
|
'all',
|
||||||
|
'allows',
|
||||||
|
'already',
|
||||||
|
'also',
|
||||||
|
'alternative',
|
||||||
|
'always',
|
||||||
|
'and',
|
||||||
|
'any',
|
||||||
|
'are',
|
||||||
|
'based',
|
||||||
|
'been',
|
||||||
|
'before',
|
||||||
|
'both',
|
||||||
|
'call',
|
||||||
|
'callback',
|
||||||
|
'can',
|
||||||
|
'containing',
|
||||||
|
'default',
|
||||||
|
'does',
|
||||||
|
'each',
|
||||||
|
'either',
|
||||||
|
'ensure',
|
||||||
|
'etc',
|
||||||
|
'every',
|
||||||
|
'except',
|
||||||
|
'for',
|
||||||
|
'from',
|
||||||
|
'get',
|
||||||
|
'gets',
|
||||||
|
'given',
|
||||||
|
'has',
|
||||||
|
'have',
|
||||||
|
'how',
|
||||||
|
'image',
|
||||||
|
'involve',
|
||||||
|
'its',
|
||||||
|
'least',
|
||||||
|
'lots',
|
||||||
|
'may',
|
||||||
|
'more',
|
||||||
|
'most',
|
||||||
|
'much',
|
||||||
|
'must',
|
||||||
|
'non',
|
||||||
|
'not',
|
||||||
|
'occur',
|
||||||
|
'occurs',
|
||||||
|
'options',
|
||||||
|
'other',
|
||||||
|
'out',
|
||||||
|
'over',
|
||||||
|
'perform',
|
||||||
|
'performs',
|
||||||
|
'provide',
|
||||||
|
'provided',
|
||||||
|
'ready',
|
||||||
|
'requires',
|
||||||
|
'returned',
|
||||||
|
'same',
|
||||||
|
'see',
|
||||||
|
'set',
|
||||||
|
'sets',
|
||||||
|
'should',
|
||||||
|
'since',
|
||||||
|
'spelling',
|
||||||
|
'such',
|
||||||
|
'support',
|
||||||
|
'supported',
|
||||||
|
'sure',
|
||||||
|
'take',
|
||||||
|
'than',
|
||||||
|
'that',
|
||||||
|
'the',
|
||||||
|
'their',
|
||||||
|
'then',
|
||||||
|
'there',
|
||||||
|
'therefore',
|
||||||
|
'these',
|
||||||
|
'this',
|
||||||
|
'under',
|
||||||
|
'unless',
|
||||||
|
'until',
|
||||||
|
'use',
|
||||||
|
'used',
|
||||||
|
'using',
|
||||||
|
'value',
|
||||||
|
'values',
|
||||||
|
'when',
|
||||||
|
'which',
|
||||||
|
'while',
|
||||||
|
'will',
|
||||||
|
'with',
|
||||||
|
'without',
|
||||||
|
'you'
|
||||||
|
];
|
||||||
11
install/can-compile.js
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
const libvips = require('../lib/libvips');
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (!(libvips.useGlobalLibvips() || libvips.hasVendoredLibvips())) {
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
@@ -3,20 +3,21 @@
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
|
||||||
const copyFileSync = require('fs-copy-file-sync');
|
|
||||||
const libvips = require('../lib/libvips');
|
const libvips = require('../lib/libvips');
|
||||||
const npmLog = require('npmlog');
|
|
||||||
|
|
||||||
if (process.platform === 'win32') {
|
const minimumLibvipsVersion = libvips.minimumLibvipsVersion;
|
||||||
|
|
||||||
|
const platform = process.env.npm_config_platform || process.platform;
|
||||||
|
if (platform === 'win32') {
|
||||||
const buildDir = path.join(__dirname, '..', 'build');
|
const buildDir = path.join(__dirname, '..', 'build');
|
||||||
const buildReleaseDir = path.join(buildDir, 'Release');
|
const buildReleaseDir = path.join(buildDir, 'Release');
|
||||||
npmLog.info('sharp', `Creating ${buildReleaseDir}`);
|
libvips.log(`Creating ${buildReleaseDir}`);
|
||||||
try {
|
try {
|
||||||
libvips.mkdirSync(buildDir);
|
libvips.mkdirSync(buildDir);
|
||||||
libvips.mkdirSync(buildReleaseDir);
|
libvips.mkdirSync(buildReleaseDir);
|
||||||
} catch (err) {}
|
} catch (err) {}
|
||||||
const vendorLibDir = path.join(__dirname, '..', 'vendor', 'lib');
|
const vendorLibDir = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion, 'lib');
|
||||||
npmLog.info('sharp', `Copying DLLs from ${vendorLibDir} to ${buildReleaseDir}`);
|
libvips.log(`Copying DLLs from ${vendorLibDir} to ${buildReleaseDir}`);
|
||||||
try {
|
try {
|
||||||
fs
|
fs
|
||||||
.readdirSync(vendorLibDir)
|
.readdirSync(vendorLibDir)
|
||||||
@@ -24,12 +25,13 @@ if (process.platform === 'win32') {
|
|||||||
return /\.dll$/.test(filename);
|
return /\.dll$/.test(filename);
|
||||||
})
|
})
|
||||||
.forEach(function (filename) {
|
.forEach(function (filename) {
|
||||||
copyFileSync(
|
fs.copyFileSync(
|
||||||
path.join(vendorLibDir, filename),
|
path.join(vendorLibDir, filename),
|
||||||
path.join(buildReleaseDir, filename)
|
path.join(buildReleaseDir, filename)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
npmLog.error('sharp', err.message);
|
libvips.log(err);
|
||||||
|
process.exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,105 +3,176 @@
|
|||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
const os = require('os');
|
const os = require('os');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
|
const stream = require('stream');
|
||||||
|
const zlib = require('zlib');
|
||||||
|
|
||||||
const detectLibc = require('detect-libc');
|
const detectLibc = require('detect-libc');
|
||||||
const npmLog = require('npmlog');
|
const semverLessThan = require('semver/functions/lt');
|
||||||
const semver = require('semver');
|
const semverSatisfies = require('semver/functions/satisfies');
|
||||||
const simpleGet = require('simple-get');
|
const simpleGet = require('simple-get');
|
||||||
const tar = require('tar');
|
const tarFs = require('tar-fs');
|
||||||
const copyFileSync = require('fs-copy-file-sync');
|
|
||||||
|
|
||||||
const agent = require('../lib/agent');
|
const agent = require('../lib/agent');
|
||||||
const libvips = require('../lib/libvips');
|
const libvips = require('../lib/libvips');
|
||||||
const platform = require('../lib/platform');
|
const platform = require('../lib/platform');
|
||||||
|
|
||||||
const minimumLibvipsVersion = libvips.minimumLibvipsVersion;
|
const minimumGlibcVersionByArch = {
|
||||||
const distBaseUrl = process.env.npm_config_sharp_dist_base_url || process.env.SHARP_DIST_BASE_URL || `https://github.com/lovell/sharp-libvips/releases/download/v${minimumLibvipsVersion}/`;
|
arm: '2.28',
|
||||||
|
arm64: '2.29',
|
||||||
|
x64: '2.17'
|
||||||
|
};
|
||||||
|
|
||||||
|
const hasSharpPrebuild = [
|
||||||
|
'darwin-x64',
|
||||||
|
'linux-arm64',
|
||||||
|
'linux-x64',
|
||||||
|
'linuxmusl-x64',
|
||||||
|
'linuxmusl-arm64',
|
||||||
|
'win32-ia32',
|
||||||
|
'win32-x64'
|
||||||
|
];
|
||||||
|
|
||||||
|
const { minimumLibvipsVersion, minimumLibvipsVersionLabelled } = libvips;
|
||||||
|
const distHost = process.env.npm_config_sharp_libvips_binary_host || 'https://github.com/lovell/sharp-libvips/releases/download';
|
||||||
|
const distBaseUrl = process.env.npm_config_sharp_dist_base_url || process.env.SHARP_DIST_BASE_URL || `${distHost}/v${minimumLibvipsVersionLabelled}/`;
|
||||||
|
const supportsBrotli = ('BrotliDecompress' in zlib);
|
||||||
|
const installationForced = !!(process.env.npm_config_sharp_install_force || process.env.SHARP_INSTALL_FORCE);
|
||||||
|
|
||||||
const fail = function (err) {
|
const fail = function (err) {
|
||||||
npmLog.error('sharp', err.message);
|
libvips.log(err);
|
||||||
npmLog.info('sharp', 'Attempting to build from source via node-gyp but this may fail due to the above error');
|
if (err.code === 'EACCES') {
|
||||||
npmLog.info('sharp', 'Please see https://sharp.pixelplumbing.com/page/install for required dependencies');
|
libvips.log('Are you trying to install as a root or sudo user? Try again with the --unsafe-perm flag');
|
||||||
|
}
|
||||||
|
libvips.log('Please see https://sharp.pixelplumbing.com/install for required dependencies');
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
};
|
};
|
||||||
|
|
||||||
const extractTarball = function (tarPath) {
|
const handleError = function (err) {
|
||||||
|
if (installationForced) {
|
||||||
|
libvips.log(`Installation warning: ${err.message}`);
|
||||||
|
} else {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const extractTarball = function (tarPath, platformAndArch) {
|
||||||
const vendorPath = path.join(__dirname, '..', 'vendor');
|
const vendorPath = path.join(__dirname, '..', 'vendor');
|
||||||
libvips.mkdirSync(vendorPath);
|
libvips.mkdirSync(vendorPath);
|
||||||
tar
|
const versionedVendorPath = path.join(vendorPath, minimumLibvipsVersion);
|
||||||
.extract({
|
libvips.mkdirSync(versionedVendorPath);
|
||||||
file: tarPath,
|
|
||||||
cwd: vendorPath,
|
const ignoreVendorInclude = hasSharpPrebuild.includes(platformAndArch) && !process.env.npm_config_build_from_source;
|
||||||
strict: true
|
const ignore = function (name) {
|
||||||
})
|
return ignoreVendorInclude && name.includes('include/');
|
||||||
.catch(function (err) {
|
};
|
||||||
if (/unexpected end of file/.test(err.message)) {
|
|
||||||
npmLog.error('sharp', `Please delete ${tarPath} as it is not a valid tarball`);
|
stream.pipeline(
|
||||||
|
fs.createReadStream(tarPath),
|
||||||
|
supportsBrotli ? new zlib.BrotliDecompress() : new zlib.Gunzip(),
|
||||||
|
tarFs.extract(versionedVendorPath, { ignore }),
|
||||||
|
function (err) {
|
||||||
|
if (err) {
|
||||||
|
if (/unexpected end of file/.test(err.message)) {
|
||||||
|
fail(new Error(`Please delete ${tarPath} as it is not a valid tarball`));
|
||||||
|
}
|
||||||
|
fail(err);
|
||||||
}
|
}
|
||||||
fail(err);
|
}
|
||||||
});
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const useGlobalLibvips = libvips.useGlobalLibvips();
|
const useGlobalLibvips = libvips.useGlobalLibvips();
|
||||||
|
|
||||||
if (useGlobalLibvips) {
|
if (useGlobalLibvips) {
|
||||||
const globalLibvipsVersion = libvips.globalLibvipsVersion();
|
const globalLibvipsVersion = libvips.globalLibvipsVersion();
|
||||||
npmLog.info('sharp', `Detected globally-installed libvips v${globalLibvipsVersion}`);
|
libvips.log(`Detected globally-installed libvips v${globalLibvipsVersion}`);
|
||||||
npmLog.info('sharp', 'Building from source via node-gyp');
|
libvips.log('Building from source via node-gyp');
|
||||||
process.exit(1);
|
process.exit(1);
|
||||||
} else if (libvips.hasVendoredLibvips()) {
|
} else if (libvips.hasVendoredLibvips()) {
|
||||||
npmLog.info('sharp', `Using existing vendored libvips v${minimumLibvipsVersion}`);
|
libvips.log(`Using existing vendored libvips v${minimumLibvipsVersion}`);
|
||||||
} else {
|
} else {
|
||||||
// Is this arch/platform supported?
|
// Is this arch/platform supported?
|
||||||
const arch = process.env.npm_config_arch || process.arch;
|
const arch = process.env.npm_config_arch || process.arch;
|
||||||
const platformAndArch = platform();
|
const platformAndArch = platform();
|
||||||
if (platformAndArch === 'win32-ia32') {
|
if (arch === 'ia32' && !platformAndArch.startsWith('win32')) {
|
||||||
throw new Error('Windows x86 (32-bit) node.exe is not supported');
|
|
||||||
}
|
|
||||||
if (arch === 'ia32') {
|
|
||||||
throw new Error(`Intel Architecture 32-bit systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
|
throw new Error(`Intel Architecture 32-bit systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
|
||||||
}
|
}
|
||||||
|
if (platformAndArch === 'darwin-arm64') {
|
||||||
|
throw new Error("Please run 'brew install vips' to install libvips on Apple M1 (ARM64) systems");
|
||||||
|
}
|
||||||
if (platformAndArch === 'freebsd-x64' || platformAndArch === 'openbsd-x64' || platformAndArch === 'sunos-x64') {
|
if (platformAndArch === 'freebsd-x64' || platformAndArch === 'openbsd-x64' || platformAndArch === 'sunos-x64') {
|
||||||
throw new Error(`BSD/SunOS systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
|
throw new Error(`BSD/SunOS systems require manual installation of libvips >= ${minimumLibvipsVersion}`);
|
||||||
}
|
}
|
||||||
if (detectLibc.family === detectLibc.GLIBC && detectLibc.version && semver.lt(`${detectLibc.version}.0`, '2.13.0')) {
|
// Linux libc version check
|
||||||
throw new Error(`Use with glibc version ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion}`);
|
if (detectLibc.family === detectLibc.GLIBC && detectLibc.version && minimumGlibcVersionByArch[arch]) {
|
||||||
|
if (semverLessThan(`${detectLibc.version}.0`, `${minimumGlibcVersionByArch[arch]}.0`)) {
|
||||||
|
handleError(new Error(`Use with glibc ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
if (detectLibc.family === detectLibc.MUSL && detectLibc.version) {
|
||||||
|
if (semverLessThan(detectLibc.version, '1.1.24')) {
|
||||||
|
handleError(new Error(`Use with musl ${detectLibc.version} requires manual installation of libvips >= ${minimumLibvipsVersion}`));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Node.js minimum version check
|
||||||
|
const supportedNodeVersion = process.env.npm_package_engines_node || require('../package.json').engines.node;
|
||||||
|
if (!semverSatisfies(process.versions.node, supportedNodeVersion)) {
|
||||||
|
handleError(new Error(`Expected Node.js version ${supportedNodeVersion} but found ${process.versions.node}`));
|
||||||
|
}
|
||||||
|
|
||||||
|
const extension = supportsBrotli ? 'br' : 'gz';
|
||||||
|
|
||||||
// Download to per-process temporary file
|
// Download to per-process temporary file
|
||||||
const tarFilename = ['libvips', minimumLibvipsVersion, platformAndArch].join('-') + '.tar.gz';
|
const tarFilename = ['libvips', minimumLibvipsVersion, platformAndArch].join('-') + '.tar.' + extension;
|
||||||
const tarPathCache = path.join(libvips.cachePath(), tarFilename);
|
const tarPathCache = path.join(libvips.cachePath(), tarFilename);
|
||||||
if (fs.existsSync(tarPathCache)) {
|
if (fs.existsSync(tarPathCache)) {
|
||||||
npmLog.info('sharp', `Using cached ${tarPathCache}`);
|
libvips.log(`Using cached ${tarPathCache}`);
|
||||||
extractTarball(tarPathCache);
|
extractTarball(tarPathCache, platformAndArch);
|
||||||
} else {
|
} else {
|
||||||
const tarPathTemp = path.join(os.tmpdir(), `${process.pid}-${tarFilename}`);
|
|
||||||
const tmpFile = fs.createWriteStream(tarPathTemp);
|
|
||||||
const url = distBaseUrl + tarFilename;
|
const url = distBaseUrl + tarFilename;
|
||||||
npmLog.info('sharp', `Downloading ${url}`);
|
libvips.log(`Downloading ${url}`);
|
||||||
simpleGet({ url: url, agent: agent() }, function (err, response) {
|
simpleGet({ url: url, agent: agent() }, function (err, response) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
fail(err);
|
||||||
|
} else if (response.statusCode === 404) {
|
||||||
|
fail(new Error(`Prebuilt libvips ${minimumLibvipsVersion} binaries are not yet available for ${platformAndArch}`));
|
||||||
|
} else if (response.statusCode !== 200) {
|
||||||
|
fail(new Error(`Status ${response.statusCode} ${response.statusMessage}`));
|
||||||
|
} else {
|
||||||
|
const tarPathTemp = path.join(os.tmpdir(), `${process.pid}-${tarFilename}`);
|
||||||
|
const tmpFileStream = fs.createWriteStream(tarPathTemp);
|
||||||
|
response
|
||||||
|
.on('error', function (err) {
|
||||||
|
tmpFileStream.destroy(err);
|
||||||
|
})
|
||||||
|
.on('close', function () {
|
||||||
|
if (!response.complete) {
|
||||||
|
tmpFileStream.destroy(new Error('Download incomplete (connection was terminated)'));
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.pipe(tmpFileStream);
|
||||||
|
tmpFileStream
|
||||||
|
.on('error', function (err) {
|
||||||
|
// Clean up temporary file
|
||||||
|
try {
|
||||||
|
fs.unlinkSync(tarPathTemp);
|
||||||
|
} catch (e) {}
|
||||||
|
fail(err);
|
||||||
|
})
|
||||||
|
.on('close', function () {
|
||||||
|
try {
|
||||||
|
// Attempt to rename
|
||||||
|
fs.renameSync(tarPathTemp, tarPathCache);
|
||||||
|
} catch (err) {
|
||||||
|
// Fall back to copy and unlink
|
||||||
|
fs.copyFileSync(tarPathTemp, tarPathCache);
|
||||||
|
fs.unlinkSync(tarPathTemp);
|
||||||
|
}
|
||||||
|
extractTarball(tarPathCache, platformAndArch);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
if (response.statusCode !== 200) {
|
|
||||||
throw new Error(`Status ${response.statusCode}`);
|
|
||||||
}
|
|
||||||
response
|
|
||||||
.on('error', fail)
|
|
||||||
.pipe(tmpFile);
|
|
||||||
});
|
});
|
||||||
tmpFile
|
|
||||||
.on('error', fail)
|
|
||||||
.on('close', function () {
|
|
||||||
try {
|
|
||||||
// Attempt to rename
|
|
||||||
fs.renameSync(tarPathTemp, tarPathCache);
|
|
||||||
} catch (err) {
|
|
||||||
// Fall back to copy and unlink
|
|
||||||
copyFileSync(tarPathTemp, tarPathCache);
|
|
||||||
fs.unlinkSync(tarPathTemp);
|
|
||||||
}
|
|
||||||
extractTarball(tarPathCache);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -20,15 +20,18 @@ function env (key) {
|
|||||||
|
|
||||||
module.exports = function () {
|
module.exports = function () {
|
||||||
try {
|
try {
|
||||||
const proxy = url.parse(proxies.map(env).find(is.string));
|
const proxy = new url.URL(proxies.map(env).find(is.string));
|
||||||
const tunnel = proxy.protocol === 'https:'
|
const tunnel = proxy.protocol === 'https:'
|
||||||
? tunnelAgent.httpsOverHttps
|
? tunnelAgent.httpsOverHttps
|
||||||
: tunnelAgent.httpsOverHttp;
|
: tunnelAgent.httpsOverHttp;
|
||||||
|
const proxyAuth = proxy.username && proxy.password
|
||||||
|
? `${decodeURIComponent(proxy.username)}:${decodeURIComponent(proxy.password)}`
|
||||||
|
: null;
|
||||||
return tunnel({
|
return tunnel({
|
||||||
proxy: {
|
proxy: {
|
||||||
port: Number(proxy.port),
|
port: Number(proxy.port),
|
||||||
host: proxy.hostname,
|
host: proxy.hostname,
|
||||||
proxyAuth: proxy.auth
|
proxyAuth
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ const bool = {
|
|||||||
/**
|
/**
|
||||||
* Remove alpha channel, if any. This is a no-op if the image does not have an alpha channel.
|
* Remove alpha channel, if any. This is a no-op if the image does not have an alpha channel.
|
||||||
*
|
*
|
||||||
|
* See also {@link /api-operation#flatten|flatten}.
|
||||||
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp('rgba.png')
|
* sharp('rgba.png')
|
||||||
* .removeAlpha()
|
* .removeAlpha()
|
||||||
@@ -30,19 +32,39 @@ function removeAlpha () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensure alpha channel, if missing. The added alpha channel will be fully opaque. This is a no-op if the image already has an alpha channel.
|
* Ensure the output image has an alpha transparency channel.
|
||||||
|
* If missing, the added alpha channel will have the specified
|
||||||
|
* transparency level, defaulting to fully-opaque (1).
|
||||||
|
* This is a no-op if the image already has an alpha channel.
|
||||||
|
*
|
||||||
|
* @since 0.21.2
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp('rgb.jpg')
|
* // rgba.png will be a 4 channel image with a fully-opaque alpha channel
|
||||||
|
* await sharp('rgb.jpg')
|
||||||
* .ensureAlpha()
|
* .ensureAlpha()
|
||||||
* .toFile('rgba.png', function(err, info) {
|
* .toFile('rgba.png')
|
||||||
* // rgba.png is a 4 channel image with a fully opaque alpha channel
|
|
||||||
* });
|
|
||||||
*
|
*
|
||||||
|
* @example
|
||||||
|
* // rgba is a 4 channel image with a fully-transparent alpha channel
|
||||||
|
* const rgba = await sharp(rgb)
|
||||||
|
* .ensureAlpha(0)
|
||||||
|
* .toBuffer();
|
||||||
|
*
|
||||||
|
* @param {number} [alpha=1] - alpha transparency level (0=fully-transparent, 1=fully-opaque)
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
|
* @throws {Error} Invalid alpha transparency level
|
||||||
*/
|
*/
|
||||||
function ensureAlpha () {
|
function ensureAlpha (alpha) {
|
||||||
this.options.ensureAlpha = true;
|
if (is.defined(alpha)) {
|
||||||
|
if (is.number(alpha) && is.inRange(alpha, 0, 1)) {
|
||||||
|
this.options.ensureAlpha = alpha;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('alpha', 'number between 0 and 1', alpha);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.options.ensureAlpha = 1;
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,27 +74,25 @@ function ensureAlpha () {
|
|||||||
* @example
|
* @example
|
||||||
* sharp(input)
|
* sharp(input)
|
||||||
* .extractChannel('green')
|
* .extractChannel('green')
|
||||||
* .toFile('input_green.jpg', function(err, info) {
|
* .toColourspace('b-w')
|
||||||
|
* .toFile('green.jpg', function(err, info) {
|
||||||
* // info.channels === 1
|
* // info.channels === 1
|
||||||
* // input_green.jpg contains the green channel of the input image
|
* // green.jpg is a greyscale image containing the green channel of the input
|
||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Number|String} channel - zero-indexed band number to extract, or `red`, `green` or `blue` as alternative to `0`, `1` or `2` respectively.
|
* @param {number|string} channel - zero-indexed channel/band number to extract, or `red`, `green`, `blue` or `alpha`.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid channel
|
* @throws {Error} Invalid channel
|
||||||
*/
|
*/
|
||||||
function extractChannel (channel) {
|
function extractChannel (channel) {
|
||||||
if (channel === 'red') {
|
const channelMap = { red: 0, green: 1, blue: 2, alpha: 3 };
|
||||||
channel = 0;
|
if (Object.keys(channelMap).includes(channel)) {
|
||||||
} else if (channel === 'green') {
|
channel = channelMap[channel];
|
||||||
channel = 1;
|
|
||||||
} else if (channel === 'blue') {
|
|
||||||
channel = 2;
|
|
||||||
}
|
}
|
||||||
if (is.integer(channel) && is.inRange(channel, 0, 4)) {
|
if (is.integer(channel) && is.inRange(channel, 0, 4)) {
|
||||||
this.options.extractChannel = channel;
|
this.options.extractChannel = channel;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Cannot extract invalid channel ' + channel);
|
throw is.invalidParameterError('channel', 'integer or one of: red, green, blue, alpha', channel);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -85,10 +105,10 @@ function extractChannel (channel) {
|
|||||||
* - sRGB: 0: Red, 1: Green, 2: Blue, 3: Alpha.
|
* - sRGB: 0: Red, 1: Green, 2: Blue, 3: Alpha.
|
||||||
* - CMYK: 0: Magenta, 1: Cyan, 2: Yellow, 3: Black, 4: Alpha.
|
* - CMYK: 0: Magenta, 1: Cyan, 2: Yellow, 3: Black, 4: Alpha.
|
||||||
*
|
*
|
||||||
* Buffers may be any of the image formats supported by sharp: JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data.
|
* Buffers may be any of the image formats supported by sharp.
|
||||||
* For raw pixel input, the `options` object should contain a `raw` attribute, which follows the format of the attribute of the same name in the `sharp()` constructor.
|
* For raw pixel input, the `options` object should contain a `raw` attribute, which follows the format of the attribute of the same name in the `sharp()` constructor.
|
||||||
*
|
*
|
||||||
* @param {Array<String|Buffer>|String|Buffer} images - one or more images (file paths, Buffers).
|
* @param {Array<string|Buffer>|string|Buffer} images - one or more images (file paths, Buffers).
|
||||||
* @param {Object} options - image options, see `sharp()` constructor.
|
* @param {Object} options - image options, see `sharp()` constructor.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
@@ -116,7 +136,7 @@ function joinChannel (images, options) {
|
|||||||
* // then `O(1,1) = 0b11110111 & 0b10101010 & 0b00001111 = 0b00000010 = 2`.
|
* // then `O(1,1) = 0b11110111 & 0b10101010 & 0b00001111 = 0b00000010 = 2`.
|
||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {String} boolOp - one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
* @param {string} boolOp - one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -124,7 +144,7 @@ function bandbool (boolOp) {
|
|||||||
if (is.string(boolOp) && is.inArray(boolOp, ['and', 'or', 'eor'])) {
|
if (is.string(boolOp) && is.inArray(boolOp, ['and', 'or', 'eor'])) {
|
||||||
this.options.bandBoolOp = boolOp;
|
this.options.bandBoolOp = boolOp;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid bandbool operation ' + boolOp);
|
throw is.invalidParameterError('boolOp', 'one of: and, or, eor', boolOp);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ const colourspace = {
|
|||||||
* Tint the image using the provided chroma while preserving the image luminance.
|
* Tint the image using the provided chroma while preserving the image luminance.
|
||||||
* An alpha channel may be present and will be unchanged by the operation.
|
* An alpha channel may be present and will be unchanged by the operation.
|
||||||
*
|
*
|
||||||
* @param {String|Object} rgb - parsed by the [color](https://www.npmjs.org/package/color) module to extract chroma values.
|
* @param {string|Object} rgb - parsed by the [color](https://www.npmjs.org/package/color) module to extract chroma values.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameter
|
* @throws {Error} Invalid parameter
|
||||||
*/
|
*/
|
||||||
@@ -57,13 +57,20 @@ function grayscale (grayscale) {
|
|||||||
/**
|
/**
|
||||||
* Set the output colourspace.
|
* Set the output colourspace.
|
||||||
* By default output image will be web-friendly sRGB, with additional channels interpreted as alpha channels.
|
* By default output image will be web-friendly sRGB, with additional channels interpreted as alpha channels.
|
||||||
* @param {String} [colourspace] - output colourspace e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...](https://github.com/libvips/libvips/blob/master/libvips/iofuncs/enumtypes.c#L568)
|
*
|
||||||
|
* @example
|
||||||
|
* // Output 16 bits per pixel RGB
|
||||||
|
* await sharp(input)
|
||||||
|
* .toColourspace('rgb16')
|
||||||
|
* .toFile('16-bpp.png')
|
||||||
|
*
|
||||||
|
* @param {string} [colourspace] - output colourspace e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...](https://github.com/libvips/libvips/blob/master/libvips/iofuncs/enumtypes.c#L568)
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
function toColourspace (colourspace) {
|
function toColourspace (colourspace) {
|
||||||
if (!is.string(colourspace)) {
|
if (!is.string(colourspace)) {
|
||||||
throw new Error('Invalid output colourspace ' + colourspace);
|
throw is.invalidParameterError('colourspace', 'string', colourspace);
|
||||||
}
|
}
|
||||||
this.options.colourspace = colourspace;
|
this.options.colourspace = colourspace;
|
||||||
return this;
|
return this;
|
||||||
@@ -71,7 +78,7 @@ function toColourspace (colourspace) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Alternative spelling of `toColourspace`.
|
* Alternative spelling of `toColourspace`.
|
||||||
* @param {String} [colorspace] - output colorspace.
|
* @param {string} [colorspace] - output colorspace.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -82,19 +89,23 @@ function toColorspace (colorspace) {
|
|||||||
/**
|
/**
|
||||||
* Update a colour attribute of the this.options Object.
|
* Update a colour attribute of the this.options Object.
|
||||||
* @private
|
* @private
|
||||||
* @param {String} key
|
* @param {string} key
|
||||||
* @param {String|Object} val
|
* @param {string|Object} value
|
||||||
* @throws {Error} Invalid key
|
* @throws {Error} Invalid value
|
||||||
*/
|
*/
|
||||||
function _setColourOption (key, val) {
|
function _setBackgroundColourOption (key, value) {
|
||||||
if (is.object(val) || is.string(val)) {
|
if (is.defined(value)) {
|
||||||
const colour = color(val);
|
if (is.object(value) || is.string(value)) {
|
||||||
this.options[key] = [
|
const colour = color(value);
|
||||||
colour.red(),
|
this.options[key] = [
|
||||||
colour.green(),
|
colour.red(),
|
||||||
colour.blue(),
|
colour.green(),
|
||||||
Math.round(colour.alpha() * 255)
|
colour.blue(),
|
||||||
];
|
Math.round(colour.alpha() * 255)
|
||||||
|
];
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('background', 'object or string', value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +122,7 @@ module.exports = function (Sharp) {
|
|||||||
toColourspace,
|
toColourspace,
|
||||||
toColorspace,
|
toColorspace,
|
||||||
// Private
|
// Private
|
||||||
_setColourOption
|
_setBackgroundColourOption
|
||||||
});
|
});
|
||||||
// Class attributes
|
// Class attributes
|
||||||
Sharp.colourspace = colourspace;
|
Sharp.colourspace = colourspace;
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const deprecate = require('util').deprecate;
|
|
||||||
|
|
||||||
const is = require('./is');
|
const is = require('./is');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -55,6 +53,8 @@ const blend = {
|
|||||||
* https://libvips.github.io/libvips/API/current/libvips-conversion.html#VipsBlendMode
|
* https://libvips.github.io/libvips/API/current/libvips-conversion.html#VipsBlendMode
|
||||||
* and https://www.cairographics.org/operators/
|
* and https://www.cairographics.org/operators/
|
||||||
*
|
*
|
||||||
|
* @since 0.22.0
|
||||||
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp('input.png')
|
* sharp('input.png')
|
||||||
* .rotate(180)
|
* .rotate(180)
|
||||||
@@ -72,7 +72,7 @@ const blend = {
|
|||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Object[]} images - Ordered list of images to composite
|
* @param {Object[]} images - Ordered list of images to composite
|
||||||
* @param {Buffer|String} [images[].input] - Buffer containing image data, String containing the path to an image file, or Create object (see bellow)
|
* @param {Buffer|String} [images[].input] - Buffer containing image data, String containing the path to an image file, or Create object (see below)
|
||||||
* @param {Object} [images[].input.create] - describes a blank overlay to be created.
|
* @param {Object} [images[].input.create] - describes a blank overlay to be created.
|
||||||
* @param {Number} [images[].input.create.width]
|
* @param {Number} [images[].input.create.width]
|
||||||
* @param {Number} [images[].input.create.height]
|
* @param {Number} [images[].input.create.height]
|
||||||
@@ -83,11 +83,14 @@ const blend = {
|
|||||||
* @param {Number} [images[].top] - the pixel offset from the top edge.
|
* @param {Number} [images[].top] - the pixel offset from the top edge.
|
||||||
* @param {Number} [images[].left] - the pixel offset from the left edge.
|
* @param {Number} [images[].left] - the pixel offset from the left edge.
|
||||||
* @param {Boolean} [images[].tile=false] - set to true to repeat the overlay image across the entire image with the given `gravity`.
|
* @param {Boolean} [images[].tile=false] - set to true to repeat the overlay image across the entire image with the given `gravity`.
|
||||||
|
* @param {Boolean} [images[].premultiplied=false] - set to true to avoid premultipling the image below. Equivalent to the `--premultiplied` vips option.
|
||||||
* @param {Number} [images[].density=72] - number representing the DPI for vector overlay image.
|
* @param {Number} [images[].density=72] - number representing the DPI for vector overlay image.
|
||||||
* @param {Object} [images[].raw] - describes overlay when using raw pixel data.
|
* @param {Object} [images[].raw] - describes overlay when using raw pixel data.
|
||||||
* @param {Number} [images[].raw.width]
|
* @param {Number} [images[].raw.width]
|
||||||
* @param {Number} [images[].raw.height]
|
* @param {Number} [images[].raw.height]
|
||||||
* @param {Number} [images[].raw.channels]
|
* @param {Number} [images[].raw.channels]
|
||||||
|
* @param {boolean} [images[].failOnError=true] - @see {@link /api-constructor#parameters|constructor parameters}
|
||||||
|
* @param {number|boolean} [images[].limitInputPixels=268402689] - @see {@link /api-constructor#parameters|constructor parameters}
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -99,15 +102,16 @@ function composite (images) {
|
|||||||
if (!is.object(image)) {
|
if (!is.object(image)) {
|
||||||
throw is.invalidParameterError('image to composite', 'object', image);
|
throw is.invalidParameterError('image to composite', 'object', image);
|
||||||
}
|
}
|
||||||
const { raw, density } = image;
|
const inputOptions = this._inputOptionsFromObject(image);
|
||||||
const inputOptions = (raw || density) ? { raw, density } : undefined;
|
|
||||||
const composite = {
|
const composite = {
|
||||||
input: this._createInputDescriptor(image.input, inputOptions, { allowStream: false }),
|
input: this._createInputDescriptor(image.input, inputOptions, { allowStream: false }),
|
||||||
blend: 'over',
|
blend: 'over',
|
||||||
tile: false,
|
tile: false,
|
||||||
left: -1,
|
left: 0,
|
||||||
top: -1,
|
top: 0,
|
||||||
gravity: 0
|
hasOffset: false,
|
||||||
|
gravity: 0,
|
||||||
|
premultiplied: false
|
||||||
};
|
};
|
||||||
if (is.defined(image.blend)) {
|
if (is.defined(image.blend)) {
|
||||||
if (is.string(blend[image.blend])) {
|
if (is.string(blend[image.blend])) {
|
||||||
@@ -124,21 +128,23 @@ function composite (images) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (is.defined(image.left)) {
|
if (is.defined(image.left)) {
|
||||||
if (is.integer(image.left) && image.left >= 0) {
|
if (is.integer(image.left)) {
|
||||||
composite.left = image.left;
|
composite.left = image.left;
|
||||||
} else {
|
} else {
|
||||||
throw is.invalidParameterError('left', 'positive integer', image.left);
|
throw is.invalidParameterError('left', 'integer', image.left);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (is.defined(image.top)) {
|
if (is.defined(image.top)) {
|
||||||
if (is.integer(image.top) && image.top >= 0) {
|
if (is.integer(image.top)) {
|
||||||
composite.top = image.top;
|
composite.top = image.top;
|
||||||
} else {
|
} else {
|
||||||
throw is.invalidParameterError('top', 'positive integer', image.top);
|
throw is.invalidParameterError('top', 'integer', image.top);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (composite.left !== composite.top && Math.min(composite.left, composite.top) === -1) {
|
if (is.defined(image.top) !== is.defined(image.left)) {
|
||||||
throw new Error('Expected both left and top to be set');
|
throw new Error('Expected both left and top to be set');
|
||||||
|
} else {
|
||||||
|
composite.hasOffset = is.integer(image.top) && is.integer(image.left);
|
||||||
}
|
}
|
||||||
if (is.defined(image.gravity)) {
|
if (is.defined(image.gravity)) {
|
||||||
if (is.integer(image.gravity) && is.inRange(image.gravity, 0, 8)) {
|
if (is.integer(image.gravity) && is.inRange(image.gravity, 0, 8)) {
|
||||||
@@ -149,26 +155,24 @@ function composite (images) {
|
|||||||
throw is.invalidParameterError('gravity', 'valid gravity', image.gravity);
|
throw is.invalidParameterError('gravity', 'valid gravity', image.gravity);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (is.defined(image.premultiplied)) {
|
||||||
|
if (is.bool(image.premultiplied)) {
|
||||||
|
composite.premultiplied = image.premultiplied;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('premultiplied', 'boolean', image.premultiplied);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return composite;
|
return composite;
|
||||||
});
|
});
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated
|
|
||||||
* @private
|
|
||||||
*/
|
|
||||||
function overlayWith (input, options) {
|
|
||||||
const blend = (is.object(options) && options.cutout) ? 'dest-in' : 'over';
|
|
||||||
return this.composite([Object.assign({ input, blend }, options)]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decorate the Sharp prototype with composite-related functions.
|
* Decorate the Sharp prototype with composite-related functions.
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
module.exports = function (Sharp) {
|
module.exports = function (Sharp) {
|
||||||
Sharp.prototype.composite = composite;
|
Sharp.prototype.composite = composite;
|
||||||
Sharp.prototype.overlayWith = deprecate(overlayWith, 'overlayWith(input, options) is deprecated, use composite([{ input, ...options }]) instead');
|
|
||||||
Sharp.blend = blend;
|
Sharp.blend = blend;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,16 +1,14 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
const path = require('path');
|
|
||||||
const util = require('util');
|
const util = require('util');
|
||||||
const stream = require('stream');
|
const stream = require('stream');
|
||||||
const events = require('events');
|
|
||||||
const is = require('./is');
|
const is = require('./is');
|
||||||
|
|
||||||
require('./libvips').hasVendoredLibvips();
|
require('./libvips').hasVendoredLibvips();
|
||||||
|
|
||||||
let sharp;
|
/* istanbul ignore next */
|
||||||
try {
|
try {
|
||||||
sharp = require('../build/Release/sharp.node');
|
require('../build/Release/sharp.node');
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
// Bail early if bindings aren't available
|
// Bail early if bindings aren't available
|
||||||
const help = ['', 'Something went wrong installing the "sharp" module', '', err.message, ''];
|
const help = ['', 'Something went wrong installing the "sharp" module', '', err.message, ''];
|
||||||
@@ -18,30 +16,40 @@ try {
|
|||||||
help.push('- Ensure the version of Node.js used at install time matches that used at runtime');
|
help.push('- Ensure the version of Node.js used at install time matches that used at runtime');
|
||||||
} else if (/invalid ELF header/.test(err.message)) {
|
} else if (/invalid ELF header/.test(err.message)) {
|
||||||
help.push(`- Ensure "${process.platform}" is used at install time as well as runtime`);
|
help.push(`- Ensure "${process.platform}" is used at install time as well as runtime`);
|
||||||
|
} else if (/dylib/.test(err.message) && /Incompatible library version/.test(err.message)) {
|
||||||
|
help.push('- Run "brew update && brew upgrade vips"');
|
||||||
} else {
|
} else {
|
||||||
help.push('- Remove the "node_modules/sharp" directory, run "npm install" and look for errors');
|
help.push(
|
||||||
|
'- Remove the "node_modules/sharp" directory then run',
|
||||||
|
' "npm install --ignore-scripts=false --verbose sharp" and look for errors'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
help.push(
|
help.push(
|
||||||
'- Consult the installation documentation at https://sharp.pixelplumbing.com/en/stable/install/',
|
'- Consult the installation documentation at https://sharp.pixelplumbing.com/install',
|
||||||
'- Search for this error at https://github.com/lovell/sharp/issues', ''
|
'- Search for this error at https://github.com/lovell/sharp/issues', ''
|
||||||
);
|
);
|
||||||
console.error(help.join('\n'));
|
const error = help.join('\n');
|
||||||
process.exit(1);
|
throw new Error(error);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Use NODE_DEBUG=sharp to enable libvips warnings
|
// Use NODE_DEBUG=sharp to enable libvips warnings
|
||||||
const debuglog = util.debuglog('sharp');
|
const debuglog = util.debuglog('sharp');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @class Sharp
|
|
||||||
*
|
|
||||||
* Constructor factory to create an instance of `sharp`, to which further methods are chained.
|
* Constructor factory to create an instance of `sharp`, to which further methods are chained.
|
||||||
*
|
*
|
||||||
* JPEG, PNG, WebP or TIFF format image data can be streamed out from this object.
|
* JPEG, PNG, WebP, AVIF or TIFF format image data can be streamed out from this object.
|
||||||
* When using Stream based output, derived attributes are available from the `info` event.
|
* When using Stream based output, derived attributes are available from the `info` event.
|
||||||
*
|
*
|
||||||
|
* Non-critical problems encountered during processing are emitted as `warning` events.
|
||||||
|
*
|
||||||
* Implements the [stream.Duplex](http://nodejs.org/api/stream.html#stream_class_stream_duplex) class.
|
* Implements the [stream.Duplex](http://nodejs.org/api/stream.html#stream_class_stream_duplex) class.
|
||||||
*
|
*
|
||||||
|
* @constructs Sharp
|
||||||
|
*
|
||||||
|
* @emits Sharp#info
|
||||||
|
* @emits Sharp#warning
|
||||||
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp('input.jpg')
|
* sharp('input.jpg')
|
||||||
* .resize(300, 200)
|
* .resize(300, 200)
|
||||||
@@ -76,25 +84,72 @@ const debuglog = util.debuglog('sharp');
|
|||||||
* .toBuffer()
|
* .toBuffer()
|
||||||
* .then( ... );
|
* .then( ... );
|
||||||
*
|
*
|
||||||
* @param {(Buffer|String)} [input] - if present, can be
|
* @example
|
||||||
* a Buffer containing JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data, or
|
* // Convert an animated GIF to an animated WebP
|
||||||
* a String containing the path to an JPEG, PNG, WebP, GIF, SVG or TIFF image file.
|
* await sharp('in.gif', { animated: true }).toFile('out.webp');
|
||||||
* JPEG, PNG, WebP, GIF, SVG, TIFF or raw pixel image data can be streamed into the object when not present.
|
*
|
||||||
|
* @example
|
||||||
|
* // Read a raw array of pixels and save it to a png
|
||||||
|
* const input = Uint8Array.from([255, 255, 255, 0, 0, 0]); // or Uint8ClampedArray
|
||||||
|
* const image = sharp(input, {
|
||||||
|
* // because the input does not contain its dimensions or how many channels it has
|
||||||
|
* // we need to specify it in the constructor options
|
||||||
|
* raw: {
|
||||||
|
* width: 2,
|
||||||
|
* height: 1,
|
||||||
|
* channels: 3
|
||||||
|
* }
|
||||||
|
* });
|
||||||
|
* await image.toFile('my-two-pixels.png');
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* // Generate RGB Gaussian noise
|
||||||
|
* await sharp({
|
||||||
|
* create: {
|
||||||
|
* width: 300,
|
||||||
|
* height: 200,
|
||||||
|
* channels: 3,
|
||||||
|
* noise: {
|
||||||
|
* type: 'gaussian',
|
||||||
|
* mean: 128,
|
||||||
|
* sigma: 30
|
||||||
|
* }
|
||||||
|
* }
|
||||||
|
* }).toFile('noise.png');
|
||||||
|
*
|
||||||
|
* @param {(Buffer|Uint8Array|Uint8ClampedArray|string)} [input] - if present, can be
|
||||||
|
* a Buffer / Uint8Array / Uint8ClampedArray containing JPEG, PNG, WebP, AVIF, GIF, SVG, TIFF or raw pixel image data, or
|
||||||
|
* a String containing the filesystem path to an JPEG, PNG, WebP, AVIF, GIF, SVG or TIFF image file.
|
||||||
|
* JPEG, PNG, WebP, AVIF, GIF, SVG, TIFF or raw pixel image data can be streamed into the object when not present.
|
||||||
* @param {Object} [options] - if present, is an Object with optional attributes.
|
* @param {Object} [options] - if present, is an Object with optional attributes.
|
||||||
* @param {Boolean} [options.failOnError=true] - by default halt processing and raise an error when loading invalid images.
|
* @param {boolean} [options.failOnError=true] - by default halt processing and raise an error when loading invalid images.
|
||||||
* Set this flag to `false` if you'd rather apply a "best effort" to decode images, even if the data is corrupt or invalid.
|
* Set this flag to `false` if you'd rather apply a "best effort" to decode images, even if the data is corrupt or invalid.
|
||||||
* @param {Number} [options.density=72] - number representing the DPI for vector images.
|
* @param {number|boolean} [options.limitInputPixels=268402689] - Do not process input images where the number of pixels
|
||||||
* @param {Number} [options.pages=1] - number of pages to extract for multi-page input (GIF, TIFF, PDF), use -1 for all pages.
|
* (width x height) exceeds this limit. Assumes image dimensions contained in the input metadata can be trusted.
|
||||||
* @param {Number} [options.page=0] - page number to start extracting from for multi-page input (GIF, TIFF, PDF), zero based.
|
* An integral Number of pixels, zero or false to remove limit, true to use default limit of 268402689 (0x3FFF x 0x3FFF).
|
||||||
|
* @param {boolean} [options.sequentialRead=false] - Set this to `true` to use sequential rather than random access where possible.
|
||||||
|
* This can reduce memory usage and might improve performance on some systems.
|
||||||
|
* @param {number} [options.density=72] - number representing the DPI for vector images in the range 1 to 100000.
|
||||||
|
* @param {number} [options.pages=1] - number of pages to extract for multi-page input (GIF, WebP, AVIF, TIFF, PDF), use -1 for all pages.
|
||||||
|
* @param {number} [options.page=0] - page number to start extracting from for multi-page input (GIF, WebP, AVIF, TIFF, PDF), zero based.
|
||||||
|
* @param {number} [options.subifd=-1] - subIFD (Sub Image File Directory) to extract for OME-TIFF, defaults to main image.
|
||||||
|
* @param {number} [options.level=0] - level to extract from a multi-level input (OpenSlide), zero based.
|
||||||
|
* @param {boolean} [options.animated=false] - Set to `true` to read all frames/pages of an animated image (equivalent of setting `pages` to `-1`).
|
||||||
* @param {Object} [options.raw] - describes raw pixel input image data. See `raw()` for pixel ordering.
|
* @param {Object} [options.raw] - describes raw pixel input image data. See `raw()` for pixel ordering.
|
||||||
* @param {Number} [options.raw.width]
|
* @param {number} [options.raw.width] - integral number of pixels wide.
|
||||||
* @param {Number} [options.raw.height]
|
* @param {number} [options.raw.height] - integral number of pixels high.
|
||||||
* @param {Number} [options.raw.channels] - 1-4
|
* @param {number} [options.raw.channels] - integral number of channels, between 1 and 4.
|
||||||
|
* @param {boolean} [options.raw.premultiplied] - specifies that the raw input has already been premultiplied, set to `true`
|
||||||
|
* to avoid sharp premultiplying the image. (optional, default `false`)
|
||||||
* @param {Object} [options.create] - describes a new image to be created.
|
* @param {Object} [options.create] - describes a new image to be created.
|
||||||
* @param {Number} [options.create.width]
|
* @param {number} [options.create.width] - integral number of pixels wide.
|
||||||
* @param {Number} [options.create.height]
|
* @param {number} [options.create.height] - integral number of pixels high.
|
||||||
* @param {Number} [options.create.channels] - 3-4
|
* @param {number} [options.create.channels] - integral number of channels, either 3 (RGB) or 4 (RGBA).
|
||||||
* @param {String|Object} [options.create.background] - parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
|
* @param {string|Object} [options.create.background] - parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
|
||||||
|
* @param {Object} [options.create.noise] - describes a noise to be created.
|
||||||
|
* @param {string} [options.create.noise.type] - type of generated noise, currently only `gaussian` is supported.
|
||||||
|
* @param {number} [options.create.noise.mean] - mean of pixels in generated noise.
|
||||||
|
* @param {number} [options.create.noise.sigma] - standard deviation of pixels in generated noise.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -107,11 +162,6 @@ const Sharp = function (input, options) {
|
|||||||
}
|
}
|
||||||
stream.Duplex.call(this);
|
stream.Duplex.call(this);
|
||||||
this.options = {
|
this.options = {
|
||||||
// input options
|
|
||||||
sequentialRead: false,
|
|
||||||
limitInputPixels: Math.pow(0x3FFF, 2),
|
|
||||||
// ICC profiles
|
|
||||||
iccProfilePath: path.join(__dirname, 'icc') + path.sep,
|
|
||||||
// resize options
|
// resize options
|
||||||
topOffsetPre: -1,
|
topOffsetPre: -1,
|
||||||
leftOffsetPre: -1,
|
leftOffsetPre: -1,
|
||||||
@@ -139,6 +189,13 @@ const Sharp = function (input, options) {
|
|||||||
extendRight: 0,
|
extendRight: 0,
|
||||||
extendBackground: [0, 0, 0, 255],
|
extendBackground: [0, 0, 0, 255],
|
||||||
withoutEnlargement: false,
|
withoutEnlargement: false,
|
||||||
|
affineMatrix: [],
|
||||||
|
affineBackground: [0, 0, 0, 255],
|
||||||
|
affineIdx: 0,
|
||||||
|
affineIdy: 0,
|
||||||
|
affineOdx: 0,
|
||||||
|
affineOdy: 0,
|
||||||
|
affineInterpolator: this.constructor.interpolators.bilinear,
|
||||||
kernel: 'lanczos3',
|
kernel: 'lanczos3',
|
||||||
fastShrinkOnLoad: true,
|
fastShrinkOnLoad: true,
|
||||||
// operations
|
// operations
|
||||||
@@ -158,7 +215,10 @@ const Sharp = function (input, options) {
|
|||||||
gamma: 0,
|
gamma: 0,
|
||||||
gammaOut: 0,
|
gammaOut: 0,
|
||||||
greyscale: false,
|
greyscale: false,
|
||||||
normalise: 0,
|
normalise: false,
|
||||||
|
claheWidth: 0,
|
||||||
|
claheHeight: 0,
|
||||||
|
claheMaxSlope: 3,
|
||||||
brightness: 1,
|
brightness: 1,
|
||||||
saturation: 1,
|
saturation: 1,
|
||||||
hue: 0,
|
hue: 0,
|
||||||
@@ -167,7 +227,7 @@ const Sharp = function (input, options) {
|
|||||||
joinChannelIn: [],
|
joinChannelIn: [],
|
||||||
extractChannel: -1,
|
extractChannel: -1,
|
||||||
removeAlpha: false,
|
removeAlpha: false,
|
||||||
ensureAlpha: false,
|
ensureAlpha: -1,
|
||||||
colourspace: 'srgb',
|
colourspace: 'srgb',
|
||||||
composite: [],
|
composite: [],
|
||||||
// output
|
// output
|
||||||
@@ -176,6 +236,9 @@ const Sharp = function (input, options) {
|
|||||||
streamOut: false,
|
streamOut: false,
|
||||||
withMetadata: false,
|
withMetadata: false,
|
||||||
withMetadataOrientation: -1,
|
withMetadataOrientation: -1,
|
||||||
|
withMetadataDensity: 0,
|
||||||
|
withMetadataIcc: '',
|
||||||
|
withMetadataStrs: {},
|
||||||
resolveWithObject: false,
|
resolveWithObject: false,
|
||||||
// output format
|
// output format
|
||||||
jpegQuality: 80,
|
jpegQuality: 80,
|
||||||
@@ -187,7 +250,7 @@ const Sharp = function (input, options) {
|
|||||||
jpegOptimiseCoding: true,
|
jpegOptimiseCoding: true,
|
||||||
jpegQuantisationTable: 0,
|
jpegQuantisationTable: 0,
|
||||||
pngProgressive: false,
|
pngProgressive: false,
|
||||||
pngCompressionLevel: 9,
|
pngCompressionLevel: 6,
|
||||||
pngAdaptiveFiltering: false,
|
pngAdaptiveFiltering: false,
|
||||||
pngPalette: false,
|
pngPalette: false,
|
||||||
pngQuality: 100,
|
pngQuality: 100,
|
||||||
@@ -197,25 +260,44 @@ const Sharp = function (input, options) {
|
|||||||
webpAlphaQuality: 100,
|
webpAlphaQuality: 100,
|
||||||
webpLossless: false,
|
webpLossless: false,
|
||||||
webpNearLossless: false,
|
webpNearLossless: false,
|
||||||
|
webpSmartSubsample: false,
|
||||||
|
webpReductionEffort: 4,
|
||||||
tiffQuality: 80,
|
tiffQuality: 80,
|
||||||
tiffCompression: 'jpeg',
|
tiffCompression: 'jpeg',
|
||||||
tiffPredictor: 'horizontal',
|
tiffPredictor: 'horizontal',
|
||||||
tiffPyramid: false,
|
tiffPyramid: false,
|
||||||
tiffSquash: false,
|
tiffBitdepth: 8,
|
||||||
tiffTile: false,
|
tiffTile: false,
|
||||||
tiffTileHeight: 256,
|
tiffTileHeight: 256,
|
||||||
tiffTileWidth: 256,
|
tiffTileWidth: 256,
|
||||||
tiffXres: 1.0,
|
tiffXres: 1.0,
|
||||||
tiffYres: 1.0,
|
tiffYres: 1.0,
|
||||||
|
heifQuality: 50,
|
||||||
|
heifLossless: false,
|
||||||
|
heifCompression: 'av1',
|
||||||
|
heifSpeed: 5,
|
||||||
|
heifChromaSubsampling: '4:2:0',
|
||||||
tileSize: 256,
|
tileSize: 256,
|
||||||
tileOverlap: 0,
|
tileOverlap: 0,
|
||||||
|
tileContainer: 'fs',
|
||||||
|
tileLayout: 'dz',
|
||||||
|
tileFormat: 'last',
|
||||||
|
tileDepth: 'last',
|
||||||
|
tileAngle: 0,
|
||||||
|
tileSkipBlanks: -1,
|
||||||
|
tileBackground: [255, 255, 255, 255],
|
||||||
|
tileCentre: false,
|
||||||
|
tileId: 'https://example.com/iiif',
|
||||||
linearA: 1,
|
linearA: 1,
|
||||||
linearB: 0,
|
linearB: 0,
|
||||||
// Function to notify of libvips warnings
|
// Function to notify of libvips warnings
|
||||||
debuglog: debuglog,
|
debuglog: warning => {
|
||||||
|
this.emit('warning', warning);
|
||||||
|
debuglog(warning);
|
||||||
|
},
|
||||||
// Function to notify of queue length changes
|
// Function to notify of queue length changes
|
||||||
queueListener: function (queueLength) {
|
queueListener: function (queueLength) {
|
||||||
queue.emit('change', queueLength);
|
Sharp.queue.emit('change', queueLength);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.options.input = this._createInputDescriptor(input, options, { allowStream: true });
|
this.options.input = this._createInputDescriptor(input, options, { allowStream: true });
|
||||||
@@ -224,38 +306,84 @@ const Sharp = function (input, options) {
|
|||||||
util.inherits(Sharp, stream.Duplex);
|
util.inherits(Sharp, stream.Duplex);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An EventEmitter that emits a `change` event when a task is either:
|
* Take a "snapshot" of the Sharp instance, returning a new instance.
|
||||||
* - queued, waiting for _libuv_ to provide a worker thread
|
* Cloned instances inherit the input of their parent instance.
|
||||||
* - complete
|
* This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.
|
||||||
* @member
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp.queue.on('change', function(queueLength) {
|
* const pipeline = sharp().rotate();
|
||||||
* console.log('Queue contains ' + queueLength + ' task(s)');
|
* pipeline.clone().resize(800, 600).pipe(firstWritableStream);
|
||||||
|
* pipeline.clone().extract({ left: 20, top: 20, width: 100, height: 100 }).pipe(secondWritableStream);
|
||||||
|
* readableStream.pipe(pipeline);
|
||||||
|
* // firstWritableStream receives auto-rotated, resized readableStream
|
||||||
|
* // secondWritableStream receives auto-rotated, extracted region of readableStream
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* // Create a pipeline that will download an image, resize it and format it to different files
|
||||||
|
* // Using Promises to know when the pipeline is complete
|
||||||
|
* const fs = require("fs");
|
||||||
|
* const got = require("got");
|
||||||
|
* const sharpStream = sharp({
|
||||||
|
* failOnError: false
|
||||||
* });
|
* });
|
||||||
|
*
|
||||||
|
* const promises = [];
|
||||||
|
*
|
||||||
|
* promises.push(
|
||||||
|
* sharpStream
|
||||||
|
* .clone()
|
||||||
|
* .jpeg({ quality: 100 })
|
||||||
|
* .toFile("originalFile.jpg")
|
||||||
|
* );
|
||||||
|
*
|
||||||
|
* promises.push(
|
||||||
|
* sharpStream
|
||||||
|
* .clone()
|
||||||
|
* .resize({ width: 500 })
|
||||||
|
* .jpeg({ quality: 80 })
|
||||||
|
* .toFile("optimized-500.jpg")
|
||||||
|
* );
|
||||||
|
*
|
||||||
|
* promises.push(
|
||||||
|
* sharpStream
|
||||||
|
* .clone()
|
||||||
|
* .resize({ width: 500 })
|
||||||
|
* .webp({ quality: 80 })
|
||||||
|
* .toFile("optimized-500.webp")
|
||||||
|
* );
|
||||||
|
*
|
||||||
|
* // https://github.com/sindresorhus/got#gotstreamurl-options
|
||||||
|
* got.stream("https://www.example.com/some-file.jpg").pipe(sharpStream);
|
||||||
|
*
|
||||||
|
* Promise.all(promises)
|
||||||
|
* .then(res => { console.log("Done!", res); })
|
||||||
|
* .catch(err => {
|
||||||
|
* console.error("Error processing files, let's clean it up", err);
|
||||||
|
* try {
|
||||||
|
* fs.unlinkSync("originalFile.jpg");
|
||||||
|
* fs.unlinkSync("optimized-500.jpg");
|
||||||
|
* fs.unlinkSync("optimized-500.webp");
|
||||||
|
* } catch (e) {}
|
||||||
|
* });
|
||||||
|
*
|
||||||
|
* @returns {Sharp}
|
||||||
*/
|
*/
|
||||||
const queue = new events.EventEmitter();
|
function clone () {
|
||||||
Sharp.queue = queue;
|
// Clone existing options
|
||||||
|
const clone = this.constructor.call();
|
||||||
/**
|
clone.options = Object.assign({}, this.options);
|
||||||
* An Object containing nested boolean values representing the available input and output formats/methods.
|
// Pass 'finish' event to clone for Stream-based input
|
||||||
* @example
|
if (this._isStreamInput()) {
|
||||||
* console.log(sharp.format);
|
this.on('finish', () => {
|
||||||
* @returns {Object}
|
// Clone inherits input data
|
||||||
*/
|
this._flattenBufferIn();
|
||||||
Sharp.format = sharp.format();
|
clone.options.bufferIn = this.options.bufferIn;
|
||||||
|
clone.emit('finish');
|
||||||
/**
|
});
|
||||||
* An Object containing the version numbers of libvips and its dependencies.
|
}
|
||||||
* @member
|
return clone;
|
||||||
* @example
|
}
|
||||||
* console.log(sharp.versions);
|
Object.assign(Sharp.prototype, { clone });
|
||||||
*/
|
|
||||||
Sharp.versions = {
|
|
||||||
vips: sharp.libvipsVersion()
|
|
||||||
};
|
|
||||||
try {
|
|
||||||
Sharp.versions = require('../vendor/versions.json');
|
|
||||||
} catch (err) {}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Export constructor.
|
* Export constructor.
|
||||||
|
|||||||
BIN
lib/icc/sRGB.icc
284
lib/input.js
@@ -4,30 +4,56 @@ const color = require('color');
|
|||||||
const is = require('./is');
|
const is = require('./is');
|
||||||
const sharp = require('../build/Release/sharp.node');
|
const sharp = require('../build/Release/sharp.node');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extract input options, if any, from an object.
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
function _inputOptionsFromObject (obj) {
|
||||||
|
const { raw, density, limitInputPixels, sequentialRead, failOnError, animated, page, pages, subifd } = obj;
|
||||||
|
return [raw, density, limitInputPixels, sequentialRead, failOnError, animated, page, pages, subifd].some(is.defined)
|
||||||
|
? { raw, density, limitInputPixels, sequentialRead, failOnError, animated, page, pages, subifd }
|
||||||
|
: undefined;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create Object containing input and input-related options.
|
* Create Object containing input and input-related options.
|
||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
function _createInputDescriptor (input, inputOptions, containerOptions) {
|
function _createInputDescriptor (input, inputOptions, containerOptions) {
|
||||||
const inputDescriptor = { failOnError: true };
|
const inputDescriptor = {
|
||||||
|
failOnError: true,
|
||||||
|
limitInputPixels: Math.pow(0x3FFF, 2),
|
||||||
|
sequentialRead: false
|
||||||
|
};
|
||||||
if (is.string(input)) {
|
if (is.string(input)) {
|
||||||
// filesystem
|
// filesystem
|
||||||
inputDescriptor.file = input;
|
inputDescriptor.file = input;
|
||||||
} else if (is.buffer(input)) {
|
} else if (is.buffer(input)) {
|
||||||
// Buffer
|
// Buffer
|
||||||
|
if (input.length === 0) {
|
||||||
|
throw Error('Input Buffer is empty');
|
||||||
|
}
|
||||||
inputDescriptor.buffer = input;
|
inputDescriptor.buffer = input;
|
||||||
|
} else if (is.uint8Array(input)) {
|
||||||
|
// Uint8Array or Uint8ClampedArray
|
||||||
|
if (input.length === 0) {
|
||||||
|
throw Error('Input Bit Array is empty');
|
||||||
|
}
|
||||||
|
inputDescriptor.buffer = Buffer.from(input.buffer);
|
||||||
} else if (is.plainObject(input) && !is.defined(inputOptions)) {
|
} else if (is.plainObject(input) && !is.defined(inputOptions)) {
|
||||||
// Plain Object descriptor, e.g. create
|
// Plain Object descriptor, e.g. create
|
||||||
inputOptions = input;
|
inputOptions = input;
|
||||||
if (is.plainObject(inputOptions.raw)) {
|
if (_inputOptionsFromObject(inputOptions)) {
|
||||||
// Raw Stream
|
// Stream with options
|
||||||
inputDescriptor.buffer = [];
|
inputDescriptor.buffer = [];
|
||||||
}
|
}
|
||||||
} else if (!is.defined(input) && is.object(containerOptions) && containerOptions.allowStream) {
|
} else if (!is.defined(input) && !is.defined(inputOptions) && is.object(containerOptions) && containerOptions.allowStream) {
|
||||||
// Stream
|
// Stream without options
|
||||||
inputDescriptor.buffer = [];
|
inputDescriptor.buffer = [];
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Unsupported input ' + typeof input);
|
throw new Error(`Unsupported input '${input}' of type ${typeof input}${
|
||||||
|
is.defined(inputOptions) ? ` when also providing options of type ${typeof inputOptions}` : ''
|
||||||
|
}`);
|
||||||
}
|
}
|
||||||
if (is.object(inputOptions)) {
|
if (is.object(inputOptions)) {
|
||||||
// Fail on error
|
// Fail on error
|
||||||
@@ -35,15 +61,35 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
|
|||||||
if (is.bool(inputOptions.failOnError)) {
|
if (is.bool(inputOptions.failOnError)) {
|
||||||
inputDescriptor.failOnError = inputOptions.failOnError;
|
inputDescriptor.failOnError = inputOptions.failOnError;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid failOnError (boolean) ' + inputOptions.failOnError);
|
throw is.invalidParameterError('failOnError', 'boolean', inputOptions.failOnError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Density
|
// Density
|
||||||
if (is.defined(inputOptions.density)) {
|
if (is.defined(inputOptions.density)) {
|
||||||
if (is.inRange(inputOptions.density, 1, 2400)) {
|
if (is.inRange(inputOptions.density, 1, 100000)) {
|
||||||
inputDescriptor.density = inputOptions.density;
|
inputDescriptor.density = inputOptions.density;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid density (1 to 2400) ' + inputOptions.density);
|
throw is.invalidParameterError('density', 'number between 1 and 100000', inputOptions.density);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// limitInputPixels
|
||||||
|
if (is.defined(inputOptions.limitInputPixels)) {
|
||||||
|
if (is.bool(inputOptions.limitInputPixels)) {
|
||||||
|
inputDescriptor.limitInputPixels = inputOptions.limitInputPixels
|
||||||
|
? Math.pow(0x3FFF, 2)
|
||||||
|
: 0;
|
||||||
|
} else if (is.integer(inputOptions.limitInputPixels) && inputOptions.limitInputPixels >= 0) {
|
||||||
|
inputDescriptor.limitInputPixels = inputOptions.limitInputPixels;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('limitInputPixels', 'integer >= 0', inputOptions.limitInputPixels);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// sequentialRead
|
||||||
|
if (is.defined(inputOptions.sequentialRead)) {
|
||||||
|
if (is.bool(inputOptions.sequentialRead)) {
|
||||||
|
inputDescriptor.sequentialRead = inputOptions.sequentialRead;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('sequentialRead', 'boolean', inputOptions.sequentialRead);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Raw pixel input
|
// Raw pixel input
|
||||||
@@ -57,19 +103,47 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
|
|||||||
inputDescriptor.rawWidth = inputOptions.raw.width;
|
inputDescriptor.rawWidth = inputOptions.raw.width;
|
||||||
inputDescriptor.rawHeight = inputOptions.raw.height;
|
inputDescriptor.rawHeight = inputOptions.raw.height;
|
||||||
inputDescriptor.rawChannels = inputOptions.raw.channels;
|
inputDescriptor.rawChannels = inputOptions.raw.channels;
|
||||||
|
inputDescriptor.rawPremultiplied = !!inputOptions.raw.premultiplied;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Expected width, height and channels for raw pixel input');
|
throw new Error('Expected width, height and channels for raw pixel input');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Multi-page input (GIF, TIFF, PDF)
|
// Multi-page input (GIF, TIFF, PDF)
|
||||||
|
if (is.defined(inputOptions.animated)) {
|
||||||
|
if (is.bool(inputOptions.animated)) {
|
||||||
|
inputDescriptor.pages = inputOptions.animated ? -1 : 1;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('animated', 'boolean', inputOptions.animated);
|
||||||
|
}
|
||||||
|
}
|
||||||
if (is.defined(inputOptions.pages)) {
|
if (is.defined(inputOptions.pages)) {
|
||||||
if (is.integer(inputOptions.pages) && is.inRange(inputOptions.pages, -1, 100000)) {
|
if (is.integer(inputOptions.pages) && is.inRange(inputOptions.pages, -1, 100000)) {
|
||||||
inputDescriptor.pages = inputOptions.pages;
|
inputDescriptor.pages = inputOptions.pages;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('pages', 'integer between -1 and 100000', inputOptions.pages);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (is.defined(inputOptions.page)) {
|
if (is.defined(inputOptions.page)) {
|
||||||
if (is.integer(inputOptions.page) && is.inRange(inputOptions.page, 0, 100000)) {
|
if (is.integer(inputOptions.page) && is.inRange(inputOptions.page, 0, 100000)) {
|
||||||
inputDescriptor.page = inputOptions.page;
|
inputDescriptor.page = inputOptions.page;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('page', 'integer between 0 and 100000', inputOptions.page);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Multi-level input (OpenSlide)
|
||||||
|
if (is.defined(inputOptions.level)) {
|
||||||
|
if (is.integer(inputOptions.level) && is.inRange(inputOptions.level, 0, 256)) {
|
||||||
|
inputDescriptor.level = inputOptions.level;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('level', 'integer between 0 and 256', inputOptions.level);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Sub Image File Directory (TIFF)
|
||||||
|
if (is.defined(inputOptions.subifd)) {
|
||||||
|
if (is.integer(inputOptions.subifd) && is.inRange(inputOptions.subifd, -1, 100000)) {
|
||||||
|
inputDescriptor.subifd = inputOptions.subifd;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('subifd', 'integer between -1 and 100000', inputOptions.subifd);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Create new image
|
// Create new image
|
||||||
@@ -78,22 +152,50 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
|
|||||||
is.object(inputOptions.create) &&
|
is.object(inputOptions.create) &&
|
||||||
is.integer(inputOptions.create.width) && inputOptions.create.width > 0 &&
|
is.integer(inputOptions.create.width) && inputOptions.create.width > 0 &&
|
||||||
is.integer(inputOptions.create.height) && inputOptions.create.height > 0 &&
|
is.integer(inputOptions.create.height) && inputOptions.create.height > 0 &&
|
||||||
is.integer(inputOptions.create.channels) && is.inRange(inputOptions.create.channels, 3, 4) &&
|
is.integer(inputOptions.create.channels)
|
||||||
is.defined(inputOptions.create.background)
|
|
||||||
) {
|
) {
|
||||||
inputDescriptor.createWidth = inputOptions.create.width;
|
inputDescriptor.createWidth = inputOptions.create.width;
|
||||||
inputDescriptor.createHeight = inputOptions.create.height;
|
inputDescriptor.createHeight = inputOptions.create.height;
|
||||||
inputDescriptor.createChannels = inputOptions.create.channels;
|
inputDescriptor.createChannels = inputOptions.create.channels;
|
||||||
const background = color(inputOptions.create.background);
|
// Noise
|
||||||
inputDescriptor.createBackground = [
|
if (is.defined(inputOptions.create.noise)) {
|
||||||
background.red(),
|
if (!is.object(inputOptions.create.noise)) {
|
||||||
background.green(),
|
throw new Error('Expected noise to be an object');
|
||||||
background.blue(),
|
}
|
||||||
Math.round(background.alpha() * 255)
|
if (!is.inArray(inputOptions.create.noise.type, ['gaussian'])) {
|
||||||
];
|
throw new Error('Only gaussian noise is supported at the moment');
|
||||||
|
}
|
||||||
|
if (!is.inRange(inputOptions.create.channels, 1, 4)) {
|
||||||
|
throw is.invalidParameterError('create.channels', 'number between 1 and 4', inputOptions.create.channels);
|
||||||
|
}
|
||||||
|
inputDescriptor.createNoiseType = inputOptions.create.noise.type;
|
||||||
|
if (is.number(inputOptions.create.noise.mean) && is.inRange(inputOptions.create.noise.mean, 0, 10000)) {
|
||||||
|
inputDescriptor.createNoiseMean = inputOptions.create.noise.mean;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('create.noise.mean', 'number between 0 and 10000', inputOptions.create.noise.mean);
|
||||||
|
}
|
||||||
|
if (is.number(inputOptions.create.noise.sigma) && is.inRange(inputOptions.create.noise.sigma, 0, 10000)) {
|
||||||
|
inputDescriptor.createNoiseSigma = inputOptions.create.noise.sigma;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('create.noise.sigma', 'number between 0 and 10000', inputOptions.create.noise.sigma);
|
||||||
|
}
|
||||||
|
} else if (is.defined(inputOptions.create.background)) {
|
||||||
|
if (!is.inRange(inputOptions.create.channels, 3, 4)) {
|
||||||
|
throw is.invalidParameterError('create.channels', 'number between 3 and 4', inputOptions.create.channels);
|
||||||
|
}
|
||||||
|
const background = color(inputOptions.create.background);
|
||||||
|
inputDescriptor.createBackground = [
|
||||||
|
background.red(),
|
||||||
|
background.green(),
|
||||||
|
background.blue(),
|
||||||
|
Math.round(background.alpha() * 255)
|
||||||
|
];
|
||||||
|
} else {
|
||||||
|
throw new Error('Expected valid noise or background to create a new input image');
|
||||||
|
}
|
||||||
delete inputDescriptor.buffer;
|
delete inputDescriptor.buffer;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Expected width, height, channels and background to create a new input image');
|
throw new Error('Expected valid width, height and channels to create a new input image');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (is.defined(inputOptions)) {
|
} else if (is.defined(inputOptions)) {
|
||||||
@@ -106,7 +208,7 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
|
|||||||
* Handle incoming Buffer chunk on Writable Stream.
|
* Handle incoming Buffer chunk on Writable Stream.
|
||||||
* @private
|
* @private
|
||||||
* @param {Buffer} chunk
|
* @param {Buffer} chunk
|
||||||
* @param {String} encoding - unused
|
* @param {string} encoding - unused
|
||||||
* @param {Function} callback
|
* @param {Function} callback
|
||||||
*/
|
*/
|
||||||
function _write (chunk, encoding, callback) {
|
function _write (chunk, encoding, callback) {
|
||||||
@@ -115,9 +217,8 @@ function _write (chunk, encoding, callback) {
|
|||||||
/* istanbul ignore else */
|
/* istanbul ignore else */
|
||||||
if (is.buffer(chunk)) {
|
if (is.buffer(chunk)) {
|
||||||
if (this.options.input.buffer.length === 0) {
|
if (this.options.input.buffer.length === 0) {
|
||||||
const that = this;
|
this.on('finish', () => {
|
||||||
this.on('finish', function () {
|
this.streamInFinished = true;
|
||||||
that.streamInFinished = true;
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
this.options.input.buffer.push(chunk);
|
this.options.input.buffer.push(chunk);
|
||||||
@@ -143,44 +244,12 @@ function _flattenBufferIn () {
|
|||||||
/**
|
/**
|
||||||
* Are we expecting Stream-based input?
|
* Are we expecting Stream-based input?
|
||||||
* @private
|
* @private
|
||||||
* @returns {Boolean}
|
* @returns {boolean}
|
||||||
*/
|
*/
|
||||||
function _isStreamInput () {
|
function _isStreamInput () {
|
||||||
return Array.isArray(this.options.input.buffer);
|
return Array.isArray(this.options.input.buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Take a "snapshot" of the Sharp instance, returning a new instance.
|
|
||||||
* Cloned instances inherit the input of their parent instance.
|
|
||||||
* This allows multiple output Streams and therefore multiple processing pipelines to share a single input Stream.
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
* const pipeline = sharp().rotate();
|
|
||||||
* pipeline.clone().resize(800, 600).pipe(firstWritableStream);
|
|
||||||
* pipeline.clone().extract({ left: 20, top: 20, width: 100, height: 100 }).pipe(secondWritableStream);
|
|
||||||
* readableStream.pipe(pipeline);
|
|
||||||
* // firstWritableStream receives auto-rotated, resized readableStream
|
|
||||||
* // secondWritableStream receives auto-rotated, extracted region of readableStream
|
|
||||||
*
|
|
||||||
* @returns {Sharp}
|
|
||||||
*/
|
|
||||||
function clone () {
|
|
||||||
const that = this;
|
|
||||||
// Clone existing options
|
|
||||||
const clone = this.constructor.call();
|
|
||||||
clone.options = Object.assign({}, this.options);
|
|
||||||
// Pass 'finish' event to clone for Stream-based input
|
|
||||||
if (this._isStreamInput()) {
|
|
||||||
this.on('finish', function () {
|
|
||||||
// Clone inherits input data
|
|
||||||
that._flattenBufferIn();
|
|
||||||
clone.options.bufferIn = that.options.bufferIn;
|
|
||||||
clone.emit('finish');
|
|
||||||
});
|
|
||||||
}
|
|
||||||
return clone;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Fast access to (uncached) image metadata without decoding any compressed image data.
|
* Fast access to (uncached) image metadata without decoding any compressed image data.
|
||||||
* A `Promise` is returned when `callback` is not provided.
|
* A `Promise` is returned when `callback` is not provided.
|
||||||
@@ -189,14 +258,19 @@ function clone () {
|
|||||||
* - `size`: Total size of image in bytes, for Stream and Buffer input only
|
* - `size`: Total size of image in bytes, for Stream and Buffer input only
|
||||||
* - `width`: Number of pixels wide (EXIF orientation is not taken into consideration)
|
* - `width`: Number of pixels wide (EXIF orientation is not taken into consideration)
|
||||||
* - `height`: Number of pixels high (EXIF orientation is not taken into consideration)
|
* - `height`: Number of pixels high (EXIF orientation is not taken into consideration)
|
||||||
* - `space`: Name of colour space interpretation e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...](https://github.com/libvips/libvips/blob/master/libvips/iofuncs/enumtypes.c#L636)
|
* - `space`: Name of colour space interpretation e.g. `srgb`, `rgb`, `cmyk`, `lab`, `b-w` [...](https://libvips.github.io/libvips/API/current/VipsImage.html#VipsInterpretation)
|
||||||
* - `channels`: Number of bands e.g. `3` for sRGB, `4` for CMYK
|
* - `channels`: Number of bands e.g. `3` for sRGB, `4` for CMYK
|
||||||
* - `depth`: Name of pixel depth format e.g. `uchar`, `char`, `ushort`, `float` [...](https://github.com/libvips/libvips/blob/master/libvips/iofuncs/enumtypes.c#L672)
|
* - `depth`: Name of pixel depth format e.g. `uchar`, `char`, `ushort`, `float` [...](https://libvips.github.io/libvips/API/current/VipsImage.html#VipsBandFormat)
|
||||||
* - `density`: Number of pixels per inch (DPI), if present
|
* - `density`: Number of pixels per inch (DPI), if present
|
||||||
* - `chromaSubsampling`: String containing JPEG chroma subsampling, `4:2:0` or `4:4:4` for RGB, `4:2:0:4` or `4:4:4:4` for CMYK
|
* - `chromaSubsampling`: String containing JPEG chroma subsampling, `4:2:0` or `4:4:4` for RGB, `4:2:0:4` or `4:4:4:4` for CMYK
|
||||||
* - `isProgressive`: Boolean indicating whether the image is interlaced using a progressive scan
|
* - `isProgressive`: Boolean indicating whether the image is interlaced using a progressive scan
|
||||||
* - `pages`: Number of pages/frames contained within the image, with support for TIFF, PDF, animated GIF and animated WebP
|
* - `pages`: Number of pages/frames contained within the image, with support for TIFF, HEIF, PDF, animated GIF and animated WebP
|
||||||
* - `pageHeight`: Number of pixels high each page in this PDF image will be.
|
* - `pageHeight`: Number of pixels high each page in a multi-page image will be.
|
||||||
|
* - `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.
|
||||||
|
* - `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
|
||||||
|
* - `subifds`: Number of Sub Image File Directories in an OME-TIFF image
|
||||||
* - `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
|
||||||
@@ -204,6 +278,7 @@ function clone () {
|
|||||||
* - `icc`: Buffer containing raw [ICC](https://www.npmjs.com/package/icc) profile data, if present
|
* - `icc`: Buffer containing raw [ICC](https://www.npmjs.com/package/icc) profile data, if present
|
||||||
* - `iptc`: Buffer containing raw IPTC data, if present
|
* - `iptc`: Buffer containing raw IPTC data, if present
|
||||||
* - `xmp`: Buffer containing raw XMP data, if present
|
* - `xmp`: Buffer containing raw XMP data, if present
|
||||||
|
* - `tifftagPhotoshop`: Buffer containing raw TIFFTAG_PHOTOSHOP data, if present
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* const image = sharp(inputJpg);
|
* const image = sharp(inputJpg);
|
||||||
@@ -223,12 +298,11 @@ function clone () {
|
|||||||
* @returns {Promise<Object>|Sharp}
|
* @returns {Promise<Object>|Sharp}
|
||||||
*/
|
*/
|
||||||
function metadata (callback) {
|
function metadata (callback) {
|
||||||
const that = this;
|
|
||||||
if (is.fn(callback)) {
|
if (is.fn(callback)) {
|
||||||
if (this._isStreamInput()) {
|
if (this._isStreamInput()) {
|
||||||
this.on('finish', function () {
|
this.on('finish', () => {
|
||||||
that._flattenBufferIn();
|
this._flattenBufferIn();
|
||||||
sharp.metadata(that.options, callback);
|
sharp.metadata(this.options, callback);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
sharp.metadata(this.options, callback);
|
sharp.metadata(this.options, callback);
|
||||||
@@ -236,10 +310,10 @@ function metadata (callback) {
|
|||||||
return this;
|
return this;
|
||||||
} else {
|
} else {
|
||||||
if (this._isStreamInput()) {
|
if (this._isStreamInput()) {
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise((resolve, reject) => {
|
||||||
that.on('finish', function () {
|
this.on('finish', () => {
|
||||||
that._flattenBufferIn();
|
this._flattenBufferIn();
|
||||||
sharp.metadata(that.options, function (err, metadata) {
|
sharp.metadata(this.options, (err, metadata) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
reject(err);
|
reject(err);
|
||||||
} else {
|
} else {
|
||||||
@@ -249,8 +323,8 @@ function metadata (callback) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise((resolve, reject) => {
|
||||||
sharp.metadata(that.options, function (err, metadata) {
|
sharp.metadata(this.options, (err, metadata) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
reject(err);
|
reject(err);
|
||||||
} else {
|
} else {
|
||||||
@@ -277,8 +351,10 @@ function metadata (callback) {
|
|||||||
* - `minY` (y-coordinate of one of the pixel where the minimum lies)
|
* - `minY` (y-coordinate of one of the pixel where the minimum lies)
|
||||||
* - `maxX` (x-coordinate of one of the pixel where the maximum lies)
|
* - `maxX` (x-coordinate of one of the pixel where the maximum lies)
|
||||||
* - `maxY` (y-coordinate of one of the pixel where the maximum lies)
|
* - `maxY` (y-coordinate of one of the pixel where the maximum lies)
|
||||||
* - `isOpaque`: Value to identify if the image is opaque or transparent, based on the presence and use of alpha channel
|
* - `isOpaque`: Is the image fully opaque? Will be `true` if the image has no alpha channel or if every pixel is fully opaque.
|
||||||
* - `entropy`: Histogram-based estimation of greyscale entropy, discarding alpha channel if any (experimental)
|
* - `entropy`: Histogram-based estimation of greyscale entropy, discarding alpha channel if any (experimental)
|
||||||
|
* - `sharpness`: Estimation of greyscale sharpness based on the standard deviation of a Laplacian convolution, discarding alpha channel if any (experimental)
|
||||||
|
* - `dominant`: Object containing most dominant sRGB colour based on a 4096-bin 3D histogram (experimental)
|
||||||
*
|
*
|
||||||
* @example
|
* @example
|
||||||
* const image = sharp(inputJpg);
|
* const image = sharp(inputJpg);
|
||||||
@@ -288,16 +364,19 @@ function metadata (callback) {
|
|||||||
* // stats contains the channel-wise statistics array and the isOpaque value
|
* // stats contains the channel-wise statistics array and the isOpaque value
|
||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
|
* @example
|
||||||
|
* const { entropy, sharpness, dominant } = await sharp(input).stats();
|
||||||
|
* const { r, g, b } = dominant;
|
||||||
|
*
|
||||||
* @param {Function} [callback] - called with the arguments `(err, stats)`
|
* @param {Function} [callback] - called with the arguments `(err, stats)`
|
||||||
* @returns {Promise<Object>}
|
* @returns {Promise<Object>}
|
||||||
*/
|
*/
|
||||||
function stats (callback) {
|
function stats (callback) {
|
||||||
const that = this;
|
|
||||||
if (is.fn(callback)) {
|
if (is.fn(callback)) {
|
||||||
if (this._isStreamInput()) {
|
if (this._isStreamInput()) {
|
||||||
this.on('finish', function () {
|
this.on('finish', () => {
|
||||||
that._flattenBufferIn();
|
this._flattenBufferIn();
|
||||||
sharp.stats(that.options, callback);
|
sharp.stats(this.options, callback);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
sharp.stats(this.options, callback);
|
sharp.stats(this.options, callback);
|
||||||
@@ -305,10 +384,10 @@ function stats (callback) {
|
|||||||
return this;
|
return this;
|
||||||
} else {
|
} else {
|
||||||
if (this._isStreamInput()) {
|
if (this._isStreamInput()) {
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise((resolve, reject) => {
|
||||||
that.on('finish', function () {
|
this.on('finish', function () {
|
||||||
that._flattenBufferIn();
|
this._flattenBufferIn();
|
||||||
sharp.stats(that.options, function (err, stats) {
|
sharp.stats(this.options, (err, stats) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
reject(err);
|
reject(err);
|
||||||
} else {
|
} else {
|
||||||
@@ -318,8 +397,8 @@ function stats (callback) {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
return new Promise(function (resolve, reject) {
|
return new Promise((resolve, reject) => {
|
||||||
sharp.stats(that.options, function (err, stats) {
|
sharp.stats(this.options, (err, stats) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
reject(err);
|
reject(err);
|
||||||
} else {
|
} else {
|
||||||
@@ -331,43 +410,6 @@ function stats (callback) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Do not process input images where the number of pixels (width x height) exceeds this limit.
|
|
||||||
* Assumes image dimensions contained in the input metadata can be trusted.
|
|
||||||
* The default limit is 268402689 (0x3FFF x 0x3FFF) pixels.
|
|
||||||
* @param {(Number|Boolean)} limit - an integral Number of pixels, zero or false to remove limit, true to use default limit.
|
|
||||||
* @returns {Sharp}
|
|
||||||
* @throws {Error} Invalid limit
|
|
||||||
*/
|
|
||||||
function limitInputPixels (limit) {
|
|
||||||
// if we pass in false we represent the integer as 0 to disable
|
|
||||||
if (limit === false) {
|
|
||||||
limit = 0;
|
|
||||||
} else if (limit === true) {
|
|
||||||
limit = Math.pow(0x3FFF, 2);
|
|
||||||
}
|
|
||||||
if (is.integer(limit) && limit >= 0) {
|
|
||||||
this.options.limitInputPixels = limit;
|
|
||||||
} else {
|
|
||||||
throw is.invalidParameterError('limitInputPixels', 'integer', limit);
|
|
||||||
}
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An advanced setting that switches the libvips access method to `VIPS_ACCESS_SEQUENTIAL`.
|
|
||||||
* This will reduce memory usage and can improve performance on some systems.
|
|
||||||
*
|
|
||||||
* The default behaviour *before* function call is `false`, meaning the libvips access method is not sequential.
|
|
||||||
*
|
|
||||||
* @param {Boolean} [sequentialRead=true]
|
|
||||||
* @returns {Sharp}
|
|
||||||
*/
|
|
||||||
function sequentialRead (sequentialRead) {
|
|
||||||
this.options.sequentialRead = is.bool(sequentialRead) ? sequentialRead : true;
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Decorate the Sharp prototype with input-related functions.
|
* Decorate the Sharp prototype with input-related functions.
|
||||||
* @private
|
* @private
|
||||||
@@ -375,15 +417,13 @@ function sequentialRead (sequentialRead) {
|
|||||||
module.exports = function (Sharp) {
|
module.exports = function (Sharp) {
|
||||||
Object.assign(Sharp.prototype, {
|
Object.assign(Sharp.prototype, {
|
||||||
// Private
|
// Private
|
||||||
|
_inputOptionsFromObject,
|
||||||
_createInputDescriptor,
|
_createInputDescriptor,
|
||||||
_write,
|
_write,
|
||||||
_flattenBufferIn,
|
_flattenBufferIn,
|
||||||
_isStreamInput,
|
_isStreamInput,
|
||||||
// Public
|
// Public
|
||||||
clone,
|
|
||||||
metadata,
|
metadata,
|
||||||
stats,
|
stats
|
||||||
limitInputPixels,
|
|
||||||
sequentialRead
|
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
22
lib/is.js
@@ -21,7 +21,7 @@ const object = function (val) {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
const plainObject = function (val) {
|
const plainObject = function (val) {
|
||||||
return object(val) && Object.prototype.toString.call(val) === '[object Object]';
|
return Object.prototype.toString.call(val) === '[object Object]';
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -45,7 +45,16 @@ const bool = function (val) {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
const buffer = function (val) {
|
const buffer = function (val) {
|
||||||
return object(val) && val instanceof Buffer;
|
return val instanceof Buffer;
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Is this value a Uint8Array or Uint8ClampedArray object?
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
const uint8Array = function (val) {
|
||||||
|
// allow both since Uint8ClampedArray simply clamps the values between 0-255
|
||||||
|
return val instanceof Uint8Array || val instanceof Uint8ClampedArray;
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -69,7 +78,7 @@ const number = function (val) {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
const integer = function (val) {
|
const integer = function (val) {
|
||||||
return number(val) && val % 1 === 0;
|
return Number.isInteger(val);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -85,14 +94,14 @@ const inRange = function (val, min, max) {
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
const inArray = function (val, list) {
|
const inArray = function (val, list) {
|
||||||
return list.indexOf(val) !== -1;
|
return list.includes(val);
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create an Error with a message relating to an invalid parameter.
|
* Create an Error with a message relating to an invalid parameter.
|
||||||
*
|
*
|
||||||
* @param {String} name - parameter name.
|
* @param {string} name - parameter name.
|
||||||
* @param {String} expected - description of the type/value/range expected.
|
* @param {string} expected - description of the type/value/range expected.
|
||||||
* @param {*} actual - the value received.
|
* @param {*} actual - the value received.
|
||||||
* @returns {Error} Containing the formatted message.
|
* @returns {Error} Containing the formatted message.
|
||||||
* @private
|
* @private
|
||||||
@@ -110,6 +119,7 @@ module.exports = {
|
|||||||
fn: fn,
|
fn: fn,
|
||||||
bool: bool,
|
bool: bool,
|
||||||
buffer: buffer,
|
buffer: buffer,
|
||||||
|
uint8Array: uint8Array,
|
||||||
string: string,
|
string: string,
|
||||||
number: number,
|
number: number,
|
||||||
integer: integer,
|
integer: integer,
|
||||||
|
|||||||
@@ -4,11 +4,15 @@ const fs = require('fs');
|
|||||||
const os = require('os');
|
const os = require('os');
|
||||||
const path = require('path');
|
const path = require('path');
|
||||||
const spawnSync = require('child_process').spawnSync;
|
const spawnSync = require('child_process').spawnSync;
|
||||||
const semver = require('semver');
|
const semverCoerce = require('semver/functions/coerce');
|
||||||
|
const semverGreaterThanOrEqualTo = require('semver/functions/gte');
|
||||||
|
|
||||||
const platform = require('./platform');
|
const platform = require('./platform');
|
||||||
|
|
||||||
const env = process.env;
|
const env = process.env;
|
||||||
const minimumLibvipsVersion = env.npm_package_config_libvips || require('../package.json').config.libvips;
|
const minimumLibvipsVersionLabelled = env.npm_package_config_libvips || /* istanbul ignore next */
|
||||||
|
require('../package.json').config.libvips;
|
||||||
|
const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
|
||||||
|
|
||||||
const spawnSyncOptions = {
|
const spawnSyncOptions = {
|
||||||
encoding: 'utf8',
|
encoding: 'utf8',
|
||||||
@@ -19,6 +23,7 @@ const mkdirSync = function (dirPath) {
|
|||||||
try {
|
try {
|
||||||
fs.mkdirSync(dirPath);
|
fs.mkdirSync(dirPath);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
/* istanbul ignore if */
|
||||||
if (err.code !== 'EEXIST') {
|
if (err.code !== 'EEXIST') {
|
||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
@@ -26,17 +31,36 @@ const mkdirSync = function (dirPath) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const cachePath = function () {
|
const cachePath = function () {
|
||||||
const npmCachePath = env.npm_config_cache || (env.APPDATA ? path.join(env.APPDATA, 'npm-cache') : path.join(os.homedir(), '.npm'));
|
const npmCachePath = env.npm_config_cache || /* istanbul ignore next */
|
||||||
|
(env.APPDATA ? path.join(env.APPDATA, 'npm-cache') : path.join(os.homedir(), '.npm'));
|
||||||
mkdirSync(npmCachePath);
|
mkdirSync(npmCachePath);
|
||||||
const libvipsCachePath = path.join(npmCachePath, '_libvips');
|
const libvipsCachePath = path.join(npmCachePath, '_libvips');
|
||||||
mkdirSync(libvipsCachePath);
|
mkdirSync(libvipsCachePath);
|
||||||
return libvipsCachePath;
|
return libvipsCachePath;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const log = function (item) {
|
||||||
|
if (item instanceof Error) {
|
||||||
|
console.error(`sharp: Installation error: ${item.message}`);
|
||||||
|
} else {
|
||||||
|
console.log(`sharp: ${item}`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const isRosetta = function () {
|
||||||
|
/* istanbul ignore next */
|
||||||
|
if (process.platform === 'darwin' && process.arch === 'x64') {
|
||||||
|
const translated = spawnSync('sysctl sysctl.proc_translated', spawnSyncOptions).stdout;
|
||||||
|
return (translated || '').trim() === 'sysctl.proc_translated: 1';
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
|
||||||
const globalLibvipsVersion = function () {
|
const globalLibvipsVersion = function () {
|
||||||
if (process.platform !== 'win32') {
|
if (process.platform !== 'win32') {
|
||||||
const globalLibvipsVersion = spawnSync(`PKG_CONFIG_PATH="${pkgConfigPath()}" pkg-config --modversion vips-cpp`, spawnSyncOptions).stdout || '';
|
const globalLibvipsVersion = spawnSync(`PKG_CONFIG_PATH="${pkgConfigPath()}" pkg-config --modversion vips-cpp`, spawnSyncOptions).stdout;
|
||||||
return globalLibvipsVersion.trim();
|
/* istanbul ignore next */
|
||||||
|
return (globalLibvipsVersion || '').trim();
|
||||||
} else {
|
} else {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
@@ -44,24 +68,22 @@ const globalLibvipsVersion = function () {
|
|||||||
|
|
||||||
const hasVendoredLibvips = function () {
|
const hasVendoredLibvips = function () {
|
||||||
const currentPlatformId = platform();
|
const currentPlatformId = platform();
|
||||||
const vendorPath = path.join(__dirname, '..', 'vendor');
|
const vendorPath = path.join(__dirname, '..', 'vendor', minimumLibvipsVersion);
|
||||||
let vendorVersionId;
|
|
||||||
let vendorPlatformId;
|
let vendorPlatformId;
|
||||||
try {
|
try {
|
||||||
vendorVersionId = require(path.join(vendorPath, 'versions.json')).vips;
|
|
||||||
vendorPlatformId = require(path.join(vendorPath, 'platform.json'));
|
vendorPlatformId = require(path.join(vendorPath, 'platform.json'));
|
||||||
} catch (err) {}
|
} catch (err) {}
|
||||||
if (vendorVersionId && vendorVersionId !== minimumLibvipsVersion) {
|
/* istanbul ignore else */
|
||||||
throw new Error(`Found vendored libvips v${vendorVersionId} but require v${minimumLibvipsVersion}. Please remove the 'node_modules/sharp/vendor' directory and run 'npm install'.`);
|
|
||||||
}
|
|
||||||
if (vendorPlatformId) {
|
if (vendorPlatformId) {
|
||||||
|
/* istanbul ignore else */
|
||||||
if (currentPlatformId === vendorPlatformId) {
|
if (currentPlatformId === vendorPlatformId) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
throw new Error(`'${vendorPlatformId}' binaries cannot be used on the '${currentPlatformId}' platform. Please remove the 'node_modules/sharp/vendor' directory and run 'npm install'.`);
|
throw new Error(`'${vendorPlatformId}' binaries cannot be used on the '${currentPlatformId}' platform. Please remove the 'node_modules/sharp' directory and run 'npm install' on the '${currentPlatformId}' platform.`);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const pkgConfigPath = function () {
|
const pkgConfigPath = function () {
|
||||||
@@ -79,17 +101,23 @@ const useGlobalLibvips = function () {
|
|||||||
if (Boolean(env.SHARP_IGNORE_GLOBAL_LIBVIPS) === true) {
|
if (Boolean(env.SHARP_IGNORE_GLOBAL_LIBVIPS) === true) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
/* istanbul ignore next */
|
||||||
|
if (isRosetta()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
const globalVipsVersion = globalLibvipsVersion();
|
const globalVipsVersion = globalLibvipsVersion();
|
||||||
return !!globalVipsVersion && semver.gte(globalVipsVersion, minimumLibvipsVersion);
|
return !!globalVipsVersion && /* istanbul ignore next */
|
||||||
|
semverGreaterThanOrEqualTo(globalVipsVersion, minimumLibvipsVersion);
|
||||||
};
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
minimumLibvipsVersion: minimumLibvipsVersion,
|
minimumLibvipsVersion,
|
||||||
cachePath: cachePath,
|
minimumLibvipsVersionLabelled,
|
||||||
globalLibvipsVersion: globalLibvipsVersion,
|
cachePath,
|
||||||
hasVendoredLibvips: hasVendoredLibvips,
|
log,
|
||||||
pkgConfigPath: pkgConfigPath,
|
globalLibvipsVersion,
|
||||||
useGlobalLibvips: useGlobalLibvips,
|
hasVendoredLibvips,
|
||||||
mkdirSync: mkdirSync
|
pkgConfigPath,
|
||||||
|
useGlobalLibvips,
|
||||||
|
mkdirSync
|
||||||
};
|
};
|
||||||
|
|||||||
240
lib/operation.js
@@ -32,9 +32,9 @@ const is = require('./is');
|
|||||||
* });
|
* });
|
||||||
* readableStream.pipe(pipeline);
|
* readableStream.pipe(pipeline);
|
||||||
*
|
*
|
||||||
* @param {Number} [angle=auto] angle of rotation.
|
* @param {number} [angle=auto] angle of rotation.
|
||||||
* @param {Object} [options] - if present, is an Object with optional attributes.
|
* @param {Object} [options] - if present, is an Object with optional attributes.
|
||||||
* @param {String|Object} [options.background="#000000"] parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
|
* @param {string|Object} [options.background="#000000"] parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -55,7 +55,7 @@ function rotate (angle, options) {
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Unsupported angle: must be a number.');
|
throw is.invalidParameterError('angle', 'numeric', angle);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -82,15 +82,112 @@ function flop (flop) {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform an affine transform on an image. This operation will always occur after resizing, extraction and rotation, if any.
|
||||||
|
*
|
||||||
|
* You must provide an array of length 4 or a 2x2 affine transformation matrix.
|
||||||
|
* By default, new pixels are filled with a black background. You can provide a background color with the `background` option.
|
||||||
|
* A particular interpolator may also be specified. Set the `interpolator` option to an attribute of the `sharp.interpolator` Object e.g. `sharp.interpolator.nohalo`.
|
||||||
|
*
|
||||||
|
* In the case of a 2x2 matrix, the transform is:
|
||||||
|
* - X = `matrix[0, 0]` \* (x + `idx`) + `matrix[0, 1]` \* (y + `idy`) + `odx`
|
||||||
|
* - Y = `matrix[1, 0]` \* (x + `idx`) + `matrix[1, 1]` \* (y + `idy`) + `ody`
|
||||||
|
*
|
||||||
|
* where:
|
||||||
|
* - x and y are the coordinates in input image.
|
||||||
|
* - X and Y are the coordinates in output image.
|
||||||
|
* - (0,0) is the upper left corner.
|
||||||
|
*
|
||||||
|
* @since 0.27.0
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* const pipeline = sharp()
|
||||||
|
* .affine([[1, 0.3], [0.1, 0.7]], {
|
||||||
|
* background: 'white',
|
||||||
|
* interpolate: sharp.interpolators.nohalo
|
||||||
|
* })
|
||||||
|
* .toBuffer((err, outputBuffer, info) => {
|
||||||
|
* // outputBuffer contains the transformed image
|
||||||
|
* // info.width and info.height contain the new dimensions
|
||||||
|
* });
|
||||||
|
*
|
||||||
|
* inputStream
|
||||||
|
* .pipe(pipeline);
|
||||||
|
*
|
||||||
|
* @param {Array<Array<number>>|Array<number>} matrix - affine transformation matrix
|
||||||
|
* @param {Object} [options] - if present, is an Object with optional attributes.
|
||||||
|
* @param {String|Object} [options.background="#000000"] - parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
|
||||||
|
* @param {Number} [options.idx=0] - input horizontal offset
|
||||||
|
* @param {Number} [options.idy=0] - input vertical offset
|
||||||
|
* @param {Number} [options.odx=0] - output horizontal offset
|
||||||
|
* @param {Number} [options.ody=0] - output vertical offset
|
||||||
|
* @param {String} [options.interpolator=sharp.interpolators.bicubic] - interpolator
|
||||||
|
* @returns {Sharp}
|
||||||
|
* @throws {Error} Invalid parameters
|
||||||
|
*/
|
||||||
|
function affine (matrix, options) {
|
||||||
|
const flatMatrix = [].concat(...matrix);
|
||||||
|
if (flatMatrix.length === 4 && flatMatrix.every(is.number)) {
|
||||||
|
this.options.affineMatrix = flatMatrix;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('matrix', '1x4 or 2x2 array', matrix);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (is.defined(options)) {
|
||||||
|
if (is.object(options)) {
|
||||||
|
this._setBackgroundColourOption('affineBackground', options.background);
|
||||||
|
if (is.defined(options.idx)) {
|
||||||
|
if (is.number(options.idx)) {
|
||||||
|
this.options.affineIdx = options.idx;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('options.idx', 'number', options.idx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (is.defined(options.idy)) {
|
||||||
|
if (is.number(options.idy)) {
|
||||||
|
this.options.affineIdy = options.idy;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('options.idy', 'number', options.idy);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (is.defined(options.odx)) {
|
||||||
|
if (is.number(options.odx)) {
|
||||||
|
this.options.affineOdx = options.odx;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('options.odx', 'number', options.odx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (is.defined(options.ody)) {
|
||||||
|
if (is.number(options.ody)) {
|
||||||
|
this.options.affineOdy = options.ody;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('options.ody', 'number', options.ody);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (is.defined(options.interpolator)) {
|
||||||
|
if (is.inArray(options.interpolator, Object.values(this.constructor.interpolators))) {
|
||||||
|
this.options.affineInterpolator = options.interpolator;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('options.interpolator', 'valid interpolator name', options.interpolator);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('options', 'object', options);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sharpen the image.
|
* Sharpen the image.
|
||||||
* When used without parameters, performs a fast, mild sharpen of the output image.
|
* When used without parameters, performs a fast, mild sharpen of the output image.
|
||||||
* When a `sigma` is provided, performs a slower, more accurate sharpen of the L channel in the LAB colour space.
|
* When a `sigma` is provided, performs a slower, more accurate sharpen of the L channel in the LAB colour space.
|
||||||
* Separate control over the level of sharpening in "flat" and "jagged" areas is available.
|
* Separate control over the level of sharpening in "flat" and "jagged" areas is available.
|
||||||
*
|
*
|
||||||
* @param {Number} [sigma] - the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
* @param {number} [sigma] - the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
||||||
* @param {Number} [flat=1.0] - the level of sharpening to apply to "flat" areas.
|
* @param {number} [flat=1.0] - the level of sharpening to apply to "flat" areas.
|
||||||
* @param {Number} [jagged=2.0] - the level of sharpening to apply to "jagged" areas.
|
* @param {number} [jagged=2.0] - the level of sharpening to apply to "jagged" areas.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -109,7 +206,7 @@ function sharpen (sigma, flat, jagged) {
|
|||||||
if (is.number(flat) && is.inRange(flat, 0, 10000)) {
|
if (is.number(flat) && is.inRange(flat, 0, 10000)) {
|
||||||
this.options.sharpenFlat = flat;
|
this.options.sharpenFlat = flat;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid sharpen level for flat areas (0.0 - 10000.0) ' + flat);
|
throw is.invalidParameterError('flat', 'number between 0 and 10000', flat);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Control over jagged areas
|
// Control over jagged areas
|
||||||
@@ -117,11 +214,11 @@ function sharpen (sigma, flat, jagged) {
|
|||||||
if (is.number(jagged) && is.inRange(jagged, 0, 10000)) {
|
if (is.number(jagged) && is.inRange(jagged, 0, 10000)) {
|
||||||
this.options.sharpenJagged = jagged;
|
this.options.sharpenJagged = jagged;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid sharpen level for jagged areas (0.0 - 10000.0) ' + jagged);
|
throw is.invalidParameterError('jagged', 'number between 0 and 10000', jagged);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid sharpen sigma (0.01 - 10000) ' + sigma);
|
throw is.invalidParameterError('sigma', 'number between 0.01 and 10000', sigma);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -129,7 +226,7 @@ function sharpen (sigma, flat, jagged) {
|
|||||||
/**
|
/**
|
||||||
* Apply median filter.
|
* Apply median filter.
|
||||||
* When used without parameters the default window is 3x3.
|
* When used without parameters the default window is 3x3.
|
||||||
* @param {Number} [size=3] square mask size: size x size
|
* @param {number} [size=3] square mask size: size x size
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -141,7 +238,7 @@ function median (size) {
|
|||||||
// Numeric argument: specific sigma
|
// Numeric argument: specific sigma
|
||||||
this.options.medianSize = size;
|
this.options.medianSize = size;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid median size ' + size);
|
throw is.invalidParameterError('size', 'integer between 1 and 1000', size);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -150,7 +247,7 @@ function median (size) {
|
|||||||
* Blur the image.
|
* Blur the image.
|
||||||
* When used without parameters, performs a fast, mild blur of the output image.
|
* When used without parameters, performs a fast, mild blur of the output image.
|
||||||
* When a `sigma` is provided, performs a slower, more accurate Gaussian blur.
|
* When a `sigma` is provided, performs a slower, more accurate Gaussian blur.
|
||||||
* @param {Number} [sigma] a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
* @param {number} [sigma] a value between 0.3 and 1000 representing the sigma of the Gaussian mask, where `sigma = 1 + radius / 2`.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -165,21 +262,29 @@ function blur (sigma) {
|
|||||||
// Numeric argument: specific sigma
|
// Numeric argument: specific sigma
|
||||||
this.options.blurSigma = sigma;
|
this.options.blurSigma = sigma;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid blur sigma (0.3 - 1000.0) ' + sigma);
|
throw is.invalidParameterError('sigma', 'number between 0.3 and 1000', sigma);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Merge alpha transparency channel, if any, with a background.
|
* Merge alpha transparency channel, if any, with a background, then remove the alpha channel.
|
||||||
|
*
|
||||||
|
* See also {@link /api-channel#removealpha|removeAlpha}.
|
||||||
|
*
|
||||||
|
* @example
|
||||||
|
* await sharp(rgbaInput)
|
||||||
|
* .flatten({ background: '#F0A703' })
|
||||||
|
* .toBuffer();
|
||||||
|
*
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {String|Object} [options.background={r: 0, g: 0, b: 0}] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to black.
|
* @param {string|Object} [options.background={r: 0, g: 0, b: 0}] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to black.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
*/
|
*/
|
||||||
function flatten (options) {
|
function flatten (options) {
|
||||||
this.options.flatten = is.bool(options) ? options : true;
|
this.options.flatten = is.bool(options) ? options : true;
|
||||||
if (is.object(options)) {
|
if (is.object(options)) {
|
||||||
this._setColourOption('flattenBackground', options.background);
|
this._setBackgroundColourOption('flattenBackground', options.background);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -193,8 +298,8 @@ function flatten (options) {
|
|||||||
*
|
*
|
||||||
* Supply a second argument to use a different output gamma value, otherwise the first value is used in both cases.
|
* Supply a second argument to use a different output gamma value, otherwise the first value is used in both cases.
|
||||||
*
|
*
|
||||||
* @param {Number} [gamma=2.2] value between 1.0 and 3.0.
|
* @param {number} [gamma=2.2] value between 1.0 and 3.0.
|
||||||
* @param {Number} [gammaOut] value between 1.0 and 3.0. (optional, defaults to same as `gamma`)
|
* @param {number} [gammaOut] value between 1.0 and 3.0. (optional, defaults to same as `gamma`)
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -205,7 +310,7 @@ function gamma (gamma, gammaOut) {
|
|||||||
} else if (is.number(gamma) && is.inRange(gamma, 1, 3)) {
|
} else if (is.number(gamma) && is.inRange(gamma, 1, 3)) {
|
||||||
this.options.gamma = gamma;
|
this.options.gamma = gamma;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid gamma correction (1.0 to 3.0) ' + gamma);
|
throw is.invalidParameterError('gamma', 'number between 1.0 and 3.0', gamma);
|
||||||
}
|
}
|
||||||
if (!is.defined(gammaOut)) {
|
if (!is.defined(gammaOut)) {
|
||||||
// Default gamma correction for output is same as input
|
// Default gamma correction for output is same as input
|
||||||
@@ -213,7 +318,7 @@ function gamma (gamma, gammaOut) {
|
|||||||
} else if (is.number(gammaOut) && is.inRange(gammaOut, 1, 3)) {
|
} else if (is.number(gammaOut) && is.inRange(gammaOut, 1, 3)) {
|
||||||
this.options.gammaOut = gammaOut;
|
this.options.gammaOut = gammaOut;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid output gamma correction (1.0 to 3.0) ' + gammaOut);
|
throw is.invalidParameterError('gammaOut', 'number between 1.0 and 3.0', gammaOut);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -247,6 +352,47 @@ function normalize (normalize) {
|
|||||||
return this.normalise(normalize);
|
return this.normalise(normalize);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Perform contrast limiting adaptive histogram equalization
|
||||||
|
* {@link https://en.wikipedia.org/wiki/Adaptive_histogram_equalization#Contrast_Limited_AHE|CLAHE}.
|
||||||
|
*
|
||||||
|
* This will, in general, enhance the clarity of the image by bringing out darker details.
|
||||||
|
*
|
||||||
|
* @since 0.28.3
|
||||||
|
*
|
||||||
|
* @param {Object} options
|
||||||
|
* @param {number} options.width - integer width of the region in pixels.
|
||||||
|
* @param {number} options.height - integer height of the region in pixels.
|
||||||
|
* @param {number} [options.maxSlope=3] - maximum value for the slope of the
|
||||||
|
* cumulative histogram. A value of 0 disables contrast limiting. Valid values
|
||||||
|
* are integers in the range 0-100 (inclusive)
|
||||||
|
* @returns {Sharp}
|
||||||
|
* @throws {Error} Invalid parameters
|
||||||
|
*/
|
||||||
|
function clahe (options) {
|
||||||
|
if (!is.plainObject(options)) {
|
||||||
|
throw is.invalidParameterError('options', 'plain object', options);
|
||||||
|
}
|
||||||
|
if (!('width' in options) || !is.integer(options.width) || options.width <= 0) {
|
||||||
|
throw is.invalidParameterError('width', 'integer above zero', options.width);
|
||||||
|
} else {
|
||||||
|
this.options.claheWidth = options.width;
|
||||||
|
}
|
||||||
|
if (!('height' in options) || !is.integer(options.height) || options.height <= 0) {
|
||||||
|
throw is.invalidParameterError('height', 'integer above zero', options.height);
|
||||||
|
} else {
|
||||||
|
this.options.claheHeight = options.height;
|
||||||
|
}
|
||||||
|
if (!is.defined(options.maxSlope)) {
|
||||||
|
this.options.claheMaxSlope = 3;
|
||||||
|
} else if (!is.integer(options.maxSlope) || options.maxSlope < 0 || options.maxSlope > 100) {
|
||||||
|
throw is.invalidParameterError('maxSlope', 'integer 0-100', options.maxSlope);
|
||||||
|
} else {
|
||||||
|
this.options.claheMaxSlope = options.maxSlope;
|
||||||
|
}
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convolve the image with the specified kernel.
|
* Convolve the image with the specified kernel.
|
||||||
*
|
*
|
||||||
@@ -264,11 +410,11 @@ function normalize (normalize) {
|
|||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Object} kernel
|
* @param {Object} kernel
|
||||||
* @param {Number} kernel.width - width of the kernel in pixels.
|
* @param {number} kernel.width - width of the kernel in pixels.
|
||||||
* @param {Number} kernel.height - width of the kernel in pixels.
|
* @param {number} kernel.height - height of the kernel in pixels.
|
||||||
* @param {Array<Number>} kernel.kernel - Array of length `width*height` containing the kernel values.
|
* @param {Array<number>} kernel.kernel - Array of length `width*height` containing the kernel values.
|
||||||
* @param {Number} [kernel.scale=sum] - the scale of the kernel in pixels.
|
* @param {number} [kernel.scale=sum] - the scale of the kernel in pixels.
|
||||||
* @param {Number} [kernel.offset=0] - the offset of the kernel in pixels.
|
* @param {number} [kernel.offset=0] - the offset of the kernel in pixels.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -299,8 +445,8 @@ function convolve (kernel) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Any pixel value greather than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
|
* Any pixel value greater than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
|
||||||
* @param {Number} [threshold=128] - a value in the range 0-255 representing the level at which the threshold will be applied.
|
* @param {number} [threshold=128] - a value in the range 0-255 representing the level at which the threshold will be applied.
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {Boolean} [options.greyscale=true] - convert to single channel greyscale.
|
* @param {Boolean} [options.greyscale=true] - convert to single channel greyscale.
|
||||||
* @param {Boolean} [options.grayscale=true] - alternative spelling for greyscale.
|
* @param {Boolean} [options.grayscale=true] - alternative spelling for greyscale.
|
||||||
@@ -315,7 +461,7 @@ function threshold (threshold, options) {
|
|||||||
} else if (is.integer(threshold) && is.inRange(threshold, 0, 255)) {
|
} else if (is.integer(threshold) && is.inRange(threshold, 0, 255)) {
|
||||||
this.options.threshold = threshold;
|
this.options.threshold = threshold;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid threshold (0 to 255) ' + threshold);
|
throw is.invalidParameterError('threshold', 'integer between 0 and 255', threshold);
|
||||||
}
|
}
|
||||||
if (!is.object(options) || options.greyscale === true || options.grayscale === true) {
|
if (!is.object(options) || options.greyscale === true || options.grayscale === true) {
|
||||||
this.options.thresholdGrayscale = true;
|
this.options.thresholdGrayscale = true;
|
||||||
@@ -331,13 +477,13 @@ function threshold (threshold, options) {
|
|||||||
* This operation creates an output image where each pixel is the result of
|
* This operation creates an output image where each pixel is the result of
|
||||||
* the selected bitwise boolean `operation` between the corresponding pixels of the input images.
|
* the selected bitwise boolean `operation` between the corresponding pixels of the input images.
|
||||||
*
|
*
|
||||||
* @param {Buffer|String} operand - Buffer containing image data or String containing the path to an image file.
|
* @param {Buffer|string} operand - Buffer containing image data or string containing the path to an image file.
|
||||||
* @param {String} operator - one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
* @param {string} operator - one of `and`, `or` or `eor` to perform that bitwise operation, like the C logic operators `&`, `|` and `^` respectively.
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {Object} [options.raw] - describes operand when using raw pixel data.
|
* @param {Object} [options.raw] - describes operand when using raw pixel data.
|
||||||
* @param {Number} [options.raw.width]
|
* @param {number} [options.raw.width]
|
||||||
* @param {Number} [options.raw.height]
|
* @param {number} [options.raw.height]
|
||||||
* @param {Number} [options.raw.channels]
|
* @param {number} [options.raw.channels]
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -346,15 +492,15 @@ function boolean (operand, operator, options) {
|
|||||||
if (is.string(operator) && is.inArray(operator, ['and', 'or', 'eor'])) {
|
if (is.string(operator) && is.inArray(operator, ['and', 'or', 'eor'])) {
|
||||||
this.options.booleanOp = operator;
|
this.options.booleanOp = operator;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid boolean operator ' + operator);
|
throw is.invalidParameterError('operator', 'one of: and, or, eor', operator);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Apply the linear formula a * input + b to the image (levels adjustment)
|
* Apply the linear formula a * input + b to the image (levels adjustment)
|
||||||
* @param {Number} [a=1.0] multiplier
|
* @param {number} [a=1.0] multiplier
|
||||||
* @param {Number} [b=0.0] offset
|
* @param {number} [b=0.0] offset
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -364,23 +510,23 @@ function linear (a, b) {
|
|||||||
} else if (is.number(a)) {
|
} else if (is.number(a)) {
|
||||||
this.options.linearA = a;
|
this.options.linearA = a;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid linear transform multiplier ' + a);
|
throw is.invalidParameterError('a', 'numeric', a);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!is.defined(b)) {
|
if (!is.defined(b)) {
|
||||||
this.options.linearB = 0.0;
|
this.options.linearB = 0.0;
|
||||||
} else if (is.number(b)) {
|
} else if (is.number(b)) {
|
||||||
this.options.linearB = b;
|
this.options.linearB = b;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid linear transform offset ' + b);
|
throw is.invalidParameterError('b', 'numeric', b);
|
||||||
}
|
}
|
||||||
|
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Recomb the image with the specified matrix.
|
* Recomb the image with the specified matrix.
|
||||||
*
|
*
|
||||||
|
* @since 0.21.1
|
||||||
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp(input)
|
* sharp(input)
|
||||||
* .recomb([
|
* .recomb([
|
||||||
@@ -394,7 +540,7 @@ function linear (a, b) {
|
|||||||
* // With this example input, a sepia filter has been applied
|
* // With this example input, a sepia filter has been applied
|
||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Array<Array<Number>>} 3x3 Recombination matrix
|
* @param {Array<Array<number>>} inputMatrix - 3x3 Recombination matrix
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -405,7 +551,7 @@ function recomb (inputMatrix) {
|
|||||||
inputMatrix[2].length !== 3
|
inputMatrix[2].length !== 3
|
||||||
) {
|
) {
|
||||||
// must pass in a kernel
|
// must pass in a kernel
|
||||||
throw new Error('Invalid Recomb Matrix');
|
throw new Error('Invalid recombination matrix');
|
||||||
}
|
}
|
||||||
this.options.recombMatrix = [
|
this.options.recombMatrix = [
|
||||||
inputMatrix[0][0], inputMatrix[0][1], inputMatrix[0][2],
|
inputMatrix[0][0], inputMatrix[0][1], inputMatrix[0][2],
|
||||||
@@ -418,6 +564,8 @@ function recomb (inputMatrix) {
|
|||||||
/**
|
/**
|
||||||
* Transforms the image using brightness, saturation and hue rotation.
|
* Transforms the image using brightness, saturation and hue rotation.
|
||||||
*
|
*
|
||||||
|
* @since 0.22.1
|
||||||
|
*
|
||||||
* @example
|
* @example
|
||||||
* sharp(input)
|
* sharp(input)
|
||||||
* .modulate({
|
* .modulate({
|
||||||
@@ -438,9 +586,9 @@ function recomb (inputMatrix) {
|
|||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {Number} [options.brightness] Brightness multiplier
|
* @param {number} [options.brightness] Brightness multiplier
|
||||||
* @param {Number} [options.saturation] Saturation multiplier
|
* @param {number} [options.saturation] Saturation multiplier
|
||||||
* @param {Number} [options.hue] Degrees for hue rotation
|
* @param {number} [options.hue] Degrees for hue rotation
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
*/
|
*/
|
||||||
function modulate (options) {
|
function modulate (options) {
|
||||||
@@ -480,6 +628,7 @@ module.exports = function (Sharp) {
|
|||||||
rotate,
|
rotate,
|
||||||
flip,
|
flip,
|
||||||
flop,
|
flop,
|
||||||
|
affine,
|
||||||
sharpen,
|
sharpen,
|
||||||
median,
|
median,
|
||||||
blur,
|
blur,
|
||||||
@@ -488,6 +637,7 @@ module.exports = function (Sharp) {
|
|||||||
negate,
|
negate,
|
||||||
normalise,
|
normalise,
|
||||||
normalize,
|
normalize,
|
||||||
|
clahe,
|
||||||
convolve,
|
convolve,
|
||||||
threshold,
|
threshold,
|
||||||
boolean,
|
boolean,
|
||||||
|
|||||||
783
lib/output.js
@@ -7,12 +7,14 @@ const env = process.env;
|
|||||||
module.exports = function () {
|
module.exports = function () {
|
||||||
const arch = env.npm_config_arch || process.arch;
|
const arch = env.npm_config_arch || process.arch;
|
||||||
const platform = env.npm_config_platform || process.platform;
|
const platform = env.npm_config_platform || process.platform;
|
||||||
|
/* istanbul ignore next */
|
||||||
const libc = (platform === 'linux' && detectLibc.isNonGlibcLinux) ? detectLibc.family : '';
|
const libc = (platform === 'linux' && detectLibc.isNonGlibcLinux) ? detectLibc.family : '';
|
||||||
|
|
||||||
const platformId = [`${platform}${libc}`];
|
const platformId = [`${platform}${libc}`];
|
||||||
|
|
||||||
if (arch === 'arm') {
|
if (arch === 'arm') {
|
||||||
platformId.push(`armv${env.npm_config_arm_version || process.config.variables.arm_version || '6'}`);
|
const fallback = process.versions.electron ? '7' : '6';
|
||||||
|
platformId.push(`armv${env.npm_config_arm_version || process.config.variables.arm_version || fallback}`);
|
||||||
} else if (arch === 'arm64') {
|
} else if (arch === 'arm64') {
|
||||||
platformId.push(`arm64v${env.npm_config_arm_version || '8'}`);
|
platformId.push(`arm64v${env.npm_config_arm_version || '8'}`);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
133
lib/resize.js
@@ -85,21 +85,30 @@ const mapFitToCanvas = {
|
|||||||
outside: 'min'
|
outside: 'min'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @private
|
||||||
|
*/
|
||||||
|
function isRotationExpected (options) {
|
||||||
|
return (options.angle % 360) !== 0 || options.useExifOrientation === true || options.rotationAngle !== 0;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resize image to `width`, `height` or `width x height`.
|
* Resize image to `width`, `height` or `width x height`.
|
||||||
*
|
*
|
||||||
* When both a `width` and `height` are provided, the possible methods by which the image should **fit** these are:
|
* When both a `width` and `height` are provided, the possible methods by which the image should **fit** these are:
|
||||||
* - `cover`: Crop to cover both provided dimensions (the default).
|
* - `cover`: (default) Preserving aspect ratio, ensure the image covers both provided dimensions by cropping/clipping to fit.
|
||||||
* - `contain`: Embed within both provided dimensions.
|
* - `contain`: Preserving aspect ratio, contain within both provided dimensions using "letterboxing" where necessary.
|
||||||
* - `fill`: Ignore the aspect ratio of the input and stretch to both provided dimensions.
|
* - `fill`: Ignore the aspect ratio of the input and stretch to both provided dimensions.
|
||||||
* - `inside`: Preserving aspect ratio, resize the image to be as large as possible while ensuring its dimensions are less than or equal to both those specified.
|
* - `inside`: Preserving aspect ratio, resize the image to be as large as possible while ensuring its dimensions are less than or equal to both those specified.
|
||||||
* - `outside`: Preserving aspect ratio, resize the image to be as small as possible while ensuring its dimensions are greater than or equal to both those specified.
|
* - `outside`: Preserving aspect ratio, resize the image to be as small as possible while ensuring its dimensions are greater than or equal to both those specified.
|
||||||
|
*
|
||||||
* Some of these values are based on the [object-fit](https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit) CSS property.
|
* Some of these values are based on the [object-fit](https://developer.mozilla.org/en-US/docs/Web/CSS/object-fit) CSS property.
|
||||||
*
|
*
|
||||||
* When using a `fit` of `cover` or `contain`, the default **position** is `centre`. Other options are:
|
* When using a `fit` of `cover` or `contain`, the default **position** is `centre`. Other options are:
|
||||||
* - `sharp.position`: `top`, `right top`, `right`, `right bottom`, `bottom`, `left bottom`, `left`, `left top`.
|
* - `sharp.position`: `top`, `right top`, `right`, `right bottom`, `bottom`, `left bottom`, `left`, `left top`.
|
||||||
* - `sharp.gravity`: `north`, `northeast`, `east`, `southeast`, `south`, `southwest`, `west`, `northwest`, `center` or `centre`.
|
* - `sharp.gravity`: `north`, `northeast`, `east`, `southeast`, `south`, `southwest`, `west`, `northwest`, `center` or `centre`.
|
||||||
* - `sharp.strategy`: `cover` only, dynamically crop using either the `entropy` or `attention` strategy.
|
* - `sharp.strategy`: `cover` only, dynamically crop using either the `entropy` or `attention` strategy.
|
||||||
|
*
|
||||||
* Some of these values are based on the [object-position](https://developer.mozilla.org/en-US/docs/Web/CSS/object-position) CSS property.
|
* Some of these values are based on the [object-position](https://developer.mozilla.org/en-US/docs/Web/CSS/object-position) CSS property.
|
||||||
*
|
*
|
||||||
* The experimental strategy-based approach resizes so one dimension is at its target length
|
* The experimental strategy-based approach resizes so one dimension is at its target length
|
||||||
@@ -173,8 +182,16 @@ const mapFitToCanvas = {
|
|||||||
* // and no larger than the input image
|
* // and no larger than the input image
|
||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Number} [width] - pixels wide the resultant image should be. Use `null` or `undefined` to auto-scale the width to match the height.
|
* @example
|
||||||
* @param {Number} [height] - pixels high the resultant image should be. Use `null` or `undefined` to auto-scale the height to match the width.
|
* const scaleByHalf = await sharp(input)
|
||||||
|
* .metadata()
|
||||||
|
* .then(({ width }) => sharp(input)
|
||||||
|
* .resize(Math.round(width * 0.5))
|
||||||
|
* .toBuffer()
|
||||||
|
* );
|
||||||
|
*
|
||||||
|
* @param {number} [width] - pixels wide the resultant image should be. Use `null` or `undefined` to auto-scale the width to match the height.
|
||||||
|
* @param {number} [height] - pixels high the resultant image should be. Use `null` or `undefined` to auto-scale the height to match the width.
|
||||||
* @param {Object} [options]
|
* @param {Object} [options]
|
||||||
* @param {String} [options.width] - alternative means of specifying `width`. If both are present this take priority.
|
* @param {String} [options.width] - alternative means of specifying `width`. If both are present this take priority.
|
||||||
* @param {String} [options.height] - alternative means of specifying `height`. If both are present this take priority.
|
* @param {String} [options.height] - alternative means of specifying `height`. If both are present this take priority.
|
||||||
@@ -210,12 +227,20 @@ function resize (width, height, options) {
|
|||||||
}
|
}
|
||||||
if (is.object(options)) {
|
if (is.object(options)) {
|
||||||
// Width
|
// Width
|
||||||
if (is.integer(options.width) && options.width > 0) {
|
if (is.defined(options.width)) {
|
||||||
this.options.width = options.width;
|
if (is.integer(options.width) && options.width > 0) {
|
||||||
|
this.options.width = options.width;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('width', 'positive integer', options.width);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Height
|
// Height
|
||||||
if (is.integer(options.height) && options.height > 0) {
|
if (is.defined(options.height)) {
|
||||||
this.options.height = options.height;
|
if (is.integer(options.height) && options.height > 0) {
|
||||||
|
this.options.height = options.height;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('height', 'positive integer', options.height);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// Fit
|
// Fit
|
||||||
if (is.defined(options.fit)) {
|
if (is.defined(options.fit)) {
|
||||||
@@ -238,9 +263,7 @@ function resize (width, height, options) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Background
|
// Background
|
||||||
if (is.defined(options.background)) {
|
this._setBackgroundColourOption('resizeBackground', options.background);
|
||||||
this._setColourOption('resizeBackground', options.background);
|
|
||||||
}
|
|
||||||
// Kernel
|
// Kernel
|
||||||
if (is.defined(options.kernel)) {
|
if (is.defined(options.kernel)) {
|
||||||
if (is.string(kernel[options.kernel])) {
|
if (is.string(kernel[options.kernel])) {
|
||||||
@@ -279,11 +302,20 @@ function resize (width, height, options) {
|
|||||||
* })
|
* })
|
||||||
* ...
|
* ...
|
||||||
*
|
*
|
||||||
* @param {(Number|Object)} extend - single pixel count to add to all edges or an Object with per-edge counts
|
* @example
|
||||||
* @param {Number} [extend.top]
|
* // Add a row of 10 red pixels to the bottom
|
||||||
* @param {Number} [extend.left]
|
* sharp(input)
|
||||||
* @param {Number} [extend.bottom]
|
* .extend({
|
||||||
* @param {Number} [extend.right]
|
* bottom: 10,
|
||||||
|
* background: 'red'
|
||||||
|
* })
|
||||||
|
* ...
|
||||||
|
*
|
||||||
|
* @param {(number|Object)} extend - single pixel count to add to all edges or an Object with per-edge counts
|
||||||
|
* @param {number} [extend.top=0]
|
||||||
|
* @param {number} [extend.left=0]
|
||||||
|
* @param {number} [extend.bottom=0]
|
||||||
|
* @param {number} [extend.right=0]
|
||||||
* @param {String|Object} [extend.background={r: 0, g: 0, b: 0, alpha: 1}] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to black without transparency.
|
* @param {String|Object} [extend.background={r: 0, g: 0, b: 0, alpha: 1}] - background colour, parsed by the [color](https://www.npmjs.org/package/color) module, defaults to black without transparency.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
@@ -294,26 +326,44 @@ function extend (extend) {
|
|||||||
this.options.extendBottom = extend;
|
this.options.extendBottom = extend;
|
||||||
this.options.extendLeft = extend;
|
this.options.extendLeft = extend;
|
||||||
this.options.extendRight = extend;
|
this.options.extendRight = extend;
|
||||||
} else if (
|
} else if (is.object(extend)) {
|
||||||
is.object(extend) &&
|
if (is.defined(extend.top)) {
|
||||||
is.integer(extend.top) && extend.top >= 0 &&
|
if (is.integer(extend.top) && extend.top >= 0) {
|
||||||
is.integer(extend.bottom) && extend.bottom >= 0 &&
|
this.options.extendTop = extend.top;
|
||||||
is.integer(extend.left) && extend.left >= 0 &&
|
} else {
|
||||||
is.integer(extend.right) && extend.right >= 0
|
throw is.invalidParameterError('top', 'positive integer', extend.top);
|
||||||
) {
|
}
|
||||||
this.options.extendTop = extend.top;
|
}
|
||||||
this.options.extendBottom = extend.bottom;
|
if (is.defined(extend.bottom)) {
|
||||||
this.options.extendLeft = extend.left;
|
if (is.integer(extend.bottom) && extend.bottom >= 0) {
|
||||||
this.options.extendRight = extend.right;
|
this.options.extendBottom = extend.bottom;
|
||||||
this._setColourOption('extendBackground', extend.background);
|
} else {
|
||||||
|
throw is.invalidParameterError('bottom', 'positive integer', extend.bottom);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (is.defined(extend.left)) {
|
||||||
|
if (is.integer(extend.left) && extend.left >= 0) {
|
||||||
|
this.options.extendLeft = extend.left;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('left', 'positive integer', extend.left);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (is.defined(extend.right)) {
|
||||||
|
if (is.integer(extend.right) && extend.right >= 0) {
|
||||||
|
this.options.extendRight = extend.right;
|
||||||
|
} else {
|
||||||
|
throw is.invalidParameterError('right', 'positive integer', extend.right);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._setBackgroundColourOption('extendBackground', extend.background);
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Invalid edge extension ' + extend);
|
throw is.invalidParameterError('extend', 'integer or object', extend);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extract a region of the image.
|
* Extract/crop a region of the image.
|
||||||
*
|
*
|
||||||
* - Use `extract` before `resize` for pre-resize extraction.
|
* - Use `extract` before `resize` for pre-resize extraction.
|
||||||
* - Use `extract` after `resize` for post-resize extraction.
|
* - Use `extract` after `resize` for post-resize extraction.
|
||||||
@@ -335,10 +385,10 @@ function extend (extend) {
|
|||||||
* });
|
* });
|
||||||
*
|
*
|
||||||
* @param {Object} options - describes the region to extract using integral pixel values
|
* @param {Object} options - describes the region to extract using integral pixel values
|
||||||
* @param {Number} options.left - zero-indexed offset from left edge
|
* @param {number} options.left - zero-indexed offset from left edge
|
||||||
* @param {Number} options.top - zero-indexed offset from top edge
|
* @param {number} options.top - zero-indexed offset from top edge
|
||||||
* @param {Number} options.width - width of region to extract
|
* @param {number} options.width - width of region to extract
|
||||||
* @param {Number} options.height - height of region to extract
|
* @param {number} options.height - height of region to extract
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -349,11 +399,11 @@ function extract (options) {
|
|||||||
if (is.integer(value) && value >= 0) {
|
if (is.integer(value) && value >= 0) {
|
||||||
this.options[name + (name === 'left' || name === 'top' ? 'Offset' : '') + suffix] = value;
|
this.options[name + (name === 'left' || name === 'top' ? 'Offset' : '') + suffix] = value;
|
||||||
} else {
|
} else {
|
||||||
throw new Error('Non-integer value for ' + name + ' of ' + value);
|
throw is.invalidParameterError(name, 'integer', value);
|
||||||
}
|
}
|
||||||
}, this);
|
}, this);
|
||||||
// Ensure existing rotation occurs before pre-resize extraction
|
// Ensure existing rotation occurs before pre-resize extraction
|
||||||
if (suffix === 'Pre' && ((this.options.angle % 360) !== 0 || this.options.useExifOrientation === true)) {
|
if (suffix === 'Pre' && isRotationExpected(this.options)) {
|
||||||
this.options.rotateBeforePreExtract = true;
|
this.options.rotateBeforePreExtract = true;
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
@@ -361,8 +411,12 @@ function extract (options) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Trim "boring" pixels from all edges that contain values similar to the top-left pixel.
|
* Trim "boring" pixels from all edges that contain values similar to the top-left pixel.
|
||||||
* The `info` response Object will contain `trimOffsetLeft` and `trimOffsetTop` properties.
|
* Images consisting entirely of a single colour will calculate "boring" using the alpha channel, if any.
|
||||||
* @param {Number} [threshold=10] the allowed difference from the top-left pixel, a number greater than zero.
|
*
|
||||||
|
* The `info` response Object, obtained from callback of `.toFile()` or `.toBuffer()`,
|
||||||
|
* will contain `trimOffsetLeft` and `trimOffsetTop` properties.
|
||||||
|
*
|
||||||
|
* @param {number} [threshold=10] the allowed difference from the top-left pixel, a number greater than zero.
|
||||||
* @returns {Sharp}
|
* @returns {Sharp}
|
||||||
* @throws {Error} Invalid parameters
|
* @throws {Error} Invalid parameters
|
||||||
*/
|
*/
|
||||||
@@ -374,6 +428,9 @@ function trim (threshold) {
|
|||||||
} else {
|
} else {
|
||||||
throw is.invalidParameterError('threshold', 'number greater than zero', threshold);
|
throw is.invalidParameterError('threshold', 'number greater than zero', threshold);
|
||||||
}
|
}
|
||||||
|
if (this.options.trimThreshold && isRotationExpected(this.options)) {
|
||||||
|
this.options.rotateBeforePreExtract = true;
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
102
lib/utility.js
@@ -1,8 +1,53 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const events = require('events');
|
||||||
|
const detectLibc = require('detect-libc');
|
||||||
|
|
||||||
const is = require('./is');
|
const is = require('./is');
|
||||||
const sharp = require('../build/Release/sharp.node');
|
const sharp = require('../build/Release/sharp.node');
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An Object containing nested boolean values representing the available input and output formats/methods.
|
||||||
|
* @member
|
||||||
|
* @example
|
||||||
|
* console.log(sharp.format);
|
||||||
|
* @returns {Object}
|
||||||
|
*/
|
||||||
|
const format = sharp.format();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An Object containing the available interpolators and their proper values
|
||||||
|
* @readonly
|
||||||
|
* @enum {string}
|
||||||
|
*/
|
||||||
|
const interpolators = {
|
||||||
|
/** [Nearest neighbour interpolation](http://en.wikipedia.org/wiki/Nearest-neighbor_interpolation). Suitable for image enlargement only. */
|
||||||
|
nearest: 'nearest',
|
||||||
|
/** [Bilinear interpolation](http://en.wikipedia.org/wiki/Bilinear_interpolation). Faster than bicubic but with less smooth results. */
|
||||||
|
bilinear: 'bilinear',
|
||||||
|
/** [Bicubic interpolation](http://en.wikipedia.org/wiki/Bicubic_interpolation) (the default). */
|
||||||
|
bicubic: 'bicubic',
|
||||||
|
/** [LBB interpolation](https://github.com/jcupitt/libvips/blob/master/libvips/resample/lbb.cpp#L100). Prevents some "[acutance](http://en.wikipedia.org/wiki/Acutance)" but typically reduces performance by a factor of 2. */
|
||||||
|
locallyBoundedBicubic: 'lbb',
|
||||||
|
/** [Nohalo interpolation](http://eprints.soton.ac.uk/268086/). Prevents acutance but typically reduces performance by a factor of 3. */
|
||||||
|
nohalo: 'nohalo',
|
||||||
|
/** [VSQBS interpolation](https://github.com/jcupitt/libvips/blob/master/libvips/resample/vsqbs.cpp#L48). Prevents "staircasing" when enlarging. */
|
||||||
|
vertexSplitQuadraticBasisSpline: 'vsqbs'
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An Object containing the version numbers of libvips and its dependencies.
|
||||||
|
* @member
|
||||||
|
* @example
|
||||||
|
* console.log(sharp.versions);
|
||||||
|
*/
|
||||||
|
let versions = {
|
||||||
|
vips: sharp.libvipsVersion()
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
versions = require(`../vendor/${versions.vips}/versions.json`);
|
||||||
|
} catch (err) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets or, when options are provided, sets the limits of _libvips'_ operation cache.
|
* Gets or, when options are provided, sets the limits of _libvips'_ operation cache.
|
||||||
* Existing entries in the cache will be trimmed after any change in limits.
|
* Existing entries in the cache will be trimmed after any change in limits.
|
||||||
@@ -16,10 +61,10 @@ const sharp = require('../build/Release/sharp.node');
|
|||||||
* sharp.cache( { files: 0 } );
|
* sharp.cache( { files: 0 } );
|
||||||
* sharp.cache(false);
|
* sharp.cache(false);
|
||||||
*
|
*
|
||||||
* @param {Object|Boolean} [options=true] - Object with the following attributes, or Boolean where true uses default cache settings and false removes all caching
|
* @param {Object|boolean} [options=true] - Object with the following attributes, or boolean where true uses default cache settings and false removes all caching
|
||||||
* @param {Number} [options.memory=50] - is the maximum memory in MB to use for this cache
|
* @param {number} [options.memory=50] - is the maximum memory in MB to use for this cache
|
||||||
* @param {Number} [options.files=20] - is the maximum number of files to hold open
|
* @param {number} [options.files=20] - is the maximum number of files to hold open
|
||||||
* @param {Number} [options.items=100] - is the maximum number of operations to cache
|
* @param {number} [options.items=100] - is the maximum number of operations to cache
|
||||||
* @returns {Object}
|
* @returns {Object}
|
||||||
*/
|
*/
|
||||||
function cache (options) {
|
function cache (options) {
|
||||||
@@ -41,8 +86,12 @@ cache(true);
|
|||||||
/**
|
/**
|
||||||
* Gets or, when a concurrency is provided, sets
|
* Gets or, when a concurrency is provided, sets
|
||||||
* the number of threads _libvips'_ should create to process each image.
|
* the number of threads _libvips'_ should create to process each image.
|
||||||
* The default value is the number of CPU cores.
|
*
|
||||||
* A value of `0` will reset to this default.
|
* The default value is the number of CPU cores,
|
||||||
|
* except when using glibc-based Linux without jemalloc,
|
||||||
|
* where the default is `1` to help reduce memory fragmentation.
|
||||||
|
*
|
||||||
|
* A value of `0` will reset this to the number of CPU cores.
|
||||||
*
|
*
|
||||||
* The maximum number of images that can be processed in parallel
|
* The maximum number of images that can be processed in parallel
|
||||||
* is limited by libuv's `UV_THREADPOOL_SIZE` environment variable.
|
* is limited by libuv's `UV_THREADPOOL_SIZE` environment variable.
|
||||||
@@ -54,12 +103,29 @@ cache(true);
|
|||||||
* sharp.concurrency(2); // 2
|
* sharp.concurrency(2); // 2
|
||||||
* sharp.concurrency(0); // 4
|
* sharp.concurrency(0); // 4
|
||||||
*
|
*
|
||||||
* @param {Number} [concurrency]
|
* @param {number} [concurrency]
|
||||||
* @returns {Number} concurrency
|
* @returns {number} concurrency
|
||||||
*/
|
*/
|
||||||
function concurrency (concurrency) {
|
function concurrency (concurrency) {
|
||||||
return sharp.concurrency(is.integer(concurrency) ? concurrency : null);
|
return sharp.concurrency(is.integer(concurrency) ? concurrency : null);
|
||||||
}
|
}
|
||||||
|
/* istanbul ignore next */
|
||||||
|
if (detectLibc.family === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
|
||||||
|
// Reduce default concurrency to 1 when using glibc memory allocator
|
||||||
|
sharp.concurrency(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An EventEmitter that emits a `change` event when a task is either:
|
||||||
|
* - queued, waiting for _libuv_ to provide a worker thread
|
||||||
|
* - complete
|
||||||
|
* @member
|
||||||
|
* @example
|
||||||
|
* sharp.queue.on('change', function(queueLength) {
|
||||||
|
* console.log('Queue contains ' + queueLength + ' task(s)');
|
||||||
|
* });
|
||||||
|
*/
|
||||||
|
const queue = new events.EventEmitter();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides access to internal task counters.
|
* Provides access to internal task counters.
|
||||||
@@ -89,8 +155,8 @@ function counters () {
|
|||||||
* const simd = sharp.simd(false);
|
* const simd = sharp.simd(false);
|
||||||
* // prevent libvips from using liborc at runtime
|
* // prevent libvips from using liborc at runtime
|
||||||
*
|
*
|
||||||
* @param {Boolean} [simd=true]
|
* @param {boolean} [simd=true]
|
||||||
* @returns {Boolean}
|
* @returns {boolean}
|
||||||
*/
|
*/
|
||||||
function simd (simd) {
|
function simd (simd) {
|
||||||
return sharp.simd(is.bool(simd) ? simd : null);
|
return sharp.simd(is.bool(simd) ? simd : null);
|
||||||
@@ -102,12 +168,12 @@ simd(true);
|
|||||||
* @private
|
* @private
|
||||||
*/
|
*/
|
||||||
module.exports = function (Sharp) {
|
module.exports = function (Sharp) {
|
||||||
[
|
Sharp.cache = cache;
|
||||||
cache,
|
Sharp.concurrency = concurrency;
|
||||||
concurrency,
|
Sharp.counters = counters;
|
||||||
counters,
|
Sharp.simd = simd;
|
||||||
simd
|
Sharp.format = format;
|
||||||
].forEach(function (f) {
|
Sharp.interpolators = interpolators;
|
||||||
Sharp[f.name] = f;
|
Sharp.versions = versions;
|
||||||
});
|
Sharp.queue = queue;
|
||||||
};
|
};
|
||||||
|
|||||||
27
mkdocs.yml
@@ -1,27 +0,0 @@
|
|||||||
site_name: sharp
|
|
||||||
site_url: https://sharp.pixelplumbing.com/
|
|
||||||
repo_url: https://github.com/lovell/sharp
|
|
||||||
site_description: High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP and TIFF images
|
|
||||||
copyright: <a href="https://pixelplumbing.com/">pixelplumbing.com</a>
|
|
||||||
google_analytics: ['UA-13034748-12', 'sharp.pixelplumbing.com']
|
|
||||||
theme: readthedocs
|
|
||||||
extra_css:
|
|
||||||
- css/extra.css
|
|
||||||
markdown_extensions:
|
|
||||||
- toc:
|
|
||||||
permalink: True
|
|
||||||
pages:
|
|
||||||
- Home: index.md
|
|
||||||
- Installation: install.md
|
|
||||||
- API:
|
|
||||||
- Constructor: api-constructor.md
|
|
||||||
- Input: api-input.md
|
|
||||||
- Output: api-output.md
|
|
||||||
- "Resizing images": api-resize.md
|
|
||||||
- "Compositing images": api-composite.md
|
|
||||||
- "Image operations": api-operation.md
|
|
||||||
- "Colour manipulation": api-colour.md
|
|
||||||
- "Channel manipulation": api-channel.md
|
|
||||||
- Utilities: api-utility.md
|
|
||||||
- Performance: performance.md
|
|
||||||
- Changelog: changelog.md
|
|
||||||
100
package.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "sharp",
|
"name": "sharp",
|
||||||
"description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP and TIFF images",
|
"description": "High performance Node.js image processing, the fastest module to resize JPEG, PNG, WebP, AVIF and TIFF images",
|
||||||
"version": "0.22.1",
|
"version": "0.28.3",
|
||||||
"author": "Lovell Fuller <npm@lovell.info>",
|
"author": "Lovell Fuller <npm@lovell.info>",
|
||||||
"homepage": "https://github.com/lovell/sharp",
|
"homepage": "https://github.com/lovell/sharp",
|
||||||
"contributors": [
|
"contributors": [
|
||||||
@@ -59,19 +59,46 @@
|
|||||||
"Daiz <taneli.vatanen@gmail.com>",
|
"Daiz <taneli.vatanen@gmail.com>",
|
||||||
"Julian Aubourg <j@ubourg.net>",
|
"Julian Aubourg <j@ubourg.net>",
|
||||||
"Keith Belovay <keith@picthrive.com>",
|
"Keith Belovay <keith@picthrive.com>",
|
||||||
"Michael B. Klein <mbklein@gmail.com>"
|
"Michael B. Klein <mbklein@gmail.com>",
|
||||||
|
"Jordan Prudhomme <jordan@raboland.fr>",
|
||||||
|
"Ilya Ovdin <iovdin@gmail.com>",
|
||||||
|
"Andargor <andargor@yahoo.com>",
|
||||||
|
"Paul Neave <paul.neave@gmail.com>",
|
||||||
|
"Brendan Kennedy <brenwken@gmail.com>",
|
||||||
|
"Brychan Bennett-Odlum <git@brychan.io>",
|
||||||
|
"Edward Silverton <e.silverton@gmail.com>",
|
||||||
|
"Roman Malieiev <aromaleev@gmail.com>",
|
||||||
|
"Tomas Szabo <tomas.szabo@deftomat.com>",
|
||||||
|
"Robert O'Rourke <robert@o-rourke.org>",
|
||||||
|
"Guillermo Alfonso Varela Chouciño <guillevch@gmail.com>",
|
||||||
|
"Christian Flintrup <chr@gigahost.dk>",
|
||||||
|
"Manan Jadhav <manan@motionden.com>",
|
||||||
|
"Leon Radley <leon@radley.se>",
|
||||||
|
"alza54 <alza54@thiocod.in>",
|
||||||
|
"Jacob Smith <jacob@frende.me>",
|
||||||
|
"Michael Nutt <michael@nutt.im>",
|
||||||
|
"Brad Parham <baparham@gmail.com>"
|
||||||
],
|
],
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"install": "(node install/libvips && node install/dll-copy && prebuild-install) || (node-gyp rebuild && node install/dll-copy)",
|
"install": "(node install/libvips && node install/dll-copy && prebuild-install) || (node install/can-compile && node-gyp rebuild && node install/dll-copy)",
|
||||||
"clean": "rm -rf node_modules/ build/ vendor/ .nyc_output/ coverage/ test/fixtures/output.*",
|
"clean": "rm -rf node_modules/ build/ vendor/ .nyc_output/ coverage/ test/fixtures/output.*",
|
||||||
"test": "semistandard && cc && npm run test-unit && npm run test-licensing && prebuild-ci",
|
"test": "npm run test-lint && npm run test-unit && npm run test-licensing",
|
||||||
"test-unit": "nyc --reporter=lcov --branches=99 mocha --slow=5000 --timeout=60000 ./test/unit/*.js",
|
"test-lint": "semistandard && cpplint",
|
||||||
|
"test-unit": "nyc --reporter=lcov --branches=99 mocha --slow=1000 --timeout=60000 ./test/unit/*.js",
|
||||||
"test-licensing": "license-checker --production --summary --onlyAllow=\"Apache-2.0;BSD;ISC;MIT\"",
|
"test-licensing": "license-checker --production --summary --onlyAllow=\"Apache-2.0;BSD;ISC;MIT\"",
|
||||||
"test-coverage": "./test/coverage/report.sh",
|
"test-coverage": "./test/coverage/report.sh",
|
||||||
"test-leak": "./test/leak/leak.sh",
|
"test-leak": "./test/leak/leak.sh",
|
||||||
"docs": "for m in constructor input resize composite operation colour channel output utility; do documentation build --shallow --format=md --markdown-toc=false lib/$m.js >docs/api-$m.md; done"
|
"docs-build": "documentation lint lib && node docs/build && node docs/search-index/build",
|
||||||
|
"docs-serve": "cd docs && npx serve",
|
||||||
|
"docs-publish": "cd docs && npx firebase-tools deploy --project pixelplumbing --only hosting:pixelplumbing-sharp"
|
||||||
},
|
},
|
||||||
"main": "lib/index.js",
|
"main": "lib/index.js",
|
||||||
|
"files": [
|
||||||
|
"binding.gyp",
|
||||||
|
"install/**",
|
||||||
|
"lib/**",
|
||||||
|
"src/**"
|
||||||
|
],
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "git://github.com/lovell/sharp"
|
"url": "git://github.com/lovell/sharp"
|
||||||
@@ -80,6 +107,7 @@
|
|||||||
"jpeg",
|
"jpeg",
|
||||||
"png",
|
"png",
|
||||||
"webp",
|
"webp",
|
||||||
|
"avif",
|
||||||
"tiff",
|
"tiff",
|
||||||
"gif",
|
"gif",
|
||||||
"svg",
|
"svg",
|
||||||
@@ -93,39 +121,46 @@
|
|||||||
"vips"
|
"vips"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"color": "^3.1.1",
|
"color": "^3.1.3",
|
||||||
"detect-libc": "^1.0.3",
|
"detect-libc": "^1.0.3",
|
||||||
"fs-copy-file-sync": "^1.1.1",
|
"node-addon-api": "^3.2.0",
|
||||||
"nan": "^2.13.2",
|
"prebuild-install": "^6.1.2",
|
||||||
"npmlog": "^4.1.2",
|
"semver": "^7.3.5",
|
||||||
"prebuild-install": "^5.3.0",
|
"simple-get": "^3.1.0",
|
||||||
"semver": "^6.0.0",
|
"tar-fs": "^2.1.1",
|
||||||
"simple-get": "^3.0.3",
|
|
||||||
"tar": "^4.4.8",
|
|
||||||
"tunnel-agent": "^0.6.0"
|
"tunnel-agent": "^0.6.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"async": "^2.6.2",
|
"async": "^3.2.0",
|
||||||
"cc": "^1.0.2",
|
"cc": "^3.0.1",
|
||||||
"decompress-zip": "^0.3.2",
|
"decompress-zip": "^0.3.3",
|
||||||
"documentation": "^10.0.0",
|
"documentation": "^13.2.5",
|
||||||
"exif-reader": "^1.0.2",
|
"exif-reader": "^1.0.3",
|
||||||
"icc": "^1.0.0",
|
"icc": "^2.0.0",
|
||||||
"license-checker": "^25.0.1",
|
"license-checker": "^25.0.1",
|
||||||
"mocha": "^6.1.4",
|
"mocha": "^8.4.0",
|
||||||
"mock-fs": "^4.9.0",
|
"mock-fs": "^4.14.0",
|
||||||
"nyc": "^14.0.0",
|
"nyc": "^15.1.0",
|
||||||
"prebuild": "^8.2.1",
|
"prebuild": "^10.0.1",
|
||||||
"prebuild-ci": "^3.0.0",
|
"rimraf": "^3.0.2",
|
||||||
"rimraf": "^2.6.3",
|
"semistandard": "^16.0.0"
|
||||||
"semistandard": "^13.0.1"
|
|
||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"config": {
|
"config": {
|
||||||
"libvips": "8.7.4"
|
"libvips": "8.10.6",
|
||||||
|
"runtime": "napi",
|
||||||
|
"target": 3
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6"
|
"node": ">=10"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://opencollective.com/libvips"
|
||||||
|
},
|
||||||
|
"binary": {
|
||||||
|
"napi_versions": [
|
||||||
|
3
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"semistandard": {
|
"semistandard": {
|
||||||
"env": [
|
"env": [
|
||||||
@@ -135,10 +170,7 @@
|
|||||||
"cc": {
|
"cc": {
|
||||||
"linelength": "120",
|
"linelength": "120",
|
||||||
"filter": [
|
"filter": [
|
||||||
"build/c++11",
|
"build/include"
|
||||||
"build/include",
|
|
||||||
"runtime/indentation_namespace",
|
|
||||||
"runtime/references"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
410
src/common.cc
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -17,11 +17,10 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <mutex>
|
#include <map>
|
||||||
|
#include <mutex> // NOLINT(build/c++11)
|
||||||
|
|
||||||
#include <node.h>
|
#include <napi.h>
|
||||||
#include <node_buffer.h>
|
|
||||||
#include <nan.h>
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
@@ -30,61 +29,106 @@ using vips::VImage;
|
|||||||
|
|
||||||
namespace sharp {
|
namespace sharp {
|
||||||
|
|
||||||
// Convenience methods to access the attributes of a v8::Object
|
// Convenience methods to access the attributes of a Napi::Object
|
||||||
bool HasAttr(v8::Local<v8::Object> obj, std::string attr) {
|
bool HasAttr(Napi::Object obj, std::string attr) {
|
||||||
return Nan::Has(obj, Nan::New(attr).ToLocalChecked()).FromJust();
|
return obj.Has(attr);
|
||||||
}
|
}
|
||||||
std::string AttrAsStr(v8::Local<v8::Object> obj, std::string attr) {
|
std::string AttrAsStr(Napi::Object obj, std::string attr) {
|
||||||
return *Nan::Utf8String(Nan::Get(obj, Nan::New(attr).ToLocalChecked()).ToLocalChecked());
|
return obj.Get(attr).As<Napi::String>();
|
||||||
}
|
}
|
||||||
std::vector<double> AttrAsRgba(v8::Local<v8::Object> obj, std::string attr) {
|
std::string AttrAsStr(Napi::Object obj, unsigned int const attr) {
|
||||||
v8::Local<v8::Object> background = AttrAs<v8::Object>(obj, attr);
|
return obj.Get(attr).As<Napi::String>();
|
||||||
std::vector<double> rgba(4);
|
}
|
||||||
for (unsigned int i = 0; i < 4; i++) {
|
uint32_t AttrAsUint32(Napi::Object obj, std::string attr) {
|
||||||
rgba[i] = AttrTo<double>(background, i);
|
return obj.Get(attr).As<Napi::Number>().Uint32Value();
|
||||||
|
}
|
||||||
|
int32_t AttrAsInt32(Napi::Object obj, std::string attr) {
|
||||||
|
return obj.Get(attr).As<Napi::Number>().Int32Value();
|
||||||
|
}
|
||||||
|
int32_t AttrAsInt32(Napi::Object obj, unsigned int const attr) {
|
||||||
|
return obj.Get(attr).As<Napi::Number>().Int32Value();
|
||||||
|
}
|
||||||
|
double AttrAsDouble(Napi::Object obj, std::string attr) {
|
||||||
|
return obj.Get(attr).As<Napi::Number>().DoubleValue();
|
||||||
|
}
|
||||||
|
double AttrAsDouble(Napi::Object obj, unsigned int const attr) {
|
||||||
|
return obj.Get(attr).As<Napi::Number>().DoubleValue();
|
||||||
|
}
|
||||||
|
bool AttrAsBool(Napi::Object obj, std::string attr) {
|
||||||
|
return obj.Get(attr).As<Napi::Boolean>().Value();
|
||||||
|
}
|
||||||
|
std::vector<double> AttrAsVectorOfDouble(Napi::Object obj, std::string attr) {
|
||||||
|
Napi::Array napiArray = obj.Get(attr).As<Napi::Array>();
|
||||||
|
std::vector<double> vectorOfDouble(napiArray.Length());
|
||||||
|
for (unsigned int i = 0; i < napiArray.Length(); i++) {
|
||||||
|
vectorOfDouble[i] = AttrAsDouble(napiArray, i);
|
||||||
}
|
}
|
||||||
return rgba;
|
return vectorOfDouble;
|
||||||
|
}
|
||||||
|
std::vector<int32_t> AttrAsInt32Vector(Napi::Object obj, std::string attr) {
|
||||||
|
Napi::Array array = obj.Get(attr).As<Napi::Array>();
|
||||||
|
std::vector<int32_t> vector(array.Length());
|
||||||
|
for (unsigned int i = 0; i < array.Length(); i++) {
|
||||||
|
vector[i] = AttrAsInt32(array, i);
|
||||||
|
}
|
||||||
|
return vector;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create an InputDescriptor instance from a v8::Object describing an input image
|
// Create an InputDescriptor instance from a Napi::Object describing an input image
|
||||||
InputDescriptor* CreateInputDescriptor(
|
InputDescriptor* CreateInputDescriptor(Napi::Object input) {
|
||||||
v8::Local<v8::Object> input, std::vector<v8::Local<v8::Object>> &buffersToPersist
|
|
||||||
) {
|
|
||||||
Nan::HandleScope();
|
|
||||||
InputDescriptor *descriptor = new InputDescriptor;
|
InputDescriptor *descriptor = new InputDescriptor;
|
||||||
if (HasAttr(input, "file")) {
|
if (HasAttr(input, "file")) {
|
||||||
descriptor->file = AttrAsStr(input, "file");
|
descriptor->file = AttrAsStr(input, "file");
|
||||||
} else if (HasAttr(input, "buffer")) {
|
} else if (HasAttr(input, "buffer")) {
|
||||||
v8::Local<v8::Object> buffer = AttrAs<v8::Object>(input, "buffer");
|
Napi::Buffer<char> buffer = input.Get("buffer").As<Napi::Buffer<char>>();
|
||||||
descriptor->bufferLength = node::Buffer::Length(buffer);
|
descriptor->bufferLength = buffer.Length();
|
||||||
descriptor->buffer = node::Buffer::Data(buffer);
|
descriptor->buffer = buffer.Data();
|
||||||
buffersToPersist.push_back(buffer);
|
descriptor->isBuffer = TRUE;
|
||||||
}
|
}
|
||||||
descriptor->failOnError = AttrTo<bool>(input, "failOnError");
|
descriptor->failOnError = AttrAsBool(input, "failOnError");
|
||||||
// Density for vector-based input
|
// Density for vector-based input
|
||||||
if (HasAttr(input, "density")) {
|
if (HasAttr(input, "density")) {
|
||||||
descriptor->density = AttrTo<double>(input, "density");
|
descriptor->density = AttrAsDouble(input, "density");
|
||||||
}
|
}
|
||||||
// Raw pixel input
|
// Raw pixel input
|
||||||
if (HasAttr(input, "rawChannels")) {
|
if (HasAttr(input, "rawChannels")) {
|
||||||
descriptor->rawChannels = AttrTo<uint32_t>(input, "rawChannels");
|
descriptor->rawChannels = AttrAsUint32(input, "rawChannels");
|
||||||
descriptor->rawWidth = AttrTo<uint32_t>(input, "rawWidth");
|
descriptor->rawWidth = AttrAsUint32(input, "rawWidth");
|
||||||
descriptor->rawHeight = AttrTo<uint32_t>(input, "rawHeight");
|
descriptor->rawHeight = AttrAsUint32(input, "rawHeight");
|
||||||
|
descriptor->rawPremultiplied = AttrAsBool(input, "rawPremultiplied");
|
||||||
}
|
}
|
||||||
// Multi-page input (GIF, TIFF, PDF)
|
// Multi-page input (GIF, TIFF, PDF)
|
||||||
if (HasAttr(input, "pages")) {
|
if (HasAttr(input, "pages")) {
|
||||||
descriptor->pages = AttrTo<int32_t>(input, "pages");
|
descriptor->pages = AttrAsInt32(input, "pages");
|
||||||
}
|
}
|
||||||
if (HasAttr(input, "page")) {
|
if (HasAttr(input, "page")) {
|
||||||
descriptor->page = AttrTo<uint32_t>(input, "page");
|
descriptor->page = AttrAsUint32(input, "page");
|
||||||
|
}
|
||||||
|
// Multi-level input (OpenSlide)
|
||||||
|
if (HasAttr(input, "level")) {
|
||||||
|
descriptor->level = AttrAsUint32(input, "level");
|
||||||
|
}
|
||||||
|
// subIFD (OME-TIFF)
|
||||||
|
if (HasAttr(input, "subifd")) {
|
||||||
|
descriptor->subifd = AttrAsInt32(input, "subifd");
|
||||||
}
|
}
|
||||||
// Create new image
|
// Create new image
|
||||||
if (HasAttr(input, "createChannels")) {
|
if (HasAttr(input, "createChannels")) {
|
||||||
descriptor->createChannels = AttrTo<uint32_t>(input, "createChannels");
|
descriptor->createChannels = AttrAsUint32(input, "createChannels");
|
||||||
descriptor->createWidth = AttrTo<uint32_t>(input, "createWidth");
|
descriptor->createWidth = AttrAsUint32(input, "createWidth");
|
||||||
descriptor->createHeight = AttrTo<uint32_t>(input, "createHeight");
|
descriptor->createHeight = AttrAsUint32(input, "createHeight");
|
||||||
descriptor->createBackground = AttrAsRgba(input, "createBackground");
|
if (HasAttr(input, "createNoiseType")) {
|
||||||
|
descriptor->createNoiseType = AttrAsStr(input, "createNoiseType");
|
||||||
|
descriptor->createNoiseMean = AttrAsDouble(input, "createNoiseMean");
|
||||||
|
descriptor->createNoiseSigma = AttrAsDouble(input, "createNoiseSigma");
|
||||||
|
} else {
|
||||||
|
descriptor->createBackground = AttrAsVectorOfDouble(input, "createBackground");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
// Limit input images to a given number of pixels, where pixels = width * height
|
||||||
|
descriptor->limitInputPixels = AttrAsUint32(input, "limitInputPixels");
|
||||||
|
// Allow switch from random to sequential access
|
||||||
|
descriptor->access = AttrAsBool(input, "sequentialRead") ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
|
||||||
return descriptor;
|
return descriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,9 +151,21 @@ namespace sharp {
|
|||||||
bool IsWebp(std::string const &str) {
|
bool IsWebp(std::string const &str) {
|
||||||
return EndsWith(str, ".webp") || EndsWith(str, ".WEBP");
|
return EndsWith(str, ".webp") || EndsWith(str, ".WEBP");
|
||||||
}
|
}
|
||||||
|
bool IsGif(std::string const &str) {
|
||||||
|
return EndsWith(str, ".gif") || EndsWith(str, ".GIF");
|
||||||
|
}
|
||||||
bool IsTiff(std::string const &str) {
|
bool IsTiff(std::string const &str) {
|
||||||
return EndsWith(str, ".tif") || EndsWith(str, ".tiff") || EndsWith(str, ".TIF") || EndsWith(str, ".TIFF");
|
return EndsWith(str, ".tif") || EndsWith(str, ".tiff") || EndsWith(str, ".TIF") || EndsWith(str, ".TIFF");
|
||||||
}
|
}
|
||||||
|
bool IsHeic(std::string const &str) {
|
||||||
|
return EndsWith(str, ".heic") || EndsWith(str, ".HEIC");
|
||||||
|
}
|
||||||
|
bool IsHeif(std::string const &str) {
|
||||||
|
return EndsWith(str, ".heif") || EndsWith(str, ".HEIF") || IsHeic(str) || IsAvif(str);
|
||||||
|
}
|
||||||
|
bool IsAvif(std::string const &str) {
|
||||||
|
return EndsWith(str, ".avif") || EndsWith(str, ".AVIF");
|
||||||
|
}
|
||||||
bool IsDz(std::string const &str) {
|
bool IsDz(std::string const &str) {
|
||||||
return EndsWith(str, ".dzi") || EndsWith(str, ".DZI");
|
return EndsWith(str, ".dzi") || EndsWith(str, ".DZI");
|
||||||
}
|
}
|
||||||
@@ -132,12 +188,14 @@ namespace sharp {
|
|||||||
case ImageType::TIFF: id = "tiff"; break;
|
case ImageType::TIFF: id = "tiff"; break;
|
||||||
case ImageType::GIF: id = "gif"; break;
|
case ImageType::GIF: id = "gif"; break;
|
||||||
case ImageType::SVG: id = "svg"; break;
|
case ImageType::SVG: id = "svg"; break;
|
||||||
|
case ImageType::HEIF: id = "heif"; break;
|
||||||
case ImageType::PDF: id = "pdf"; break;
|
case ImageType::PDF: id = "pdf"; break;
|
||||||
case ImageType::MAGICK: id = "magick"; break;
|
case ImageType::MAGICK: id = "magick"; break;
|
||||||
case ImageType::OPENSLIDE: id = "openslide"; break;
|
case ImageType::OPENSLIDE: id = "openslide"; break;
|
||||||
case ImageType::PPM: id = "ppm"; break;
|
case ImageType::PPM: id = "ppm"; break;
|
||||||
case ImageType::FITS: id = "fits"; break;
|
case ImageType::FITS: id = "fits"; break;
|
||||||
case ImageType::VIPS: id = "v"; break;
|
case ImageType::EXR: id = "exr"; break;
|
||||||
|
case ImageType::VIPS: id = "vips"; break;
|
||||||
case ImageType::RAW: id = "raw"; break;
|
case ImageType::RAW: id = "raw"; break;
|
||||||
case ImageType::UNKNOWN: id = "unknown"; break;
|
case ImageType::UNKNOWN: id = "unknown"; break;
|
||||||
case ImageType::MISSING: id = "missing"; break;
|
case ImageType::MISSING: id = "missing"; break;
|
||||||
@@ -145,30 +203,53 @@ namespace sharp {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Regenerate this table with something like:
|
||||||
|
*
|
||||||
|
* $ vips -l foreign | grep -i load | awk '{ print $2, $1; }'
|
||||||
|
*
|
||||||
|
* Plus a bit of editing.
|
||||||
|
*/
|
||||||
|
std::map<std::string, ImageType> loaderToType = {
|
||||||
|
{ "VipsForeignLoadJpegFile", ImageType::JPEG },
|
||||||
|
{ "VipsForeignLoadJpegBuffer", ImageType::JPEG },
|
||||||
|
{ "VipsForeignLoadPngFile", ImageType::PNG },
|
||||||
|
{ "VipsForeignLoadPngBuffer", ImageType::PNG },
|
||||||
|
{ "VipsForeignLoadWebpFile", ImageType::WEBP },
|
||||||
|
{ "VipsForeignLoadWebpBuffer", ImageType::WEBP },
|
||||||
|
{ "VipsForeignLoadTiffFile", ImageType::TIFF },
|
||||||
|
{ "VipsForeignLoadTiffBuffer", ImageType::TIFF },
|
||||||
|
{ "VipsForeignLoadGifFile", ImageType::GIF },
|
||||||
|
{ "VipsForeignLoadGifBuffer", ImageType::GIF },
|
||||||
|
{ "VipsForeignLoadNsgifFile", ImageType::GIF },
|
||||||
|
{ "VipsForeignLoadNsgifBuffer", ImageType::GIF },
|
||||||
|
{ "VipsForeignLoadSvgFile", ImageType::SVG },
|
||||||
|
{ "VipsForeignLoadSvgBuffer", ImageType::SVG },
|
||||||
|
{ "VipsForeignLoadHeifFile", ImageType::HEIF },
|
||||||
|
{ "VipsForeignLoadHeifBuffer", ImageType::HEIF },
|
||||||
|
{ "VipsForeignLoadPdfFile", ImageType::PDF },
|
||||||
|
{ "VipsForeignLoadPdfBuffer", ImageType::PDF },
|
||||||
|
{ "VipsForeignLoadMagickFile", ImageType::MAGICK },
|
||||||
|
{ "VipsForeignLoadMagickBuffer", ImageType::MAGICK },
|
||||||
|
{ "VipsForeignLoadOpenslide", ImageType::OPENSLIDE },
|
||||||
|
{ "VipsForeignLoadPpmFile", ImageType::PPM },
|
||||||
|
{ "VipsForeignLoadFits", ImageType::FITS },
|
||||||
|
{ "VipsForeignLoadOpenexr", ImageType::EXR },
|
||||||
|
{ "VipsForeignLoadVips", ImageType::VIPS },
|
||||||
|
{ "VipsForeignLoadVipsFile", ImageType::VIPS },
|
||||||
|
{ "VipsForeignLoadRaw", ImageType::RAW }
|
||||||
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Determine image format of a buffer.
|
Determine image format of a buffer.
|
||||||
*/
|
*/
|
||||||
ImageType DetermineImageType(void *buffer, size_t const length) {
|
ImageType DetermineImageType(void *buffer, size_t const length) {
|
||||||
ImageType imageType = ImageType::UNKNOWN;
|
ImageType imageType = ImageType::UNKNOWN;
|
||||||
char const *load = vips_foreign_find_load_buffer(buffer, length);
|
char const *load = vips_foreign_find_load_buffer(buffer, length);
|
||||||
if (load != NULL) {
|
if (load != nullptr) {
|
||||||
std::string const loader = load;
|
auto it = loaderToType.find(load);
|
||||||
if (EndsWith(loader, "JpegBuffer")) {
|
if (it != loaderToType.end()) {
|
||||||
imageType = ImageType::JPEG;
|
imageType = it->second;
|
||||||
} else if (EndsWith(loader, "PngBuffer")) {
|
|
||||||
imageType = ImageType::PNG;
|
|
||||||
} else if (EndsWith(loader, "WebpBuffer")) {
|
|
||||||
imageType = ImageType::WEBP;
|
|
||||||
} else if (EndsWith(loader, "TiffBuffer")) {
|
|
||||||
imageType = ImageType::TIFF;
|
|
||||||
} else if (EndsWith(loader, "GifBuffer")) {
|
|
||||||
imageType = ImageType::GIF;
|
|
||||||
} else if (EndsWith(loader, "SvgBuffer")) {
|
|
||||||
imageType = ImageType::SVG;
|
|
||||||
} else if (EndsWith(loader, "PdfBuffer")) {
|
|
||||||
imageType = ImageType::PDF;
|
|
||||||
} else if (EndsWith(loader, "MagickBuffer")) {
|
|
||||||
imageType = ImageType::MAGICK;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return imageType;
|
return imageType;
|
||||||
@@ -181,34 +262,12 @@ namespace sharp {
|
|||||||
ImageType imageType = ImageType::UNKNOWN;
|
ImageType imageType = ImageType::UNKNOWN;
|
||||||
char const *load = vips_foreign_find_load(file);
|
char const *load = vips_foreign_find_load(file);
|
||||||
if (load != nullptr) {
|
if (load != nullptr) {
|
||||||
std::string const loader = load;
|
auto it = loaderToType.find(load);
|
||||||
if (EndsWith(loader, "JpegFile")) {
|
if (it != loaderToType.end()) {
|
||||||
imageType = ImageType::JPEG;
|
imageType = it->second;
|
||||||
} else if (EndsWith(loader, "Png")) {
|
|
||||||
imageType = ImageType::PNG;
|
|
||||||
} else if (EndsWith(loader, "WebpFile")) {
|
|
||||||
imageType = ImageType::WEBP;
|
|
||||||
} else if (EndsWith(loader, "Openslide")) {
|
|
||||||
imageType = ImageType::OPENSLIDE;
|
|
||||||
} else if (EndsWith(loader, "TiffFile")) {
|
|
||||||
imageType = ImageType::TIFF;
|
|
||||||
} else if (EndsWith(loader, "GifFile")) {
|
|
||||||
imageType = ImageType::GIF;
|
|
||||||
} else if (EndsWith(loader, "SvgFile")) {
|
|
||||||
imageType = ImageType::SVG;
|
|
||||||
} else if (EndsWith(loader, "PdfFile")) {
|
|
||||||
imageType = ImageType::PDF;
|
|
||||||
} else if (EndsWith(loader, "Ppm")) {
|
|
||||||
imageType = ImageType::PPM;
|
|
||||||
} else if (EndsWith(loader, "Fits")) {
|
|
||||||
imageType = ImageType::FITS;
|
|
||||||
} else if (EndsWith(loader, "Vips")) {
|
|
||||||
imageType = ImageType::VIPS;
|
|
||||||
} else if (EndsWith(loader, "Magick") || EndsWith(loader, "MagickFile")) {
|
|
||||||
imageType = ImageType::MAGICK;
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (EndsWith(vips::VError().what(), " not found\n")) {
|
if (EndsWith(vips::VError().what(), " does not exist\n")) {
|
||||||
imageType = ImageType::MISSING;
|
imageType = ImageType::MISSING;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -220,18 +279,21 @@ namespace sharp {
|
|||||||
*/
|
*/
|
||||||
bool ImageTypeSupportsPage(ImageType imageType) {
|
bool ImageTypeSupportsPage(ImageType imageType) {
|
||||||
return
|
return
|
||||||
|
imageType == ImageType::WEBP ||
|
||||||
|
imageType == ImageType::MAGICK ||
|
||||||
imageType == ImageType::GIF ||
|
imageType == ImageType::GIF ||
|
||||||
imageType == ImageType::TIFF ||
|
imageType == ImageType::TIFF ||
|
||||||
|
imageType == ImageType::HEIF ||
|
||||||
imageType == ImageType::PDF;
|
imageType == ImageType::PDF;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
|
Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
|
||||||
*/
|
*/
|
||||||
std::tuple<VImage, ImageType> OpenInput(InputDescriptor *descriptor, VipsAccess accessMethod) {
|
std::tuple<VImage, ImageType> OpenInput(InputDescriptor *descriptor) {
|
||||||
VImage image;
|
VImage image;
|
||||||
ImageType imageType;
|
ImageType imageType;
|
||||||
if (descriptor->buffer != nullptr) {
|
if (descriptor->isBuffer) {
|
||||||
if (descriptor->rawChannels > 0) {
|
if (descriptor->rawChannels > 0) {
|
||||||
// Raw, uncompressed pixel data
|
// Raw, uncompressed pixel data
|
||||||
image = VImage::new_from_memory(descriptor->buffer, descriptor->bufferLength,
|
image = VImage::new_from_memory(descriptor->buffer, descriptor->bufferLength,
|
||||||
@@ -241,6 +303,9 @@ namespace sharp {
|
|||||||
} else {
|
} else {
|
||||||
image.get_image()->Type = VIPS_INTERPRETATION_sRGB;
|
image.get_image()->Type = VIPS_INTERPRETATION_sRGB;
|
||||||
}
|
}
|
||||||
|
if (descriptor->rawPremultiplied) {
|
||||||
|
image = image.unpremultiply();
|
||||||
|
}
|
||||||
imageType = ImageType::RAW;
|
imageType = ImageType::RAW;
|
||||||
} else {
|
} else {
|
||||||
// Compressed data
|
// Compressed data
|
||||||
@@ -248,8 +313,11 @@ namespace sharp {
|
|||||||
if (imageType != ImageType::UNKNOWN) {
|
if (imageType != ImageType::UNKNOWN) {
|
||||||
try {
|
try {
|
||||||
vips::VOption *option = VImage::option()
|
vips::VOption *option = VImage::option()
|
||||||
->set("access", accessMethod)
|
->set("access", descriptor->access)
|
||||||
->set("fail", descriptor->failOnError);
|
->set("fail", descriptor->failOnError);
|
||||||
|
if (imageType == ImageType::SVG) {
|
||||||
|
option->set("unlimited", TRUE);
|
||||||
|
}
|
||||||
if (imageType == ImageType::SVG || imageType == ImageType::PDF) {
|
if (imageType == ImageType::SVG || imageType == ImageType::PDF) {
|
||||||
option->set("dpi", descriptor->density);
|
option->set("dpi", descriptor->density);
|
||||||
}
|
}
|
||||||
@@ -260,9 +328,15 @@ namespace sharp {
|
|||||||
option->set("n", descriptor->pages);
|
option->set("n", descriptor->pages);
|
||||||
option->set("page", descriptor->page);
|
option->set("page", descriptor->page);
|
||||||
}
|
}
|
||||||
|
if (imageType == ImageType::OPENSLIDE) {
|
||||||
|
option->set("level", descriptor->level);
|
||||||
|
}
|
||||||
|
if (imageType == ImageType::TIFF) {
|
||||||
|
option->set("subifd", descriptor->subifd);
|
||||||
|
}
|
||||||
image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
|
image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
|
||||||
if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
|
if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
|
||||||
SetDensity(image, descriptor->density);
|
image = SetDensity(image, descriptor->density);
|
||||||
}
|
}
|
||||||
} catch (vips::VError const &err) {
|
} catch (vips::VError const &err) {
|
||||||
throw vips::VError(std::string("Input buffer has corrupt header: ") + err.what());
|
throw vips::VError(std::string("Input buffer has corrupt header: ") + err.what());
|
||||||
@@ -274,15 +348,35 @@ namespace sharp {
|
|||||||
} else {
|
} else {
|
||||||
if (descriptor->createChannels > 0) {
|
if (descriptor->createChannels > 0) {
|
||||||
// Create new image
|
// Create new image
|
||||||
std::vector<double> background = {
|
if (descriptor->createNoiseType == "gaussian") {
|
||||||
descriptor->createBackground[0],
|
int const channels = descriptor->createChannels;
|
||||||
descriptor->createBackground[1],
|
image = VImage::new_matrix(descriptor->createWidth, descriptor->createHeight);
|
||||||
descriptor->createBackground[2]
|
std::vector<VImage> bands = {};
|
||||||
};
|
bands.reserve(channels);
|
||||||
if (descriptor->createChannels == 4) {
|
for (int _band = 0; _band < channels; _band++) {
|
||||||
background.push_back(descriptor->createBackground[3]);
|
bands.push_back(image.gaussnoise(
|
||||||
|
descriptor->createWidth,
|
||||||
|
descriptor->createHeight,
|
||||||
|
VImage::option()->set("mean", descriptor->createNoiseMean)->set("sigma", descriptor->createNoiseSigma)));
|
||||||
|
}
|
||||||
|
image = image.bandjoin(bands);
|
||||||
|
image = image.cast(VipsBandFormat::VIPS_FORMAT_UCHAR);
|
||||||
|
if (channels < 3) {
|
||||||
|
image = image.colourspace(VIPS_INTERPRETATION_B_W);
|
||||||
|
} else {
|
||||||
|
image = image.colourspace(VIPS_INTERPRETATION_sRGB);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
std::vector<double> background = {
|
||||||
|
descriptor->createBackground[0],
|
||||||
|
descriptor->createBackground[1],
|
||||||
|
descriptor->createBackground[2]
|
||||||
|
};
|
||||||
|
if (descriptor->createChannels == 4) {
|
||||||
|
background.push_back(descriptor->createBackground[3]);
|
||||||
|
}
|
||||||
|
image = VImage::new_matrix(descriptor->createWidth, descriptor->createHeight).new_from_image(background);
|
||||||
}
|
}
|
||||||
image = VImage::new_matrix(descriptor->createWidth, descriptor->createHeight).new_from_image(background);
|
|
||||||
image.get_image()->Type = VIPS_INTERPRETATION_sRGB;
|
image.get_image()->Type = VIPS_INTERPRETATION_sRGB;
|
||||||
imageType = ImageType::RAW;
|
imageType = ImageType::RAW;
|
||||||
} else {
|
} else {
|
||||||
@@ -294,8 +388,11 @@ namespace sharp {
|
|||||||
if (imageType != ImageType::UNKNOWN) {
|
if (imageType != ImageType::UNKNOWN) {
|
||||||
try {
|
try {
|
||||||
vips::VOption *option = VImage::option()
|
vips::VOption *option = VImage::option()
|
||||||
->set("access", accessMethod)
|
->set("access", descriptor->access)
|
||||||
->set("fail", descriptor->failOnError);
|
->set("fail", descriptor->failOnError);
|
||||||
|
if (imageType == ImageType::SVG) {
|
||||||
|
option->set("unlimited", TRUE);
|
||||||
|
}
|
||||||
if (imageType == ImageType::SVG || imageType == ImageType::PDF) {
|
if (imageType == ImageType::SVG || imageType == ImageType::PDF) {
|
||||||
option->set("dpi", descriptor->density);
|
option->set("dpi", descriptor->density);
|
||||||
}
|
}
|
||||||
@@ -306,9 +403,15 @@ namespace sharp {
|
|||||||
option->set("n", descriptor->pages);
|
option->set("n", descriptor->pages);
|
||||||
option->set("page", descriptor->page);
|
option->set("page", descriptor->page);
|
||||||
}
|
}
|
||||||
|
if (imageType == ImageType::OPENSLIDE) {
|
||||||
|
option->set("level", descriptor->level);
|
||||||
|
}
|
||||||
|
if (imageType == ImageType::TIFF) {
|
||||||
|
option->set("subifd", descriptor->subifd);
|
||||||
|
}
|
||||||
image = VImage::new_from_file(descriptor->file.data(), option);
|
image = VImage::new_from_file(descriptor->file.data(), option);
|
||||||
if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
|
if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
|
||||||
SetDensity(image, descriptor->density);
|
image = SetDensity(image, descriptor->density);
|
||||||
}
|
}
|
||||||
} catch (vips::VError const &err) {
|
} catch (vips::VError const &err) {
|
||||||
throw vips::VError(std::string("Input file has corrupt header: ") + err.what());
|
throw vips::VError(std::string("Input file has corrupt header: ") + err.what());
|
||||||
@@ -318,6 +421,11 @@ namespace sharp {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Limit input images to a given number of pixels, where pixels = width * height
|
||||||
|
if (descriptor->limitInputPixels > 0 &&
|
||||||
|
static_cast<uint64_t>(image.width() * image.height()) > static_cast<uint64_t>(descriptor->limitInputPixels)) {
|
||||||
|
throw vips::VError("Input image exceeds pixel limit");
|
||||||
|
}
|
||||||
return std::make_tuple(image, imageType);
|
return std::make_tuple(image, imageType);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,12 +441,7 @@ namespace sharp {
|
|||||||
Uses colour space interpretation with number of channels to guess this.
|
Uses colour space interpretation with number of channels to guess this.
|
||||||
*/
|
*/
|
||||||
bool HasAlpha(VImage image) {
|
bool HasAlpha(VImage image) {
|
||||||
int const bands = image.bands();
|
return image.has_alpha();
|
||||||
VipsInterpretation const interpretation = image.interpretation();
|
|
||||||
return (
|
|
||||||
(bands == 2 && interpretation == VIPS_INTERPRETATION_B_W) ||
|
|
||||||
(bands == 4 && interpretation != VIPS_INTERPRETATION_CMYK) ||
|
|
||||||
(bands == 5 && interpretation == VIPS_INTERPRETATION_CMYK));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -355,15 +458,51 @@ namespace sharp {
|
|||||||
/*
|
/*
|
||||||
Set EXIF Orientation of image.
|
Set EXIF Orientation of image.
|
||||||
*/
|
*/
|
||||||
void SetExifOrientation(VImage image, int const orientation) {
|
VImage SetExifOrientation(VImage image, int const orientation) {
|
||||||
image.set(VIPS_META_ORIENTATION, orientation);
|
VImage copy = image.copy();
|
||||||
|
copy.set(VIPS_META_ORIENTATION, orientation);
|
||||||
|
return copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Remove EXIF Orientation from image.
|
Remove EXIF Orientation from image.
|
||||||
*/
|
*/
|
||||||
void RemoveExifOrientation(VImage image) {
|
VImage RemoveExifOrientation(VImage image) {
|
||||||
vips_image_remove(image.get_image(), VIPS_META_ORIENTATION);
|
VImage copy = image.copy();
|
||||||
|
copy.remove(VIPS_META_ORIENTATION);
|
||||||
|
return copy;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Set animation properties if necessary.
|
||||||
|
Non-provided properties will be loaded from image.
|
||||||
|
*/
|
||||||
|
VImage SetAnimationProperties(VImage image, int pageHeight, std::vector<int> delay, int loop) {
|
||||||
|
bool hasDelay = delay.size() != 1 || delay.front() != -1;
|
||||||
|
|
||||||
|
if (pageHeight == 0 && image.get_typeof(VIPS_META_PAGE_HEIGHT) == G_TYPE_INT) {
|
||||||
|
pageHeight = image.get_int(VIPS_META_PAGE_HEIGHT);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!hasDelay && image.get_typeof("delay") == VIPS_TYPE_ARRAY_INT) {
|
||||||
|
delay = image.get_array_int("delay");
|
||||||
|
hasDelay = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loop == -1 && image.get_typeof("loop") == G_TYPE_INT) {
|
||||||
|
loop = image.get_int("loop");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pageHeight == 0) return image;
|
||||||
|
|
||||||
|
// It is necessary to create the copy as otherwise, pageHeight will be ignored!
|
||||||
|
VImage copy = image.copy();
|
||||||
|
|
||||||
|
copy.set(VIPS_META_PAGE_HEIGHT, pageHeight);
|
||||||
|
if (hasDelay) copy.set("delay", delay);
|
||||||
|
if (loop != -1) copy.set("loop", loop);
|
||||||
|
|
||||||
|
return copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -383,36 +522,42 @@ namespace sharp {
|
|||||||
/*
|
/*
|
||||||
Set pixels/mm resolution based on a pixels/inch density.
|
Set pixels/mm resolution based on a pixels/inch density.
|
||||||
*/
|
*/
|
||||||
void SetDensity(VImage image, const double density) {
|
VImage SetDensity(VImage image, const double density) {
|
||||||
const double pixelsPerMm = density / 25.4;
|
const double pixelsPerMm = density / 25.4;
|
||||||
image.set("Xres", pixelsPerMm);
|
VImage copy = image.copy();
|
||||||
image.set("Yres", pixelsPerMm);
|
copy.get_image()->Xres = pixelsPerMm;
|
||||||
image.set(VIPS_META_RESOLUTION_UNIT, "in");
|
copy.get_image()->Yres = pixelsPerMm;
|
||||||
|
return copy;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Check the proposed format supports the current dimensions.
|
Check the proposed format supports the current dimensions.
|
||||||
*/
|
*/
|
||||||
void AssertImageTypeDimensions(VImage image, ImageType const imageType) {
|
void AssertImageTypeDimensions(VImage image, ImageType const imageType) {
|
||||||
|
const int height = image.get_typeof(VIPS_META_PAGE_HEIGHT) == G_TYPE_INT
|
||||||
|
? image.get_int(VIPS_META_PAGE_HEIGHT)
|
||||||
|
: image.height();
|
||||||
if (imageType == ImageType::JPEG) {
|
if (imageType == ImageType::JPEG) {
|
||||||
if (image.width() > 65535 || image.height() > 65535) {
|
if (image.width() > 65535 || height > 65535) {
|
||||||
throw vips::VError("Processed image is too large for the JPEG format");
|
throw vips::VError("Processed image is too large for the JPEG format");
|
||||||
}
|
}
|
||||||
} else if (imageType == ImageType::WEBP) {
|
} else if (imageType == ImageType::WEBP) {
|
||||||
if (image.width() > 16383 || image.height() > 16383) {
|
if (image.width() > 16383 || height > 16383) {
|
||||||
throw vips::VError("Processed image is too large for the WebP format");
|
throw vips::VError("Processed image is too large for the WebP format");
|
||||||
}
|
}
|
||||||
|
} else if (imageType == ImageType::GIF) {
|
||||||
|
if (image.width() > 65535 || height > 65535) {
|
||||||
|
throw vips::VError("Processed image is too large for the GIF format");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Called when a Buffer undergoes GC, required to support mixed runtime libraries in Windows
|
Called when a Buffer undergoes GC, required to support mixed runtime libraries in Windows
|
||||||
*/
|
*/
|
||||||
void FreeCallback(char* data, void* hint) {
|
std::function<void(void*, char*)> FreeCallback = [](void*, char* data) {
|
||||||
if (data != nullptr) {
|
g_free(data);
|
||||||
g_free(data);
|
};
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Temporary buffer of warnings
|
Temporary buffer of warnings
|
||||||
@@ -560,26 +705,18 @@ namespace sharp {
|
|||||||
int top = 0;
|
int top = 0;
|
||||||
|
|
||||||
// assign only if valid
|
// assign only if valid
|
||||||
if (x >= 0 && x < (inWidth - outWidth)) {
|
if (x < (inWidth - outWidth)) {
|
||||||
left = x;
|
left = x;
|
||||||
} else if (x >= (inWidth - outWidth)) {
|
} else if (x >= (inWidth - outWidth)) {
|
||||||
left = inWidth - outWidth;
|
left = inWidth - outWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (y >= 0 && y < (inHeight - outHeight)) {
|
if (y < (inHeight - outHeight)) {
|
||||||
top = y;
|
top = y;
|
||||||
} else if (y >= (inHeight - outHeight)) {
|
} else if (y >= (inHeight - outHeight)) {
|
||||||
top = inHeight - outHeight;
|
top = inHeight - outHeight;
|
||||||
}
|
}
|
||||||
|
|
||||||
// the resulting left and top could have been outside the image after calculation from bottom/right edges
|
|
||||||
if (left < 0) {
|
|
||||||
left = 0;
|
|
||||||
}
|
|
||||||
if (top < 0) {
|
|
||||||
top = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return std::make_tuple(left, top);
|
return std::make_tuple(left, top);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -666,4 +803,25 @@ namespace sharp {
|
|||||||
return std::make_tuple(image, alphaColour);
|
return std::make_tuple(image, alphaColour);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Removes alpha channel, if any.
|
||||||
|
*/
|
||||||
|
VImage RemoveAlpha(VImage image) {
|
||||||
|
if (HasAlpha(image)) {
|
||||||
|
image = image.extract_band(0, VImage::option()->set("n", image.bands() - 1));
|
||||||
|
}
|
||||||
|
return image;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
Ensures alpha channel, if missing.
|
||||||
|
*/
|
||||||
|
VImage EnsureAlpha(VImage image, double const value) {
|
||||||
|
if (!HasAlpha(image)) {
|
||||||
|
std::vector<double> alpha;
|
||||||
|
alpha.push_back(value * sharp::MaximumImageAlpha(image.interpretation()));
|
||||||
|
image = image.bandjoin_const(alpha);
|
||||||
|
}
|
||||||
|
return image;
|
||||||
|
}
|
||||||
} // namespace sharp
|
} // namespace sharp
|
||||||
|
|||||||
98
src/common.h
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -19,23 +19,24 @@
|
|||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <node.h>
|
#include <napi.h>
|
||||||
#include <nan.h>
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
// Verify platform and compiler compatibility
|
// Verify platform and compiler compatibility
|
||||||
|
|
||||||
#if (VIPS_MAJOR_VERSION < 8 || (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 7))
|
#if (VIPS_MAJOR_VERSION < 8) || \
|
||||||
#error libvips version 8.7.0+ is required - see sharp.pixelplumbing.com/page/install
|
(VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 10) || \
|
||||||
|
(VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 10 && VIPS_MICRO_VERSION < 6)
|
||||||
|
#error "libvips version 8.10.6+ is required - please see https://sharp.pixelplumbing.com/install"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
|
#if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))
|
||||||
#error GCC version 4.6+ is required for C++11 features - see sharp.pixelplumbing.com/page/install#prerequisites
|
#error "GCC version 4.6+ is required for C++11 features - please see https://sharp.pixelplumbing.com/install"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(__clang__) && defined(__has_feature))
|
#if (defined(__clang__) && defined(__has_feature))
|
||||||
#if (!__has_feature(cxx_range_for))
|
#if (!__has_feature(cxx_range_for))
|
||||||
#error clang version 3.0+ is required for C++11 features - see sharp.pixelplumbing.com/page/install#prerequisites
|
#error "clang version 3.0+ is required for C++11 features - please see https://sharp.pixelplumbing.com/install"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -43,56 +44,71 @@ using vips::VImage;
|
|||||||
|
|
||||||
namespace sharp {
|
namespace sharp {
|
||||||
|
|
||||||
struct InputDescriptor {
|
struct InputDescriptor { // NOLINT(runtime/indentation_namespace)
|
||||||
std::string name;
|
std::string name;
|
||||||
std::string file;
|
std::string file;
|
||||||
char *buffer;
|
char *buffer;
|
||||||
bool failOnError;
|
bool failOnError;
|
||||||
|
int limitInputPixels;
|
||||||
|
VipsAccess access;
|
||||||
size_t bufferLength;
|
size_t bufferLength;
|
||||||
|
bool isBuffer;
|
||||||
double density;
|
double density;
|
||||||
int rawChannels;
|
int rawChannels;
|
||||||
int rawWidth;
|
int rawWidth;
|
||||||
int rawHeight;
|
int rawHeight;
|
||||||
|
bool rawPremultiplied;
|
||||||
int pages;
|
int pages;
|
||||||
int page;
|
int page;
|
||||||
|
int level;
|
||||||
|
int subifd;
|
||||||
int createChannels;
|
int createChannels;
|
||||||
int createWidth;
|
int createWidth;
|
||||||
int createHeight;
|
int createHeight;
|
||||||
std::vector<double> createBackground;
|
std::vector<double> createBackground;
|
||||||
|
std::string createNoiseType;
|
||||||
|
double createNoiseMean;
|
||||||
|
double createNoiseSigma;
|
||||||
|
|
||||||
InputDescriptor():
|
InputDescriptor():
|
||||||
buffer(nullptr),
|
buffer(nullptr),
|
||||||
failOnError(TRUE),
|
failOnError(TRUE),
|
||||||
|
limitInputPixels(0x3FFF * 0x3FFF),
|
||||||
|
access(VIPS_ACCESS_RANDOM),
|
||||||
bufferLength(0),
|
bufferLength(0),
|
||||||
|
isBuffer(FALSE),
|
||||||
density(72.0),
|
density(72.0),
|
||||||
rawChannels(0),
|
rawChannels(0),
|
||||||
rawWidth(0),
|
rawWidth(0),
|
||||||
rawHeight(0),
|
rawHeight(0),
|
||||||
|
rawPremultiplied(false),
|
||||||
pages(1),
|
pages(1),
|
||||||
page(0),
|
page(0),
|
||||||
|
level(0),
|
||||||
|
subifd(-1),
|
||||||
createChannels(0),
|
createChannels(0),
|
||||||
createWidth(0),
|
createWidth(0),
|
||||||
createHeight(0),
|
createHeight(0),
|
||||||
createBackground{ 0.0, 0.0, 0.0, 255.0 } {}
|
createBackground{ 0.0, 0.0, 0.0, 255.0 },
|
||||||
|
createNoiseMean(0.0),
|
||||||
|
createNoiseSigma(0.0) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
// Convenience methods to access the attributes of a v8::Object
|
// Convenience methods to access the attributes of a Napi::Object
|
||||||
bool HasAttr(v8::Local<v8::Object> obj, std::string attr);
|
bool HasAttr(Napi::Object obj, std::string attr);
|
||||||
std::string AttrAsStr(v8::Local<v8::Object> obj, std::string attr);
|
std::string AttrAsStr(Napi::Object obj, std::string attr);
|
||||||
std::vector<double> AttrAsRgba(v8::Local<v8::Object> obj, std::string attr);
|
std::string AttrAsStr(Napi::Object obj, unsigned int const attr);
|
||||||
template<typename T> v8::Local<T> AttrAs(v8::Local<v8::Object> obj, std::string attr) {
|
uint32_t AttrAsUint32(Napi::Object obj, std::string attr);
|
||||||
return Nan::Get(obj, Nan::New(attr).ToLocalChecked()).ToLocalChecked().As<T>();
|
int32_t AttrAsInt32(Napi::Object obj, std::string attr);
|
||||||
}
|
int32_t AttrAsInt32(Napi::Object obj, unsigned int const attr);
|
||||||
template<typename T> T AttrTo(v8::Local<v8::Object> obj, std::string attr) {
|
double AttrAsDouble(Napi::Object obj, std::string attr);
|
||||||
return Nan::To<T>(Nan::Get(obj, Nan::New(attr).ToLocalChecked()).ToLocalChecked()).FromJust();
|
double AttrAsDouble(Napi::Object obj, unsigned int const attr);
|
||||||
}
|
bool AttrAsBool(Napi::Object obj, std::string attr);
|
||||||
template<typename T> T AttrTo(v8::Local<v8::Object> obj, int attr) {
|
std::vector<double> AttrAsVectorOfDouble(Napi::Object obj, std::string attr);
|
||||||
return Nan::To<T>(Nan::Get(obj, attr).ToLocalChecked()).FromJust();
|
std::vector<int32_t> AttrAsInt32Vector(Napi::Object obj, std::string attr);
|
||||||
}
|
|
||||||
|
|
||||||
// Create an InputDescriptor instance from a v8::Object describing an input image
|
// Create an InputDescriptor instance from a Napi::Object describing an input image
|
||||||
InputDescriptor* CreateInputDescriptor(
|
InputDescriptor* CreateInputDescriptor(Napi::Object input);
|
||||||
v8::Local<v8::Object> input, std::vector<v8::Local<v8::Object>> &buffersToPersist);
|
|
||||||
|
|
||||||
enum class ImageType {
|
enum class ImageType {
|
||||||
JPEG,
|
JPEG,
|
||||||
@@ -101,11 +117,13 @@ namespace sharp {
|
|||||||
TIFF,
|
TIFF,
|
||||||
GIF,
|
GIF,
|
||||||
SVG,
|
SVG,
|
||||||
|
HEIF,
|
||||||
PDF,
|
PDF,
|
||||||
MAGICK,
|
MAGICK,
|
||||||
OPENSLIDE,
|
OPENSLIDE,
|
||||||
PPM,
|
PPM,
|
||||||
FITS,
|
FITS,
|
||||||
|
EXR,
|
||||||
VIPS,
|
VIPS,
|
||||||
RAW,
|
RAW,
|
||||||
UNKNOWN,
|
UNKNOWN,
|
||||||
@@ -122,7 +140,11 @@ namespace sharp {
|
|||||||
bool IsJpeg(std::string const &str);
|
bool IsJpeg(std::string const &str);
|
||||||
bool IsPng(std::string const &str);
|
bool IsPng(std::string const &str);
|
||||||
bool IsWebp(std::string const &str);
|
bool IsWebp(std::string const &str);
|
||||||
|
bool IsGif(std::string const &str);
|
||||||
bool IsTiff(std::string const &str);
|
bool IsTiff(std::string const &str);
|
||||||
|
bool IsHeic(std::string const &str);
|
||||||
|
bool IsHeif(std::string const &str);
|
||||||
|
bool IsAvif(std::string const &str);
|
||||||
bool IsDz(std::string const &str);
|
bool IsDz(std::string const &str);
|
||||||
bool IsDzZip(std::string const &str);
|
bool IsDzZip(std::string const &str);
|
||||||
bool IsV(std::string const &str);
|
bool IsV(std::string const &str);
|
||||||
@@ -150,7 +172,7 @@ namespace sharp {
|
|||||||
/*
|
/*
|
||||||
Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
|
Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
|
||||||
*/
|
*/
|
||||||
std::tuple<VImage, ImageType> OpenInput(InputDescriptor *descriptor, VipsAccess accessMethod);
|
std::tuple<VImage, ImageType> OpenInput(InputDescriptor *descriptor);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Does this image have an embedded profile?
|
Does this image have an embedded profile?
|
||||||
@@ -171,12 +193,18 @@ namespace sharp {
|
|||||||
/*
|
/*
|
||||||
Set EXIF Orientation of image.
|
Set EXIF Orientation of image.
|
||||||
*/
|
*/
|
||||||
void SetExifOrientation(VImage image, int const orientation);
|
VImage SetExifOrientation(VImage image, int const orientation);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Remove EXIF Orientation from image.
|
Remove EXIF Orientation from image.
|
||||||
*/
|
*/
|
||||||
void RemoveExifOrientation(VImage image);
|
VImage RemoveExifOrientation(VImage image);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Set animation properties if necessary.
|
||||||
|
Non-provided properties will be loaded from image.
|
||||||
|
*/
|
||||||
|
VImage SetAnimationProperties(VImage image, int pageHeight, std::vector<int> delay, int loop);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Does this image have a non-default density?
|
Does this image have a non-default density?
|
||||||
@@ -191,7 +219,7 @@ namespace sharp {
|
|||||||
/*
|
/*
|
||||||
Set pixels/mm resolution based on a pixels/inch density.
|
Set pixels/mm resolution based on a pixels/inch density.
|
||||||
*/
|
*/
|
||||||
void SetDensity(VImage image, const double density);
|
VImage SetDensity(VImage image, const double density);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Check the proposed format supports the current dimensions.
|
Check the proposed format supports the current dimensions.
|
||||||
@@ -201,7 +229,7 @@ namespace sharp {
|
|||||||
/*
|
/*
|
||||||
Called when a Buffer undergoes GC, required to support mixed runtime libraries in Windows
|
Called when a Buffer undergoes GC, required to support mixed runtime libraries in Windows
|
||||||
*/
|
*/
|
||||||
void FreeCallback(char* data, void* hint);
|
extern std::function<void(void*, char*)> FreeCallback;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Called with warnings from the glib-registered "VIPS" domain
|
Called with warnings from the glib-registered "VIPS" domain
|
||||||
@@ -265,6 +293,16 @@ namespace sharp {
|
|||||||
*/
|
*/
|
||||||
std::tuple<VImage, std::vector<double>> ApplyAlpha(VImage image, std::vector<double> colour);
|
std::tuple<VImage, std::vector<double>> ApplyAlpha(VImage image, std::vector<double> colour);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Removes alpha channel, if any.
|
||||||
|
*/
|
||||||
|
VImage RemoveAlpha(VImage image);
|
||||||
|
|
||||||
|
/*
|
||||||
|
Ensures alpha channel, if missing.
|
||||||
|
*/
|
||||||
|
VImage EnsureAlpha(VImage image, double const value);
|
||||||
|
|
||||||
} // namespace sharp
|
} // namespace sharp
|
||||||
|
|
||||||
#endif // SRC_COMMON_H_
|
#endif // SRC_COMMON_H_
|
||||||
|
|||||||
178
src/libvips/cplusplus/VConnection.cpp
Normal file
@@ -0,0 +1,178 @@
|
|||||||
|
/* Object part of the VSource and VTarget class
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
Copyright (C) 1991-2001 The National Gallery
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Lesser General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Lesser General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Lesser General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
02110-1301 USA
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
|
These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
|
||||||
|
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif /*HAVE_CONFIG_H*/
|
||||||
|
#include <vips/intl.h>
|
||||||
|
|
||||||
|
#include <vips/vips8>
|
||||||
|
|
||||||
|
#include <vips/debug.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
#define VIPS_DEBUG
|
||||||
|
#define VIPS_DEBUG_VERBOSE
|
||||||
|
*/
|
||||||
|
|
||||||
|
VIPS_NAMESPACE_START
|
||||||
|
|
||||||
|
VSource
|
||||||
|
VSource::new_from_descriptor( int descriptor )
|
||||||
|
{
|
||||||
|
VipsSource *input;
|
||||||
|
|
||||||
|
if( !(input = vips_source_new_from_descriptor( descriptor )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VSource out( input );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VSource
|
||||||
|
VSource::new_from_file( const char *filename )
|
||||||
|
{
|
||||||
|
VipsSource *input;
|
||||||
|
|
||||||
|
if( !(input = vips_source_new_from_file( filename )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VSource out( input );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VSource
|
||||||
|
VSource::new_from_blob( VipsBlob *blob )
|
||||||
|
{
|
||||||
|
VipsSource *input;
|
||||||
|
|
||||||
|
if( !(input = vips_source_new_from_blob( blob )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VSource out( input );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VSource
|
||||||
|
VSource::new_from_memory( const void *data,
|
||||||
|
size_t size )
|
||||||
|
{
|
||||||
|
VipsSource *input;
|
||||||
|
|
||||||
|
if( !(input = vips_source_new_from_memory( data, size )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VSource out( input );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VSource
|
||||||
|
VSource::new_from_options( const char *options )
|
||||||
|
{
|
||||||
|
VipsSource *input;
|
||||||
|
|
||||||
|
if( !(input = vips_source_new_from_options( options )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VSource out( input );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VOption *
|
||||||
|
VOption::set( const char *name, const VSource value )
|
||||||
|
{
|
||||||
|
Pair *pair = new Pair( name );
|
||||||
|
|
||||||
|
pair->input = true;
|
||||||
|
g_value_init( &pair->value, VIPS_TYPE_SOURCE );
|
||||||
|
g_value_set_object( &pair->value, value.get_source() );
|
||||||
|
options.push_back( pair );
|
||||||
|
|
||||||
|
return( this );
|
||||||
|
}
|
||||||
|
|
||||||
|
VTarget
|
||||||
|
VTarget::new_to_descriptor( int descriptor )
|
||||||
|
{
|
||||||
|
VipsTarget *output;
|
||||||
|
|
||||||
|
if( !(output = vips_target_new_to_descriptor( descriptor )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VTarget out( output );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VTarget
|
||||||
|
VTarget::new_to_file( const char *filename )
|
||||||
|
{
|
||||||
|
VipsTarget *output;
|
||||||
|
|
||||||
|
if( !(output = vips_target_new_to_file( filename )) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VTarget out( output );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VTarget
|
||||||
|
VTarget::new_to_memory()
|
||||||
|
{
|
||||||
|
VipsTarget *output;
|
||||||
|
|
||||||
|
if( !(output = vips_target_new_to_memory()) )
|
||||||
|
throw VError();
|
||||||
|
|
||||||
|
VTarget out( output );
|
||||||
|
|
||||||
|
return( out );
|
||||||
|
}
|
||||||
|
|
||||||
|
VOption *
|
||||||
|
VOption::set( const char *name, const VTarget value )
|
||||||
|
{
|
||||||
|
Pair *pair = new Pair( name );
|
||||||
|
|
||||||
|
pair->input = true;
|
||||||
|
g_value_init( &pair->value, VIPS_TYPE_TARGET );
|
||||||
|
g_value_set_object( &pair->value, value.get_target() );
|
||||||
|
options.push_back( pair );
|
||||||
|
|
||||||
|
return( this );
|
||||||
|
}
|
||||||
|
|
||||||
|
VIPS_NAMESPACE_END
|
||||||
@@ -32,8 +32,6 @@
|
|||||||
#endif /*HAVE_CONFIG_H*/
|
#endif /*HAVE_CONFIG_H*/
|
||||||
#include <vips/intl.h>
|
#include <vips/intl.h>
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
VIPS_NAMESPACE_START
|
VIPS_NAMESPACE_START
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ VInterpolate::new_from_name( const char *name, VOption *options )
|
|||||||
}
|
}
|
||||||
|
|
||||||
VOption *
|
VOption *
|
||||||
VOption::set( const char *name, VInterpolate value )
|
VOption::set( const char *name, const VInterpolate value )
|
||||||
{
|
{
|
||||||
Pair *pair = new Pair( name );
|
Pair *pair = new Pair( name );
|
||||||
|
|
||||||
|
|||||||
246
src/metadata.cc
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -15,28 +15,16 @@
|
|||||||
#include <numeric>
|
#include <numeric>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include <node.h>
|
#include <napi.h>
|
||||||
#include <nan.h>
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "metadata.h"
|
#include "metadata.h"
|
||||||
|
|
||||||
class MetadataWorker : public Nan::AsyncWorker {
|
class MetadataWorker : public Napi::AsyncWorker {
|
||||||
public:
|
public:
|
||||||
MetadataWorker(
|
MetadataWorker(Napi::Function callback, MetadataBaton *baton, Napi::Function debuglog) :
|
||||||
Nan::Callback *callback, MetadataBaton *baton, Nan::Callback *debuglog,
|
Napi::AsyncWorker(callback), baton(baton), debuglog(Napi::Persistent(debuglog)) {}
|
||||||
std::vector<v8::Local<v8::Object>> const buffersToPersist) :
|
|
||||||
Nan::AsyncWorker(callback, "sharp:MetadataWorker"),
|
|
||||||
baton(baton), debuglog(debuglog),
|
|
||||||
buffersToPersist(buffersToPersist) {
|
|
||||||
// Protect Buffer objects from GC, keyed on index
|
|
||||||
std::accumulate(buffersToPersist.begin(), buffersToPersist.end(), 0,
|
|
||||||
[this](uint32_t index, v8::Local<v8::Object> const buffer) -> uint32_t {
|
|
||||||
SaveToPersistent(index, buffer);
|
|
||||||
return index + 1;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
~MetadataWorker() {}
|
~MetadataWorker() {}
|
||||||
|
|
||||||
void Execute() {
|
void Execute() {
|
||||||
@@ -46,7 +34,7 @@ class MetadataWorker : public Nan::AsyncWorker {
|
|||||||
vips::VImage image;
|
vips::VImage image;
|
||||||
sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
|
sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
|
||||||
try {
|
try {
|
||||||
std::tie(image, imageType) = OpenInput(baton->input, VIPS_ACCESS_SEQUENTIAL);
|
std::tie(image, imageType) = OpenInput(baton->input);
|
||||||
} catch (vips::VError const &err) {
|
} catch (vips::VError const &err) {
|
||||||
(baton->err).append(err.what());
|
(baton->err).append(err.what());
|
||||||
}
|
}
|
||||||
@@ -77,6 +65,30 @@ class MetadataWorker : public Nan::AsyncWorker {
|
|||||||
if (image.get_typeof(VIPS_META_PAGE_HEIGHT) == G_TYPE_INT) {
|
if (image.get_typeof(VIPS_META_PAGE_HEIGHT) == G_TYPE_INT) {
|
||||||
baton->pageHeight = image.get_int(VIPS_META_PAGE_HEIGHT);
|
baton->pageHeight = image.get_int(VIPS_META_PAGE_HEIGHT);
|
||||||
}
|
}
|
||||||
|
if (image.get_typeof("loop") == G_TYPE_INT) {
|
||||||
|
baton->loop = image.get_int("loop");
|
||||||
|
}
|
||||||
|
if (image.get_typeof("delay") == VIPS_TYPE_ARRAY_INT) {
|
||||||
|
baton->delay = image.get_array_int("delay");
|
||||||
|
}
|
||||||
|
if (image.get_typeof("heif-primary") == G_TYPE_INT) {
|
||||||
|
baton->pagePrimary = image.get_int("heif-primary");
|
||||||
|
}
|
||||||
|
if (image.get_typeof("heif-compression") == VIPS_TYPE_REF_STRING) {
|
||||||
|
baton->compression = image.get_string("heif-compression");
|
||||||
|
}
|
||||||
|
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));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (image.get_typeof(VIPS_META_N_SUBIFDS) == G_TYPE_INT) {
|
||||||
|
baton->subifds = image.get_int(VIPS_META_N_SUBIFDS);
|
||||||
|
}
|
||||||
baton->hasProfile = sharp::HasProfile(image);
|
baton->hasProfile = sharp::HasProfile(image);
|
||||||
// Derived attributes
|
// Derived attributes
|
||||||
baton->hasAlpha = sharp::HasAlpha(image);
|
baton->hasAlpha = sharp::HasAlpha(image);
|
||||||
@@ -113,6 +125,14 @@ class MetadataWorker : public Nan::AsyncWorker {
|
|||||||
memcpy(baton->xmp, xmp, xmpLength);
|
memcpy(baton->xmp, xmp, xmpLength);
|
||||||
baton->xmpLength = xmpLength;
|
baton->xmpLength = xmpLength;
|
||||||
}
|
}
|
||||||
|
// TIFFTAG_PHOTOSHOP
|
||||||
|
if (image.get_typeof(VIPS_META_PHOTOSHOP_NAME) == VIPS_TYPE_BLOB) {
|
||||||
|
size_t tifftagPhotoshopLength;
|
||||||
|
void const *tifftagPhotoshop = image.get_blob(VIPS_META_PHOTOSHOP_NAME, &tifftagPhotoshopLength);
|
||||||
|
baton->tifftagPhotoshop = static_cast<char *>(g_malloc(tifftagPhotoshopLength));
|
||||||
|
memcpy(baton->tifftagPhotoshop, tifftagPhotoshop, tifftagPhotoshopLength);
|
||||||
|
baton->tifftagPhotoshopLength = tifftagPhotoshopLength;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clean up
|
// Clean up
|
||||||
@@ -120,120 +140,132 @@ class MetadataWorker : public Nan::AsyncWorker {
|
|||||||
vips_thread_shutdown();
|
vips_thread_shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
void HandleOKCallback() {
|
void OnOK() {
|
||||||
using Nan::New;
|
Napi::Env env = Env();
|
||||||
using Nan::Set;
|
Napi::HandleScope scope(env);
|
||||||
Nan::HandleScope();
|
|
||||||
|
|
||||||
v8::Local<v8::Value> argv[2] = { Nan::Null(), Nan::Null() };
|
|
||||||
if (!baton->err.empty()) {
|
|
||||||
argv[0] = Nan::Error(baton->err.data());
|
|
||||||
} else {
|
|
||||||
// Metadata Object
|
|
||||||
v8::Local<v8::Object> info = New<v8::Object>();
|
|
||||||
Set(info, New("format").ToLocalChecked(), New<v8::String>(baton->format).ToLocalChecked());
|
|
||||||
if (baton->input->bufferLength > 0) {
|
|
||||||
Set(info, New("size").ToLocalChecked(), New<v8::Uint32>(static_cast<uint32_t>(baton->input->bufferLength)));
|
|
||||||
}
|
|
||||||
Set(info, New("width").ToLocalChecked(), New<v8::Uint32>(baton->width));
|
|
||||||
Set(info, New("height").ToLocalChecked(), New<v8::Uint32>(baton->height));
|
|
||||||
Set(info, New("space").ToLocalChecked(), New<v8::String>(baton->space).ToLocalChecked());
|
|
||||||
Set(info, New("channels").ToLocalChecked(), New<v8::Uint32>(baton->channels));
|
|
||||||
Set(info, New("depth").ToLocalChecked(), New<v8::String>(baton->depth).ToLocalChecked());
|
|
||||||
if (baton->density > 0) {
|
|
||||||
Set(info, New("density").ToLocalChecked(), New<v8::Uint32>(baton->density));
|
|
||||||
}
|
|
||||||
if (!baton->chromaSubsampling.empty()) {
|
|
||||||
Set(info,
|
|
||||||
New("chromaSubsampling").ToLocalChecked(),
|
|
||||||
New<v8::String>(baton->chromaSubsampling).ToLocalChecked());
|
|
||||||
}
|
|
||||||
Set(info, New("isProgressive").ToLocalChecked(), New<v8::Boolean>(baton->isProgressive));
|
|
||||||
if (baton->paletteBitDepth > 0) {
|
|
||||||
Set(info, New("paletteBitDepth").ToLocalChecked(), New<v8::Uint32>(baton->paletteBitDepth));
|
|
||||||
}
|
|
||||||
if (baton->pages > 0) {
|
|
||||||
Set(info, New("pages").ToLocalChecked(), New<v8::Uint32>(baton->pages));
|
|
||||||
}
|
|
||||||
if (baton->pageHeight > 0) {
|
|
||||||
Set(info, New("pageHeight").ToLocalChecked(), New<v8::Uint32>(baton->pageHeight));
|
|
||||||
}
|
|
||||||
Set(info, New("hasProfile").ToLocalChecked(), New<v8::Boolean>(baton->hasProfile));
|
|
||||||
Set(info, New("hasAlpha").ToLocalChecked(), New<v8::Boolean>(baton->hasAlpha));
|
|
||||||
if (baton->orientation > 0) {
|
|
||||||
Set(info, New("orientation").ToLocalChecked(), New<v8::Uint32>(baton->orientation));
|
|
||||||
}
|
|
||||||
if (baton->exifLength > 0) {
|
|
||||||
Set(info,
|
|
||||||
New("exif").ToLocalChecked(),
|
|
||||||
Nan::NewBuffer(baton->exif, baton->exifLength, sharp::FreeCallback, nullptr).ToLocalChecked());
|
|
||||||
}
|
|
||||||
if (baton->iccLength > 0) {
|
|
||||||
Set(info,
|
|
||||||
New("icc").ToLocalChecked(),
|
|
||||||
Nan::NewBuffer(baton->icc, baton->iccLength, sharp::FreeCallback, nullptr).ToLocalChecked());
|
|
||||||
}
|
|
||||||
if (baton->iptcLength > 0) {
|
|
||||||
Set(info,
|
|
||||||
New("iptc").ToLocalChecked(),
|
|
||||||
Nan::NewBuffer(baton->iptc, baton->iptcLength, sharp::FreeCallback, nullptr).ToLocalChecked());
|
|
||||||
}
|
|
||||||
if (baton->xmpLength > 0) {
|
|
||||||
Set(info,
|
|
||||||
New("xmp").ToLocalChecked(),
|
|
||||||
Nan::NewBuffer(baton->xmp, baton->xmpLength, sharp::FreeCallback, nullptr).ToLocalChecked());
|
|
||||||
}
|
|
||||||
argv[1] = info;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispose of Persistent wrapper around input Buffers so they can be garbage collected
|
|
||||||
std::accumulate(buffersToPersist.begin(), buffersToPersist.end(), 0,
|
|
||||||
[this](uint32_t index, v8::Local<v8::Object> const buffer) -> uint32_t {
|
|
||||||
GetFromPersistent(index);
|
|
||||||
return index + 1;
|
|
||||||
});
|
|
||||||
delete baton->input;
|
|
||||||
delete baton;
|
|
||||||
|
|
||||||
// Handle warnings
|
// Handle warnings
|
||||||
std::string warning = sharp::VipsWarningPop();
|
std::string warning = sharp::VipsWarningPop();
|
||||||
while (!warning.empty()) {
|
while (!warning.empty()) {
|
||||||
v8::Local<v8::Value> message[1] = { New(warning).ToLocalChecked() };
|
debuglog.Call({ Napi::String::New(env, warning) });
|
||||||
debuglog->Call(1, message, async_resource);
|
|
||||||
warning = sharp::VipsWarningPop();
|
warning = sharp::VipsWarningPop();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return to JavaScript
|
if (baton->err.empty()) {
|
||||||
callback->Call(2, argv, async_resource);
|
Napi::Object info = Napi::Object::New(env);
|
||||||
|
info.Set("format", baton->format);
|
||||||
|
if (baton->input->bufferLength > 0) {
|
||||||
|
info.Set("size", baton->input->bufferLength);
|
||||||
|
}
|
||||||
|
info.Set("width", baton->width);
|
||||||
|
info.Set("height", baton->height);
|
||||||
|
info.Set("space", baton->space);
|
||||||
|
info.Set("channels", baton->channels);
|
||||||
|
info.Set("depth", baton->depth);
|
||||||
|
if (baton->density > 0) {
|
||||||
|
info.Set("density", baton->density);
|
||||||
|
}
|
||||||
|
if (!baton->chromaSubsampling.empty()) {
|
||||||
|
info.Set("chromaSubsampling", baton->chromaSubsampling);
|
||||||
|
}
|
||||||
|
info.Set("isProgressive", baton->isProgressive);
|
||||||
|
if (baton->paletteBitDepth > 0) {
|
||||||
|
info.Set("paletteBitDepth", baton->paletteBitDepth);
|
||||||
|
}
|
||||||
|
if (baton->pages > 0) {
|
||||||
|
info.Set("pages", baton->pages);
|
||||||
|
}
|
||||||
|
if (baton->pageHeight > 0) {
|
||||||
|
info.Set("pageHeight", baton->pageHeight);
|
||||||
|
}
|
||||||
|
if (baton->loop >= 0) {
|
||||||
|
info.Set("loop", baton->loop);
|
||||||
|
}
|
||||||
|
if (!baton->delay.empty()) {
|
||||||
|
int i = 0;
|
||||||
|
Napi::Array delay = Napi::Array::New(env, static_cast<size_t>(baton->delay.size()));
|
||||||
|
for (int const d : baton->delay) {
|
||||||
|
delay.Set(i++, d);
|
||||||
|
}
|
||||||
|
info.Set("delay", delay);
|
||||||
|
}
|
||||||
|
if (baton->pagePrimary > -1) {
|
||||||
|
info.Set("pagePrimary", baton->pagePrimary);
|
||||||
|
}
|
||||||
|
if (!baton->compression.empty()) {
|
||||||
|
info.Set("compression", baton->compression);
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
if (baton->subifds > 0) {
|
||||||
|
info.Set("subifds", baton->subifds);
|
||||||
|
}
|
||||||
|
info.Set("hasProfile", baton->hasProfile);
|
||||||
|
info.Set("hasAlpha", baton->hasAlpha);
|
||||||
|
if (baton->orientation > 0) {
|
||||||
|
info.Set("orientation", baton->orientation);
|
||||||
|
}
|
||||||
|
if (baton->exifLength > 0) {
|
||||||
|
info.Set("exif", Napi::Buffer<char>::New(env, baton->exif, baton->exifLength, sharp::FreeCallback));
|
||||||
|
}
|
||||||
|
if (baton->iccLength > 0) {
|
||||||
|
info.Set("icc", Napi::Buffer<char>::New(env, baton->icc, baton->iccLength, sharp::FreeCallback));
|
||||||
|
}
|
||||||
|
if (baton->iptcLength > 0) {
|
||||||
|
info.Set("iptc", Napi::Buffer<char>::New(env, baton->iptc, baton->iptcLength, sharp::FreeCallback));
|
||||||
|
}
|
||||||
|
if (baton->xmpLength > 0) {
|
||||||
|
info.Set("xmp", Napi::Buffer<char>::New(env, baton->xmp, baton->xmpLength, sharp::FreeCallback));
|
||||||
|
}
|
||||||
|
if (baton->tifftagPhotoshopLength > 0) {
|
||||||
|
info.Set("tifftagPhotoshop",
|
||||||
|
Napi::Buffer<char>::New(env, baton->tifftagPhotoshop, baton->tifftagPhotoshopLength, sharp::FreeCallback));
|
||||||
|
}
|
||||||
|
Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
|
||||||
|
} else {
|
||||||
|
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, baton->err).Value() });
|
||||||
|
}
|
||||||
|
|
||||||
|
delete baton->input;
|
||||||
|
delete baton;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
MetadataBaton* baton;
|
MetadataBaton* baton;
|
||||||
Nan::Callback *debuglog;
|
Napi::FunctionReference debuglog;
|
||||||
std::vector<v8::Local<v8::Object>> buffersToPersist;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
metadata(options, callback)
|
metadata(options, callback)
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(metadata) {
|
Napi::Value metadata(const Napi::CallbackInfo& info) {
|
||||||
// Input Buffers must not undergo GC compaction during processing
|
|
||||||
std::vector<v8::Local<v8::Object>> buffersToPersist;
|
|
||||||
|
|
||||||
// V8 objects are converted to non-V8 types held in the baton struct
|
// V8 objects are converted to non-V8 types held in the baton struct
|
||||||
MetadataBaton *baton = new MetadataBaton;
|
MetadataBaton *baton = new MetadataBaton;
|
||||||
v8::Local<v8::Object> options = info[0].As<v8::Object>();
|
Napi::Object options = info[0].As<Napi::Object>();
|
||||||
|
|
||||||
// Input
|
// Input
|
||||||
baton->input = sharp::CreateInputDescriptor(sharp::AttrAs<v8::Object>(options, "input"), buffersToPersist);
|
baton->input = sharp::CreateInputDescriptor(options.Get("input").As<Napi::Object>());
|
||||||
|
|
||||||
// Function to notify of libvips warnings
|
// Function to notify of libvips warnings
|
||||||
Nan::Callback *debuglog = new Nan::Callback(sharp::AttrAs<v8::Function>(options, "debuglog"));
|
Napi::Function debuglog = options.Get("debuglog").As<Napi::Function>();
|
||||||
|
|
||||||
// Join queue for worker thread
|
// Join queue for worker thread
|
||||||
Nan::Callback *callback = new Nan::Callback(info[1].As<v8::Function>());
|
Napi::Function callback = info[1].As<Napi::Function>();
|
||||||
Nan::AsyncQueueWorker(new MetadataWorker(callback, baton, debuglog, buffersToPersist));
|
MetadataWorker *worker = new MetadataWorker(callback, baton, debuglog);
|
||||||
|
worker->Receiver().Set("options", options);
|
||||||
|
worker->Queue();
|
||||||
|
|
||||||
// Increment queued task counter
|
// Increment queued task counter
|
||||||
g_atomic_int_inc(&sharp::counterQueue);
|
g_atomic_int_inc(&sharp::counterQueue);
|
||||||
|
|
||||||
|
return info.Env().Undefined();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
#define SRC_METADATA_H_
|
#define SRC_METADATA_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <nan.h>
|
#include <napi.h>
|
||||||
|
|
||||||
#include "./common.h"
|
#include "./common.h"
|
||||||
|
|
||||||
@@ -36,6 +36,12 @@ struct MetadataBaton {
|
|||||||
int paletteBitDepth;
|
int paletteBitDepth;
|
||||||
int pages;
|
int pages;
|
||||||
int pageHeight;
|
int pageHeight;
|
||||||
|
int loop;
|
||||||
|
std::vector<int> delay;
|
||||||
|
int pagePrimary;
|
||||||
|
std::string compression;
|
||||||
|
std::vector<std::pair<int, int>> levels;
|
||||||
|
int subifds;
|
||||||
bool hasProfile;
|
bool hasProfile;
|
||||||
bool hasAlpha;
|
bool hasAlpha;
|
||||||
int orientation;
|
int orientation;
|
||||||
@@ -47,6 +53,8 @@ struct MetadataBaton {
|
|||||||
size_t iptcLength;
|
size_t iptcLength;
|
||||||
char *xmp;
|
char *xmp;
|
||||||
size_t xmpLength;
|
size_t xmpLength;
|
||||||
|
char *tifftagPhotoshop;
|
||||||
|
size_t tifftagPhotoshopLength;
|
||||||
std::string err;
|
std::string err;
|
||||||
|
|
||||||
MetadataBaton():
|
MetadataBaton():
|
||||||
@@ -59,6 +67,9 @@ struct MetadataBaton {
|
|||||||
paletteBitDepth(0),
|
paletteBitDepth(0),
|
||||||
pages(0),
|
pages(0),
|
||||||
pageHeight(0),
|
pageHeight(0),
|
||||||
|
loop(-1),
|
||||||
|
pagePrimary(-1),
|
||||||
|
subifds(0),
|
||||||
hasProfile(false),
|
hasProfile(false),
|
||||||
hasAlpha(false),
|
hasAlpha(false),
|
||||||
orientation(0),
|
orientation(0),
|
||||||
@@ -69,9 +80,11 @@ struct MetadataBaton {
|
|||||||
iptc(nullptr),
|
iptc(nullptr),
|
||||||
iptcLength(0),
|
iptcLength(0),
|
||||||
xmp(nullptr),
|
xmp(nullptr),
|
||||||
xmpLength(0) {}
|
xmpLength(0),
|
||||||
|
tifftagPhotoshop(nullptr),
|
||||||
|
tifftagPhotoshopLength(0) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
NAN_METHOD(metadata);
|
Napi::Value metadata(const Napi::CallbackInfo& info);
|
||||||
|
|
||||||
#endif // SRC_METADATA_H_
|
#endif // SRC_METADATA_H_
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -27,29 +27,6 @@ using vips::VImage;
|
|||||||
using vips::VError;
|
using vips::VError;
|
||||||
|
|
||||||
namespace sharp {
|
namespace sharp {
|
||||||
|
|
||||||
/*
|
|
||||||
Removes alpha channel, if any.
|
|
||||||
*/
|
|
||||||
VImage RemoveAlpha(VImage image) {
|
|
||||||
if (HasAlpha(image)) {
|
|
||||||
image = image.extract_band(0, VImage::option()->set("n", image.bands() - 1));
|
|
||||||
}
|
|
||||||
return image;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Ensures alpha channel, if missing.
|
|
||||||
*/
|
|
||||||
VImage EnsureAlpha(VImage image) {
|
|
||||||
if (!HasAlpha(image)) {
|
|
||||||
std::vector<double> alpha;
|
|
||||||
alpha.push_back(sharp::MaximumImageAlpha(image.interpretation()));
|
|
||||||
image = image.bandjoin_const(alpha);
|
|
||||||
}
|
|
||||||
return image;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tint an image using the specified chroma, preserving the original image luminance
|
* Tint an image using the specified chroma, preserving the original image luminance
|
||||||
*/
|
*/
|
||||||
@@ -115,6 +92,13 @@ namespace sharp {
|
|||||||
return image;
|
return image;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Contrast limiting adapative histogram equalization (CLAHE)
|
||||||
|
*/
|
||||||
|
VImage Clahe(VImage image, int const width, int const height, int const maxSlope) {
|
||||||
|
return image.hist_local(width, height, VImage::option()->set("max_slope", maxSlope));
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Gamma encoding/decoding
|
* Gamma encoding/decoding
|
||||||
*/
|
*/
|
||||||
@@ -172,8 +156,8 @@ namespace sharp {
|
|||||||
*/
|
*/
|
||||||
VImage Recomb(VImage image, std::unique_ptr<double[]> const &matrix) {
|
VImage Recomb(VImage image, std::unique_ptr<double[]> const &matrix) {
|
||||||
double *m = matrix.get();
|
double *m = matrix.get();
|
||||||
|
image = image.colourspace(VIPS_INTERPRETATION_sRGB);
|
||||||
return image
|
return image
|
||||||
.colourspace(VIPS_INTERPRETATION_sRGB)
|
|
||||||
.recomb(image.bands() == 3
|
.recomb(image.bands() == 3
|
||||||
? VImage::new_from_memory(
|
? VImage::new_from_memory(
|
||||||
m, 9 * sizeof(double), 3, 3, 1, VIPS_FORMAT_DOUBLE
|
m, 9 * sizeof(double), 3, 3, 1, VIPS_FORMAT_DOUBLE
|
||||||
@@ -191,12 +175,20 @@ namespace sharp {
|
|||||||
VImage alpha = image[image.bands() - 1];
|
VImage alpha = image[image.bands() - 1];
|
||||||
return RemoveAlpha(image)
|
return RemoveAlpha(image)
|
||||||
.colourspace(VIPS_INTERPRETATION_LCH)
|
.colourspace(VIPS_INTERPRETATION_LCH)
|
||||||
.linear({brightness, saturation, 1}, {0, 0, static_cast<double>(hue)})
|
.linear(
|
||||||
|
{ brightness, saturation, 1},
|
||||||
|
{ 0.0, 0.0, static_cast<double>(hue) }
|
||||||
|
)
|
||||||
|
.colourspace(VIPS_INTERPRETATION_sRGB)
|
||||||
.bandjoin(alpha);
|
.bandjoin(alpha);
|
||||||
} else {
|
} else {
|
||||||
return image
|
return image
|
||||||
.colourspace(VIPS_INTERPRETATION_LCH)
|
.colourspace(VIPS_INTERPRETATION_LCH)
|
||||||
.linear({brightness, saturation, 1}, {0, 0, static_cast<double>(hue)});
|
.linear(
|
||||||
|
{ brightness, saturation, 1 },
|
||||||
|
{ 0.0, 0.0, static_cast<double>(hue) }
|
||||||
|
)
|
||||||
|
.colourspace(VIPS_INTERPRETATION_sRGB);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,17 +242,30 @@ namespace sharp {
|
|||||||
Trim an image
|
Trim an image
|
||||||
*/
|
*/
|
||||||
VImage Trim(VImage image, double const threshold) {
|
VImage Trim(VImage image, double const threshold) {
|
||||||
|
if (image.width() < 3 && image.height() < 3) {
|
||||||
|
throw VError("Image to trim must be at least 3x3 pixels");
|
||||||
|
}
|
||||||
// Top-left pixel provides the background colour
|
// Top-left pixel provides the background colour
|
||||||
VImage background = image.extract_area(0, 0, 1, 1);
|
VImage background = image.extract_area(0, 0, 1, 1);
|
||||||
if (HasAlpha(background)) {
|
if (HasAlpha(background)) {
|
||||||
background = background.flatten();
|
background = background.flatten();
|
||||||
}
|
}
|
||||||
int top, width, height;
|
int left, top, width, height;
|
||||||
int const left = image.find_trim(&top, &width, &height, VImage::option()
|
left = image.find_trim(&top, &width, &height, VImage::option()
|
||||||
->set("background", background(0, 0))
|
->set("background", background(0, 0))
|
||||||
->set("threshold", threshold));
|
->set("threshold", threshold));
|
||||||
if (width == 0 || height == 0) {
|
if (width == 0 || height == 0) {
|
||||||
throw VError("Unexpected error while trimming. Try to lower the tolerance");
|
if (HasAlpha(image)) {
|
||||||
|
// Search alpha channel
|
||||||
|
VImage alpha = image[image.bands() - 1];
|
||||||
|
VImage backgroundAlpha = alpha.extract_area(0, 0, 1, 1);
|
||||||
|
left = alpha.find_trim(&top, &width, &height, VImage::option()
|
||||||
|
->set("background", backgroundAlpha(0, 0))
|
||||||
|
->set("threshold", threshold));
|
||||||
|
}
|
||||||
|
if (width == 0 || height == 0) {
|
||||||
|
throw VError("Unexpected error while trimming. Try to lower the tolerance");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return image.extract_area(left, top, width, height);
|
return image.extract_area(left, top, width, height);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -25,16 +25,6 @@ using vips::VImage;
|
|||||||
|
|
||||||
namespace sharp {
|
namespace sharp {
|
||||||
|
|
||||||
/*
|
|
||||||
Removes alpha channel, if any.
|
|
||||||
*/
|
|
||||||
VImage RemoveAlpha(VImage image);
|
|
||||||
|
|
||||||
/*
|
|
||||||
Ensures alpha channel, if missing.
|
|
||||||
*/
|
|
||||||
VImage EnsureAlpha(VImage image);
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Tint an image using the specified chroma, preserving the original image luminance
|
* Tint an image using the specified chroma, preserving the original image luminance
|
||||||
*/
|
*/
|
||||||
@@ -45,6 +35,11 @@ namespace sharp {
|
|||||||
*/
|
*/
|
||||||
VImage Normalise(VImage image);
|
VImage Normalise(VImage image);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Contrast limiting adapative histogram equalization (CLAHE)
|
||||||
|
*/
|
||||||
|
VImage Clahe(VImage image, int const width, int const height, int const maxSlope);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Gamma encoding/decoding
|
* Gamma encoding/decoding
|
||||||
*/
|
*/
|
||||||
|
|||||||
913
src/pipeline.cc
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -18,13 +18,14 @@
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <unordered_map>
|
||||||
|
|
||||||
#include <nan.h>
|
#include <napi.h>
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
#include "./common.h"
|
#include "./common.h"
|
||||||
|
|
||||||
NAN_METHOD(pipeline);
|
Napi::Value pipeline(const Napi::CallbackInfo& info);
|
||||||
|
|
||||||
enum class Canvas {
|
enum class Canvas {
|
||||||
CROP,
|
CROP,
|
||||||
@@ -40,21 +41,23 @@ struct Composite {
|
|||||||
int gravity;
|
int gravity;
|
||||||
int left;
|
int left;
|
||||||
int top;
|
int top;
|
||||||
|
bool hasOffset;
|
||||||
bool tile;
|
bool tile;
|
||||||
|
bool premultiplied;
|
||||||
|
|
||||||
Composite():
|
Composite():
|
||||||
input(nullptr),
|
input(nullptr),
|
||||||
mode(VIPS_BLEND_MODE_OVER),
|
mode(VIPS_BLEND_MODE_OVER),
|
||||||
gravity(0),
|
gravity(0),
|
||||||
left(-1),
|
left(0),
|
||||||
top(-1),
|
top(0),
|
||||||
tile(false) {}
|
hasOffset(false),
|
||||||
|
tile(false),
|
||||||
|
premultiplied(false) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct PipelineBaton {
|
struct PipelineBaton {
|
||||||
sharp::InputDescriptor *input;
|
sharp::InputDescriptor *input;
|
||||||
std::string iccProfilePath;
|
|
||||||
int limitInputPixels;
|
|
||||||
std::string formatOut;
|
std::string formatOut;
|
||||||
std::string fileOut;
|
std::string fileOut;
|
||||||
void *bufferOut;
|
void *bufferOut;
|
||||||
@@ -79,6 +82,7 @@ struct PipelineBaton {
|
|||||||
int cropOffsetLeft;
|
int cropOffsetLeft;
|
||||||
int cropOffsetTop;
|
int cropOffsetTop;
|
||||||
bool premultiplied;
|
bool premultiplied;
|
||||||
|
bool tileCentre;
|
||||||
std::string kernel;
|
std::string kernel;
|
||||||
bool fastShrinkOnLoad;
|
bool fastShrinkOnLoad;
|
||||||
double tintA;
|
double tintA;
|
||||||
@@ -105,6 +109,9 @@ struct PipelineBaton {
|
|||||||
double gammaOut;
|
double gammaOut;
|
||||||
bool greyscale;
|
bool greyscale;
|
||||||
bool normalise;
|
bool normalise;
|
||||||
|
int claheWidth;
|
||||||
|
int claheHeight;
|
||||||
|
int claheMaxSlope;
|
||||||
bool useExifOrientation;
|
bool useExifOrientation;
|
||||||
int angle;
|
int angle;
|
||||||
double rotationAngle;
|
double rotationAngle;
|
||||||
@@ -118,7 +125,13 @@ struct PipelineBaton {
|
|||||||
int extendRight;
|
int extendRight;
|
||||||
std::vector<double> extendBackground;
|
std::vector<double> extendBackground;
|
||||||
bool withoutEnlargement;
|
bool withoutEnlargement;
|
||||||
VipsAccess accessMethod;
|
std::vector<double> affineMatrix;
|
||||||
|
std::vector<double> affineBackground;
|
||||||
|
double affineIdx;
|
||||||
|
double affineIdy;
|
||||||
|
double affineOdx;
|
||||||
|
double affineOdy;
|
||||||
|
vips::VInterpolate affineInterpolator;
|
||||||
int jpegQuality;
|
int jpegQuality;
|
||||||
bool jpegProgressive;
|
bool jpegProgressive;
|
||||||
std::string jpegChromaSubsampling;
|
std::string jpegChromaSubsampling;
|
||||||
@@ -138,19 +151,29 @@ struct PipelineBaton {
|
|||||||
int webpAlphaQuality;
|
int webpAlphaQuality;
|
||||||
bool webpNearLossless;
|
bool webpNearLossless;
|
||||||
bool webpLossless;
|
bool webpLossless;
|
||||||
|
bool webpSmartSubsample;
|
||||||
|
int webpReductionEffort;
|
||||||
int tiffQuality;
|
int tiffQuality;
|
||||||
VipsForeignTiffCompression tiffCompression;
|
VipsForeignTiffCompression tiffCompression;
|
||||||
VipsForeignTiffPredictor tiffPredictor;
|
VipsForeignTiffPredictor tiffPredictor;
|
||||||
bool tiffPyramid;
|
bool tiffPyramid;
|
||||||
bool tiffSquash;
|
int tiffBitdepth;
|
||||||
bool tiffTile;
|
bool tiffTile;
|
||||||
int tiffTileHeight;
|
int tiffTileHeight;
|
||||||
int tiffTileWidth;
|
int tiffTileWidth;
|
||||||
double tiffXres;
|
double tiffXres;
|
||||||
double tiffYres;
|
double tiffYres;
|
||||||
|
int heifQuality;
|
||||||
|
VipsForeignHeifCompression heifCompression;
|
||||||
|
int heifSpeed;
|
||||||
|
std::string heifChromaSubsampling;
|
||||||
|
bool heifLossless;
|
||||||
std::string err;
|
std::string err;
|
||||||
bool withMetadata;
|
bool withMetadata;
|
||||||
int withMetadataOrientation;
|
int withMetadataOrientation;
|
||||||
|
double withMetadataDensity;
|
||||||
|
std::string withMetadataIcc;
|
||||||
|
std::unordered_map<std::string, std::string> withMetadataStrs;
|
||||||
std::unique_ptr<double[]> convKernel;
|
std::unique_ptr<double[]> convKernel;
|
||||||
int convKernelWidth;
|
int convKernelWidth;
|
||||||
int convKernelHeight;
|
int convKernelHeight;
|
||||||
@@ -161,20 +184,25 @@ struct PipelineBaton {
|
|||||||
VipsOperationBoolean bandBoolOp;
|
VipsOperationBoolean bandBoolOp;
|
||||||
int extractChannel;
|
int extractChannel;
|
||||||
bool removeAlpha;
|
bool removeAlpha;
|
||||||
bool ensureAlpha;
|
double ensureAlpha;
|
||||||
VipsInterpretation colourspace;
|
VipsInterpretation colourspace;
|
||||||
|
int pageHeight;
|
||||||
|
std::vector<int> delay;
|
||||||
|
int loop;
|
||||||
int tileSize;
|
int tileSize;
|
||||||
int tileOverlap;
|
int tileOverlap;
|
||||||
VipsForeignDzContainer tileContainer;
|
VipsForeignDzContainer tileContainer;
|
||||||
VipsForeignDzLayout tileLayout;
|
VipsForeignDzLayout tileLayout;
|
||||||
std::string tileFormat;
|
std::string tileFormat;
|
||||||
int tileAngle;
|
int tileAngle;
|
||||||
|
std::vector<double> tileBackground;
|
||||||
|
int tileSkipBlanks;
|
||||||
VipsForeignDzDepth tileDepth;
|
VipsForeignDzDepth tileDepth;
|
||||||
|
std::string tileId;
|
||||||
std::unique_ptr<double[]> recombMatrix;
|
std::unique_ptr<double[]> recombMatrix;
|
||||||
|
|
||||||
PipelineBaton():
|
PipelineBaton():
|
||||||
input(nullptr),
|
input(nullptr),
|
||||||
limitInputPixels(0),
|
|
||||||
bufferOutLength(0),
|
bufferOutLength(0),
|
||||||
topOffsetPre(-1),
|
topOffsetPre(-1),
|
||||||
topOffsetPost(-1),
|
topOffsetPost(-1),
|
||||||
@@ -194,7 +222,7 @@ struct PipelineBaton {
|
|||||||
blurSigma(0.0),
|
blurSigma(0.0),
|
||||||
brightness(1.0),
|
brightness(1.0),
|
||||||
saturation(1.0),
|
saturation(1.0),
|
||||||
hue(0.0),
|
hue(0),
|
||||||
medianSize(0),
|
medianSize(0),
|
||||||
sharpenSigma(0.0),
|
sharpenSigma(0.0),
|
||||||
sharpenFlat(1.0),
|
sharpenFlat(1.0),
|
||||||
@@ -209,6 +237,9 @@ struct PipelineBaton {
|
|||||||
gamma(0.0),
|
gamma(0.0),
|
||||||
greyscale(false),
|
greyscale(false),
|
||||||
normalise(false),
|
normalise(false),
|
||||||
|
claheWidth(0),
|
||||||
|
claheHeight(0),
|
||||||
|
claheMaxSlope(3),
|
||||||
useExifOrientation(false),
|
useExifOrientation(false),
|
||||||
angle(0),
|
angle(0),
|
||||||
rotationAngle(0.0),
|
rotationAngle(0.0),
|
||||||
@@ -221,6 +252,13 @@ struct PipelineBaton {
|
|||||||
extendRight(0),
|
extendRight(0),
|
||||||
extendBackground{ 0.0, 0.0, 0.0, 255.0 },
|
extendBackground{ 0.0, 0.0, 0.0, 255.0 },
|
||||||
withoutEnlargement(false),
|
withoutEnlargement(false),
|
||||||
|
affineMatrix{ 1.0, 0.0, 0.0, 1.0 },
|
||||||
|
affineBackground{ 0.0, 0.0, 0.0, 255.0 },
|
||||||
|
affineIdx(0),
|
||||||
|
affineIdy(0),
|
||||||
|
affineOdx(0),
|
||||||
|
affineOdy(0),
|
||||||
|
affineInterpolator(vips::VInterpolate::new_from_name("bicubic")),
|
||||||
jpegQuality(80),
|
jpegQuality(80),
|
||||||
jpegProgressive(false),
|
jpegProgressive(false),
|
||||||
jpegChromaSubsampling("4:2:0"),
|
jpegChromaSubsampling("4:2:0"),
|
||||||
@@ -230,25 +268,36 @@ struct PipelineBaton {
|
|||||||
jpegOptimiseScans(false),
|
jpegOptimiseScans(false),
|
||||||
jpegOptimiseCoding(true),
|
jpegOptimiseCoding(true),
|
||||||
pngProgressive(false),
|
pngProgressive(false),
|
||||||
pngCompressionLevel(9),
|
pngCompressionLevel(6),
|
||||||
pngAdaptiveFiltering(false),
|
pngAdaptiveFiltering(false),
|
||||||
pngPalette(false),
|
pngPalette(false),
|
||||||
pngQuality(100),
|
pngQuality(100),
|
||||||
pngColours(256),
|
pngColours(256),
|
||||||
pngDither(1.0),
|
pngDither(1.0),
|
||||||
webpQuality(80),
|
webpQuality(80),
|
||||||
|
webpAlphaQuality(100),
|
||||||
|
webpNearLossless(false),
|
||||||
|
webpLossless(false),
|
||||||
|
webpSmartSubsample(false),
|
||||||
|
webpReductionEffort(4),
|
||||||
tiffQuality(80),
|
tiffQuality(80),
|
||||||
tiffCompression(VIPS_FOREIGN_TIFF_COMPRESSION_JPEG),
|
tiffCompression(VIPS_FOREIGN_TIFF_COMPRESSION_JPEG),
|
||||||
tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
|
tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
|
||||||
tiffPyramid(false),
|
tiffPyramid(false),
|
||||||
tiffSquash(false),
|
tiffBitdepth(8),
|
||||||
tiffTile(false),
|
tiffTile(false),
|
||||||
tiffTileHeight(256),
|
tiffTileHeight(256),
|
||||||
tiffTileWidth(256),
|
tiffTileWidth(256),
|
||||||
tiffXres(1.0),
|
tiffXres(1.0),
|
||||||
tiffYres(1.0),
|
tiffYres(1.0),
|
||||||
|
heifQuality(50),
|
||||||
|
heifCompression(VIPS_FOREIGN_HEIF_COMPRESSION_AV1),
|
||||||
|
heifSpeed(5),
|
||||||
|
heifChromaSubsampling("4:2:0"),
|
||||||
|
heifLossless(false),
|
||||||
withMetadata(false),
|
withMetadata(false),
|
||||||
withMetadataOrientation(-1),
|
withMetadataOrientation(-1),
|
||||||
|
withMetadataDensity(0.0),
|
||||||
convKernelWidth(0),
|
convKernelWidth(0),
|
||||||
convKernelHeight(0),
|
convKernelHeight(0),
|
||||||
convKernelScale(0.0),
|
convKernelScale(0.0),
|
||||||
@@ -258,13 +307,18 @@ struct PipelineBaton {
|
|||||||
bandBoolOp(VIPS_OPERATION_BOOLEAN_LAST),
|
bandBoolOp(VIPS_OPERATION_BOOLEAN_LAST),
|
||||||
extractChannel(-1),
|
extractChannel(-1),
|
||||||
removeAlpha(false),
|
removeAlpha(false),
|
||||||
ensureAlpha(false),
|
ensureAlpha(-1.0),
|
||||||
colourspace(VIPS_INTERPRETATION_LAST),
|
colourspace(VIPS_INTERPRETATION_LAST),
|
||||||
|
pageHeight(0),
|
||||||
|
delay{-1},
|
||||||
|
loop(-1),
|
||||||
tileSize(256),
|
tileSize(256),
|
||||||
tileOverlap(0),
|
tileOverlap(0),
|
||||||
tileContainer(VIPS_FOREIGN_DZ_CONTAINER_FS),
|
tileContainer(VIPS_FOREIGN_DZ_CONTAINER_FS),
|
||||||
tileLayout(VIPS_FOREIGN_DZ_LAYOUT_DZ),
|
tileLayout(VIPS_FOREIGN_DZ_LAYOUT_DZ),
|
||||||
tileAngle(0),
|
tileAngle(0),
|
||||||
|
tileBackground{ 255.0, 255.0, 255.0, 255.0 },
|
||||||
|
tileSkipBlanks(-1),
|
||||||
tileDepth(VIPS_FOREIGN_DZ_DEPTH_LAST) {}
|
tileDepth(VIPS_FOREIGN_DZ_DEPTH_LAST) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
48
src/sharp.cc
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -12,8 +12,7 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// limitations under the License.
|
||||||
|
|
||||||
#include <node.h>
|
#include <napi.h>
|
||||||
#include <nan.h>
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
@@ -22,33 +21,32 @@
|
|||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
#include "stats.h"
|
#include "stats.h"
|
||||||
|
|
||||||
NAN_MODULE_INIT(init) {
|
static void* sharp_vips_init(void*) {
|
||||||
|
g_setenv("VIPS_MIN_STACK_SIZE", "2m", FALSE);
|
||||||
vips_init("sharp");
|
vips_init("sharp");
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
Napi::Object init(Napi::Env env, Napi::Object exports) {
|
||||||
|
static GOnce sharp_vips_init_once = G_ONCE_INIT;
|
||||||
|
g_once(&sharp_vips_init_once, static_cast<GThreadFunc>(sharp_vips_init), nullptr);
|
||||||
|
|
||||||
g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
|
g_log_set_handler("VIPS", static_cast<GLogLevelFlags>(G_LOG_LEVEL_WARNING),
|
||||||
static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);
|
static_cast<GLogFunc>(sharp::VipsWarningCallback), nullptr);
|
||||||
|
|
||||||
// Methods available to JavaScript
|
// Methods available to JavaScript
|
||||||
Nan::Set(target, Nan::New("metadata").ToLocalChecked(),
|
exports.Set("metadata", Napi::Function::New(env, metadata));
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(metadata)).ToLocalChecked());
|
exports.Set("pipeline", Napi::Function::New(env, pipeline));
|
||||||
Nan::Set(target, Nan::New("pipeline").ToLocalChecked(),
|
exports.Set("cache", Napi::Function::New(env, cache));
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(pipeline)).ToLocalChecked());
|
exports.Set("concurrency", Napi::Function::New(env, concurrency));
|
||||||
Nan::Set(target, Nan::New("cache").ToLocalChecked(),
|
exports.Set("counters", Napi::Function::New(env, counters));
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(cache)).ToLocalChecked());
|
exports.Set("simd", Napi::Function::New(env, simd));
|
||||||
Nan::Set(target, Nan::New("concurrency").ToLocalChecked(),
|
exports.Set("libvipsVersion", Napi::Function::New(env, libvipsVersion));
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(concurrency)).ToLocalChecked());
|
exports.Set("format", Napi::Function::New(env, format));
|
||||||
Nan::Set(target, Nan::New("counters").ToLocalChecked(),
|
exports.Set("_maxColourDistance", Napi::Function::New(env, _maxColourDistance));
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(counters)).ToLocalChecked());
|
exports.Set("_isUsingJemalloc", Napi::Function::New(env, _isUsingJemalloc));
|
||||||
Nan::Set(target, Nan::New("simd").ToLocalChecked(),
|
exports.Set("stats", Napi::Function::New(env, stats));
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(simd)).ToLocalChecked());
|
return exports;
|
||||||
Nan::Set(target, Nan::New("libvipsVersion").ToLocalChecked(),
|
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(libvipsVersion)).ToLocalChecked());
|
|
||||||
Nan::Set(target, Nan::New("format").ToLocalChecked(),
|
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(format)).ToLocalChecked());
|
|
||||||
Nan::Set(target, Nan::New("_maxColourDistance").ToLocalChecked(),
|
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(_maxColourDistance)).ToLocalChecked());
|
|
||||||
Nan::Set(target, Nan::New("stats").ToLocalChecked(),
|
|
||||||
Nan::GetFunction(Nan::New<v8::FunctionTemplate>(stats)).ToLocalChecked());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NODE_MODULE(sharp, init)
|
NODE_API_MODULE(sharp, init)
|
||||||
|
|||||||
189
src/stats.cc
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -16,28 +16,16 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
||||||
#include <node.h>
|
#include <napi.h>
|
||||||
#include <nan.h>
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
|
|
||||||
#include "common.h"
|
#include "common.h"
|
||||||
#include "stats.h"
|
#include "stats.h"
|
||||||
|
|
||||||
class StatsWorker : public Nan::AsyncWorker {
|
class StatsWorker : public Napi::AsyncWorker {
|
||||||
public:
|
public:
|
||||||
StatsWorker(
|
StatsWorker(Napi::Function callback, StatsBaton *baton, Napi::Function debuglog) :
|
||||||
Nan::Callback *callback, StatsBaton *baton, Nan::Callback *debuglog,
|
Napi::AsyncWorker(callback), baton(baton), debuglog(Napi::Persistent(debuglog)) {}
|
||||||
std::vector<v8::Local<v8::Object>> const buffersToPersist) :
|
|
||||||
Nan::AsyncWorker(callback, "sharp:StatsWorker"),
|
|
||||||
baton(baton), debuglog(debuglog),
|
|
||||||
buffersToPersist(buffersToPersist) {
|
|
||||||
// Protect Buffer objects from GC, keyed on index
|
|
||||||
std::accumulate(buffersToPersist.begin(), buffersToPersist.end(), 0,
|
|
||||||
[this](uint32_t index, v8::Local<v8::Object> const buffer) -> uint32_t {
|
|
||||||
SaveToPersistent(index, buffer);
|
|
||||||
return index + 1;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
~StatsWorker() {}
|
~StatsWorker() {}
|
||||||
|
|
||||||
const int STAT_MIN_INDEX = 0;
|
const int STAT_MIN_INDEX = 0;
|
||||||
@@ -54,15 +42,11 @@ class StatsWorker : public Nan::AsyncWorker {
|
|||||||
void Execute() {
|
void Execute() {
|
||||||
// Decrement queued task counter
|
// Decrement queued task counter
|
||||||
g_atomic_int_dec_and_test(&sharp::counterQueue);
|
g_atomic_int_dec_and_test(&sharp::counterQueue);
|
||||||
using Nan::New;
|
|
||||||
using Nan::Set;
|
|
||||||
using sharp::MaximumImageAlpha;
|
|
||||||
|
|
||||||
vips::VImage image;
|
vips::VImage image;
|
||||||
sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
|
sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
std::tie(image, imageType) = OpenInput(baton->input, baton->accessMethod);
|
std::tie(image, imageType) = OpenInput(baton->input);
|
||||||
} catch (vips::VError const &err) {
|
} catch (vips::VError const &err) {
|
||||||
(baton->err).append(err.what());
|
(baton->err).append(err.what());
|
||||||
}
|
}
|
||||||
@@ -71,25 +55,51 @@ class StatsWorker : public Nan::AsyncWorker {
|
|||||||
vips::VImage stats = image.stats();
|
vips::VImage stats = image.stats();
|
||||||
int const bands = image.bands();
|
int const bands = image.bands();
|
||||||
for (int b = 1; b <= bands; b++) {
|
for (int b = 1; b <= bands; b++) {
|
||||||
ChannelStats cStats(static_cast<int>(stats.getpoint(STAT_MIN_INDEX, b).front()),
|
ChannelStats cStats(
|
||||||
static_cast<int>(stats.getpoint(STAT_MAX_INDEX, b).front()),
|
static_cast<int>(stats.getpoint(STAT_MIN_INDEX, b).front()),
|
||||||
stats.getpoint(STAT_SUM_INDEX, b).front(), stats.getpoint(STAT_SQ_SUM_INDEX, b).front(),
|
static_cast<int>(stats.getpoint(STAT_MAX_INDEX, b).front()),
|
||||||
stats.getpoint(STAT_MEAN_INDEX, b).front(), stats.getpoint(STAT_STDEV_INDEX, b).front(),
|
stats.getpoint(STAT_SUM_INDEX, b).front(),
|
||||||
static_cast<int>(stats.getpoint(STAT_MINX_INDEX, b).front()),
|
stats.getpoint(STAT_SQ_SUM_INDEX, b).front(),
|
||||||
static_cast<int>(stats.getpoint(STAT_MINY_INDEX, b).front()),
|
stats.getpoint(STAT_MEAN_INDEX, b).front(),
|
||||||
static_cast<int>(stats.getpoint(STAT_MAXX_INDEX, b).front()),
|
stats.getpoint(STAT_STDEV_INDEX, b).front(),
|
||||||
static_cast<int>(stats.getpoint(STAT_MAXY_INDEX, b).front()));
|
static_cast<int>(stats.getpoint(STAT_MINX_INDEX, b).front()),
|
||||||
|
static_cast<int>(stats.getpoint(STAT_MINY_INDEX, b).front()),
|
||||||
|
static_cast<int>(stats.getpoint(STAT_MAXX_INDEX, b).front()),
|
||||||
|
static_cast<int>(stats.getpoint(STAT_MAXY_INDEX, b).front()));
|
||||||
baton->channelStats.push_back(cStats);
|
baton->channelStats.push_back(cStats);
|
||||||
}
|
}
|
||||||
// Image is not opaque when alpha layer is present and contains a non-mamixa value
|
// Image is not opaque when alpha layer is present and contains a non-mamixa value
|
||||||
if (sharp::HasAlpha(image)) {
|
if (sharp::HasAlpha(image)) {
|
||||||
double const minAlpha = static_cast<double>(stats.getpoint(STAT_MIN_INDEX, bands).front());
|
double const minAlpha = static_cast<double>(stats.getpoint(STAT_MIN_INDEX, bands).front());
|
||||||
if (minAlpha != MaximumImageAlpha(image.interpretation())) {
|
if (minAlpha != sharp::MaximumImageAlpha(image.interpretation())) {
|
||||||
baton->isOpaque = false;
|
baton->isOpaque = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Convert to greyscale
|
||||||
|
vips::VImage greyscale = image.colourspace(VIPS_INTERPRETATION_B_W)[0];
|
||||||
// Estimate entropy via histogram of greyscale value frequency
|
// Estimate entropy via histogram of greyscale value frequency
|
||||||
baton->entropy = std::abs(image.colourspace(VIPS_INTERPRETATION_B_W)[0].hist_find().hist_entropy());
|
baton->entropy = std::abs(greyscale.hist_find().hist_entropy());
|
||||||
|
// Estimate sharpness via standard deviation of greyscale laplacian
|
||||||
|
if (image.width() > 1 || image.height() > 1) {
|
||||||
|
VImage laplacian = VImage::new_matrixv(3, 3,
|
||||||
|
0.0, 1.0, 0.0,
|
||||||
|
1.0, -4.0, 1.0,
|
||||||
|
0.0, 1.0, 0.0);
|
||||||
|
laplacian.set("scale", 9.0);
|
||||||
|
baton->sharpness = greyscale.conv(laplacian).deviate();
|
||||||
|
}
|
||||||
|
// Most dominant sRGB colour via 4096-bin 3D histogram
|
||||||
|
vips::VImage hist = sharp::RemoveAlpha(image)
|
||||||
|
.colourspace(VIPS_INTERPRETATION_sRGB)
|
||||||
|
.hist_find_ndim(VImage::option()->set("bins", 16));
|
||||||
|
std::complex<double> maxpos = hist.maxpos();
|
||||||
|
int const dx = static_cast<int>(std::real(maxpos));
|
||||||
|
int const dy = static_cast<int>(std::imag(maxpos));
|
||||||
|
std::vector<double> pel = hist(dx, dy);
|
||||||
|
int const dz = std::distance(pel.begin(), std::find(pel.begin(), pel.end(), hist.max()));
|
||||||
|
baton->dominantRed = dx * 16 + 8;
|
||||||
|
baton->dominantGreen = dy * 16 + 8;
|
||||||
|
baton->dominantBlue = dz * 16 + 8;
|
||||||
} catch (vips::VError const &err) {
|
} catch (vips::VError const &err) {
|
||||||
(baton->err).append(err.what());
|
(baton->err).append(err.what());
|
||||||
}
|
}
|
||||||
@@ -100,93 +110,84 @@ class StatsWorker : public Nan::AsyncWorker {
|
|||||||
vips_thread_shutdown();
|
vips_thread_shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
void HandleOKCallback() {
|
void OnOK() {
|
||||||
using Nan::New;
|
Napi::Env env = Env();
|
||||||
using Nan::Set;
|
Napi::HandleScope scope(env);
|
||||||
Nan::HandleScope();
|
|
||||||
|
|
||||||
v8::Local<v8::Value> argv[2] = { Nan::Null(), Nan::Null() };
|
|
||||||
if (!baton->err.empty()) {
|
|
||||||
argv[0] = Nan::Error(baton->err.data());
|
|
||||||
} else {
|
|
||||||
// Stats Object
|
|
||||||
v8::Local<v8::Object> info = New<v8::Object>();
|
|
||||||
v8::Local<v8::Array> channels = New<v8::Array>();
|
|
||||||
|
|
||||||
std::vector<ChannelStats>::iterator it;
|
|
||||||
int i = 0;
|
|
||||||
for (it=baton->channelStats.begin() ; it < baton->channelStats.end(); it++, i++) {
|
|
||||||
v8::Local<v8::Object> channelStat = New<v8::Object>();
|
|
||||||
Set(channelStat, New("min").ToLocalChecked(), New<v8::Number>(it->min));
|
|
||||||
Set(channelStat, New("max").ToLocalChecked(), New<v8::Number>(it->max));
|
|
||||||
Set(channelStat, New("sum").ToLocalChecked(), New<v8::Number>(it->sum));
|
|
||||||
Set(channelStat, New("squaresSum").ToLocalChecked(), New<v8::Number>(it->squaresSum));
|
|
||||||
Set(channelStat, New("mean").ToLocalChecked(), New<v8::Number>(it->mean));
|
|
||||||
Set(channelStat, New("stdev").ToLocalChecked(), New<v8::Number>(it->stdev));
|
|
||||||
Set(channelStat, New("minX").ToLocalChecked(), New<v8::Number>(it->minX));
|
|
||||||
Set(channelStat, New("minY").ToLocalChecked(), New<v8::Number>(it->minY));
|
|
||||||
Set(channelStat, New("maxX").ToLocalChecked(), New<v8::Number>(it->maxX));
|
|
||||||
Set(channelStat, New("maxY").ToLocalChecked(), New<v8::Number>(it->maxY));
|
|
||||||
channels->Set(i, channelStat);
|
|
||||||
}
|
|
||||||
|
|
||||||
Set(info, New("channels").ToLocalChecked(), channels);
|
|
||||||
Set(info, New("isOpaque").ToLocalChecked(), New<v8::Boolean>(baton->isOpaque));
|
|
||||||
Set(info, New("entropy").ToLocalChecked(), New<v8::Number>(baton->entropy));
|
|
||||||
argv[1] = info;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dispose of Persistent wrapper around input Buffers so they can be garbage collected
|
|
||||||
std::accumulate(buffersToPersist.begin(), buffersToPersist.end(), 0,
|
|
||||||
[this](uint32_t index, v8::Local<v8::Object> const buffer) -> uint32_t {
|
|
||||||
GetFromPersistent(index);
|
|
||||||
return index + 1;
|
|
||||||
});
|
|
||||||
delete baton->input;
|
|
||||||
delete baton;
|
|
||||||
|
|
||||||
// Handle warnings
|
// Handle warnings
|
||||||
std::string warning = sharp::VipsWarningPop();
|
std::string warning = sharp::VipsWarningPop();
|
||||||
while (!warning.empty()) {
|
while (!warning.empty()) {
|
||||||
v8::Local<v8::Value> message[1] = { New(warning).ToLocalChecked() };
|
debuglog.Call({ Napi::String::New(env, warning) });
|
||||||
debuglog->Call(1, message, async_resource);
|
|
||||||
warning = sharp::VipsWarningPop();
|
warning = sharp::VipsWarningPop();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Return to JavaScript
|
if (baton->err.empty()) {
|
||||||
callback->Call(2, argv, async_resource);
|
// Stats Object
|
||||||
|
Napi::Object info = Napi::Object::New(env);
|
||||||
|
Napi::Array channels = Napi::Array::New(env);
|
||||||
|
|
||||||
|
std::vector<ChannelStats>::iterator it;
|
||||||
|
int i = 0;
|
||||||
|
for (it = baton->channelStats.begin(); it < baton->channelStats.end(); it++, i++) {
|
||||||
|
Napi::Object channelStat = Napi::Object::New(env);
|
||||||
|
channelStat.Set("min", it->min);
|
||||||
|
channelStat.Set("max", it->max);
|
||||||
|
channelStat.Set("sum", it->sum);
|
||||||
|
channelStat.Set("squaresSum", it->squaresSum);
|
||||||
|
channelStat.Set("mean", it->mean);
|
||||||
|
channelStat.Set("stdev", it->stdev);
|
||||||
|
channelStat.Set("minX", it->minX);
|
||||||
|
channelStat.Set("minY", it->minY);
|
||||||
|
channelStat.Set("maxX", it->maxX);
|
||||||
|
channelStat.Set("maxY", it->maxY);
|
||||||
|
channels.Set(i, channelStat);
|
||||||
|
}
|
||||||
|
|
||||||
|
info.Set("channels", channels);
|
||||||
|
info.Set("isOpaque", baton->isOpaque);
|
||||||
|
info.Set("entropy", baton->entropy);
|
||||||
|
info.Set("sharpness", baton->sharpness);
|
||||||
|
Napi::Object dominant = Napi::Object::New(env);
|
||||||
|
dominant.Set("r", baton->dominantRed);
|
||||||
|
dominant.Set("g", baton->dominantGreen);
|
||||||
|
dominant.Set("b", baton->dominantBlue);
|
||||||
|
info.Set("dominant", dominant);
|
||||||
|
Callback().MakeCallback(Receiver().Value(), { env.Null(), info });
|
||||||
|
} else {
|
||||||
|
Callback().MakeCallback(Receiver().Value(), { Napi::Error::New(env, baton->err).Value() });
|
||||||
|
}
|
||||||
|
|
||||||
|
delete baton->input;
|
||||||
|
delete baton;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
StatsBaton* baton;
|
StatsBaton* baton;
|
||||||
Nan::Callback *debuglog;
|
Napi::FunctionReference debuglog;
|
||||||
std::vector<v8::Local<v8::Object>> buffersToPersist;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
stats(options, callback)
|
stats(options, callback)
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(stats) {
|
Napi::Value stats(const Napi::CallbackInfo& info) {
|
||||||
using sharp::AttrTo;
|
|
||||||
|
|
||||||
// Input Buffers must not undergo GC compaction during processing
|
|
||||||
std::vector<v8::Local<v8::Object>> buffersToPersist;
|
|
||||||
|
|
||||||
// V8 objects are converted to non-V8 types held in the baton struct
|
// V8 objects are converted to non-V8 types held in the baton struct
|
||||||
StatsBaton *baton = new StatsBaton;
|
StatsBaton *baton = new StatsBaton;
|
||||||
v8::Local<v8::Object> options = info[0].As<v8::Object>();
|
Napi::Object options = info[0].As<Napi::Object>();
|
||||||
|
|
||||||
// Input
|
// Input
|
||||||
baton->input = sharp::CreateInputDescriptor(sharp::AttrAs<v8::Object>(options, "input"), buffersToPersist);
|
baton->input = sharp::CreateInputDescriptor(options.Get("input").As<Napi::Object>());
|
||||||
baton->accessMethod = AttrTo<bool>(options, "sequentialRead") ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
|
|
||||||
|
|
||||||
// Function to notify of libvips warnings
|
// Function to notify of libvips warnings
|
||||||
Nan::Callback *debuglog = new Nan::Callback(sharp::AttrAs<v8::Function>(options, "debuglog"));
|
Napi::Function debuglog = options.Get("debuglog").As<Napi::Function>();
|
||||||
|
|
||||||
// Join queue for worker thread
|
// Join queue for worker thread
|
||||||
Nan::Callback *callback = new Nan::Callback(info[1].As<v8::Function>());
|
Napi::Function callback = info[1].As<Napi::Function>();
|
||||||
Nan::AsyncQueueWorker(new StatsWorker(callback, baton, debuglog, buffersToPersist));
|
StatsWorker *worker = new StatsWorker(callback, baton, debuglog);
|
||||||
|
worker->Receiver().Set("options", options);
|
||||||
|
worker->Queue();
|
||||||
|
|
||||||
// Increment queued task counter
|
// Increment queued task counter
|
||||||
g_atomic_int_inc(&sharp::counterQueue);
|
g_atomic_int_inc(&sharp::counterQueue);
|
||||||
|
|
||||||
|
return info.Env().Undefined();
|
||||||
}
|
}
|
||||||
|
|||||||
25
src/stats.h
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
#define SRC_STATS_H_
|
#define SRC_STATS_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <nan.h>
|
#include <napi.h>
|
||||||
|
|
||||||
#include "./common.h"
|
#include "./common.h"
|
||||||
|
|
||||||
@@ -33,12 +33,8 @@ struct ChannelStats {
|
|||||||
int maxX;
|
int maxX;
|
||||||
int maxY;
|
int maxY;
|
||||||
|
|
||||||
ChannelStats():
|
ChannelStats(int minVal, int maxVal, double sumVal, double squaresSumVal,
|
||||||
min(0), max(0), sum(0), squaresSum(0), mean(0), stdev(0)
|
double meanVal, double stdevVal, int minXVal, int minYVal, int maxXVal, int maxYVal):
|
||||||
, minX(0), minY(0), maxX(0), maxY(0) {}
|
|
||||||
|
|
||||||
ChannelStats(int minVal, int maxVal, double sumVal, double squaresSumVal,
|
|
||||||
double meanVal, double stdevVal, int minXVal, int minYVal, int maxXVal, int maxYVal):
|
|
||||||
min(minVal), max(maxVal), sum(sumVal), squaresSum(squaresSumVal),
|
min(minVal), max(maxVal), sum(sumVal), squaresSum(squaresSumVal),
|
||||||
mean(meanVal), stdev(stdevVal), minX(minXVal), minY(minYVal), maxX(maxXVal), maxY(maxYVal) {}
|
mean(meanVal), stdev(stdevVal), minX(minXVal), minY(minYVal), maxX(maxXVal), maxY(maxYVal) {}
|
||||||
};
|
};
|
||||||
@@ -46,22 +42,29 @@ struct ChannelStats {
|
|||||||
struct StatsBaton {
|
struct StatsBaton {
|
||||||
// Input
|
// Input
|
||||||
sharp::InputDescriptor *input;
|
sharp::InputDescriptor *input;
|
||||||
VipsAccess accessMethod;
|
|
||||||
|
|
||||||
// Output
|
// Output
|
||||||
std::vector<ChannelStats> channelStats;
|
std::vector<ChannelStats> channelStats;
|
||||||
bool isOpaque;
|
bool isOpaque;
|
||||||
double entropy;
|
double entropy;
|
||||||
|
double sharpness;
|
||||||
|
int dominantRed;
|
||||||
|
int dominantGreen;
|
||||||
|
int dominantBlue;
|
||||||
|
|
||||||
std::string err;
|
std::string err;
|
||||||
|
|
||||||
StatsBaton():
|
StatsBaton():
|
||||||
input(nullptr),
|
input(nullptr),
|
||||||
isOpaque(true),
|
isOpaque(true),
|
||||||
entropy(0.0)
|
entropy(0.0),
|
||||||
|
sharpness(0.0),
|
||||||
|
dominantRed(0),
|
||||||
|
dominantGreen(0),
|
||||||
|
dominantBlue(0)
|
||||||
{}
|
{}
|
||||||
};
|
};
|
||||||
|
|
||||||
NAN_METHOD(stats);
|
Napi::Value stats(const Napi::CallbackInfo& info);
|
||||||
|
|
||||||
#endif // SRC_STATS_H_
|
#endif // SRC_STATS_H_
|
||||||
|
|||||||
264
src/utilities.cc
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -15,8 +15,7 @@
|
|||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <node.h>
|
#include <napi.h>
|
||||||
#include <nan.h>
|
|
||||||
#include <vips/vips8>
|
#include <vips/vips8>
|
||||||
#include <vips/vector.h>
|
#include <vips/vector.h>
|
||||||
|
|
||||||
@@ -24,182 +23,145 @@
|
|||||||
#include "operations.h"
|
#include "operations.h"
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
|
|
||||||
using v8::Boolean;
|
|
||||||
using v8::Integer;
|
|
||||||
using v8::Local;
|
|
||||||
using v8::Number;
|
|
||||||
using v8::Object;
|
|
||||||
using v8::String;
|
|
||||||
|
|
||||||
using Nan::HandleScope;
|
|
||||||
using Nan::New;
|
|
||||||
using Nan::Set;
|
|
||||||
using Nan::ThrowError;
|
|
||||||
using Nan::To;
|
|
||||||
using Nan::Utf8String;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get and set cache limits
|
Get and set cache limits
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(cache) {
|
Napi::Value cache(const Napi::CallbackInfo& info) {
|
||||||
HandleScope();
|
Napi::Env env = info.Env();
|
||||||
|
|
||||||
// Set memory limit
|
// Set memory limit
|
||||||
if (info[0]->IsInt32()) {
|
if (info[0].IsNumber()) {
|
||||||
vips_cache_set_max_mem(To<int32_t>(info[0]).FromJust() * 1048576);
|
vips_cache_set_max_mem(info[0].As<Napi::Number>().Int32Value() * 1048576);
|
||||||
}
|
}
|
||||||
// Set file limit
|
// Set file limit
|
||||||
if (info[1]->IsInt32()) {
|
if (info[1].IsNumber()) {
|
||||||
vips_cache_set_max_files(To<int32_t>(info[1]).FromJust());
|
vips_cache_set_max_files(info[1].As<Napi::Number>().Int32Value());
|
||||||
}
|
}
|
||||||
// Set items limit
|
// Set items limit
|
||||||
if (info[2]->IsInt32()) {
|
if (info[2].IsNumber()) {
|
||||||
vips_cache_set_max(To<int32_t>(info[2]).FromJust());
|
vips_cache_set_max(info[2].As<Napi::Number>().Int32Value());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get memory stats
|
// Get memory stats
|
||||||
Local<Object> memory = New<Object>();
|
Napi::Object memory = Napi::Object::New(env);
|
||||||
Set(memory, New("current").ToLocalChecked(),
|
memory.Set("current", round(vips_tracked_get_mem() / 1048576));
|
||||||
New<Integer>(static_cast<int>(round(vips_tracked_get_mem() / 1048576))));
|
memory.Set("high", round(vips_tracked_get_mem_highwater() / 1048576));
|
||||||
Set(memory, New("high").ToLocalChecked(),
|
memory.Set("max", round(vips_cache_get_max_mem() / 1048576));
|
||||||
New<Integer>(static_cast<int>(round(vips_tracked_get_mem_highwater() / 1048576))));
|
|
||||||
Set(memory, New("max").ToLocalChecked(),
|
|
||||||
New<Integer>(static_cast<int>(round(vips_cache_get_max_mem() / 1048576))));
|
|
||||||
// Get file stats
|
// Get file stats
|
||||||
Local<Object> files = New<Object>();
|
Napi::Object files = Napi::Object::New(env);
|
||||||
Set(files, New("current").ToLocalChecked(), New<Integer>(vips_tracked_get_files()));
|
files.Set("current", vips_tracked_get_files());
|
||||||
Set(files, New("max").ToLocalChecked(), New<Integer>(vips_cache_get_max_files()));
|
files.Set("max", vips_cache_get_max_files());
|
||||||
|
|
||||||
// Get item stats
|
// Get item stats
|
||||||
Local<Object> items = New<Object>();
|
Napi::Object items = Napi::Object::New(env);
|
||||||
Set(items, New("current").ToLocalChecked(), New<Integer>(vips_cache_get_size()));
|
items.Set("current", vips_cache_get_size());
|
||||||
Set(items, New("max").ToLocalChecked(), New<Integer>(vips_cache_get_max()));
|
items.Set("max", vips_cache_get_max());
|
||||||
|
|
||||||
Local<Object> cache = New<Object>();
|
Napi::Object cache = Napi::Object::New(env);
|
||||||
Set(cache, New("memory").ToLocalChecked(), memory);
|
cache.Set("memory", memory);
|
||||||
Set(cache, New("files").ToLocalChecked(), files);
|
cache.Set("files", files);
|
||||||
Set(cache, New("items").ToLocalChecked(), items);
|
cache.Set("items", items);
|
||||||
info.GetReturnValue().Set(cache);
|
return cache;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get and set size of thread pool
|
Get and set size of thread pool
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(concurrency) {
|
Napi::Value concurrency(const Napi::CallbackInfo& info) {
|
||||||
HandleScope();
|
|
||||||
|
|
||||||
// Set concurrency
|
// Set concurrency
|
||||||
if (info[0]->IsInt32()) {
|
if (info[0].IsNumber()) {
|
||||||
vips_concurrency_set(To<int32_t>(info[0]).FromJust());
|
vips_concurrency_set(info[0].As<Napi::Number>().Int32Value());
|
||||||
}
|
}
|
||||||
// Get concurrency
|
// Get concurrency
|
||||||
info.GetReturnValue().Set(New<Integer>(vips_concurrency_get()));
|
return Napi::Number::New(info.Env(), vips_concurrency_get());
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get internal counters (queued tasks, processing tasks)
|
Get internal counters (queued tasks, processing tasks)
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(counters) {
|
Napi::Value counters(const Napi::CallbackInfo& info) {
|
||||||
using sharp::counterProcess;
|
Napi::Object counters = Napi::Object::New(info.Env());
|
||||||
using sharp::counterQueue;
|
counters.Set("queue", sharp::counterQueue);
|
||||||
|
counters.Set("process", sharp::counterProcess);
|
||||||
HandleScope();
|
return counters;
|
||||||
Local<Object> counters = New<Object>();
|
|
||||||
Set(counters, New("queue").ToLocalChecked(), New<Integer>(counterQueue));
|
|
||||||
Set(counters, New("process").ToLocalChecked(), New<Integer>(counterProcess));
|
|
||||||
info.GetReturnValue().Set(counters);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get and set use of SIMD vector unit instructions
|
Get and set use of SIMD vector unit instructions
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(simd) {
|
Napi::Value simd(const Napi::CallbackInfo& info) {
|
||||||
HandleScope();
|
|
||||||
|
|
||||||
// Set state
|
// Set state
|
||||||
if (info[0]->IsBoolean()) {
|
if (info[0].IsBoolean()) {
|
||||||
vips_vector_set_enabled(To<bool>(info[0]).FromJust());
|
vips_vector_set_enabled(info[0].As<Napi::Boolean>().Value());
|
||||||
}
|
}
|
||||||
// Get state
|
// Get state
|
||||||
info.GetReturnValue().Set(New<Boolean>(vips_vector_isenabled()));
|
return Napi::Boolean::New(info.Env(), vips_vector_isenabled());
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get libvips version
|
Get libvips version
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(libvipsVersion) {
|
Napi::Value libvipsVersion(const Napi::CallbackInfo& info) {
|
||||||
HandleScope();
|
|
||||||
char version[9];
|
char version[9];
|
||||||
g_snprintf(version, sizeof(version), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
|
g_snprintf(version, sizeof(version), "%d.%d.%d", vips_version(0), vips_version(1), vips_version(2));
|
||||||
info.GetReturnValue().Set(New(version).ToLocalChecked());
|
return Napi::String::New(info.Env(), version);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Get available input/output file/buffer/stream formats
|
Get available input/output file/buffer/stream formats
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(format) {
|
Napi::Value format(const Napi::CallbackInfo& info) {
|
||||||
HandleScope();
|
Napi::Env env = info.Env();
|
||||||
|
Napi::Object format = Napi::Object::New(env);
|
||||||
// Attribute names
|
for (std::string const f : {
|
||||||
Local<String> attrId = New("id").ToLocalChecked();
|
"jpeg", "png", "webp", "tiff", "magick", "openslide", "dz",
|
||||||
Local<String> attrInput = New("input").ToLocalChecked();
|
"ppm", "fits", "gif", "svg", "heif", "pdf", "vips"
|
||||||
Local<String> attrOutput = New("output").ToLocalChecked();
|
|
||||||
Local<String> attrFile = New("file").ToLocalChecked();
|
|
||||||
Local<String> attrBuffer = New("buffer").ToLocalChecked();
|
|
||||||
Local<String> attrStream = New("stream").ToLocalChecked();
|
|
||||||
|
|
||||||
// Which load/save operations are available for each compressed format?
|
|
||||||
Local<Object> format = New<Object>();
|
|
||||||
for (std::string f : {
|
|
||||||
"jpeg", "png", "webp", "tiff", "magick", "openslide", "dz", "ppm", "fits", "gif", "svg", "pdf", "v"
|
|
||||||
}) {
|
}) {
|
||||||
// Input
|
// Input
|
||||||
Local<Boolean> hasInputFile =
|
Napi::Boolean hasInputFile =
|
||||||
New<Boolean>(vips_type_find("VipsOperation", (f + "load").c_str()));
|
Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "load").c_str()));
|
||||||
Local<Boolean> hasInputBuffer =
|
Napi::Boolean hasInputBuffer =
|
||||||
New<Boolean>(vips_type_find("VipsOperation", (f + "load_buffer").c_str()));
|
Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "load_buffer").c_str()));
|
||||||
Local<Object> input = New<Object>();
|
Napi::Object input = Napi::Object::New(env);
|
||||||
Set(input, attrFile, hasInputFile);
|
input.Set("file", hasInputFile);
|
||||||
Set(input, attrBuffer, hasInputBuffer);
|
input.Set("buffer", hasInputBuffer);
|
||||||
Set(input, attrStream, hasInputBuffer);
|
input.Set("stream", hasInputBuffer);
|
||||||
// Output
|
// Output
|
||||||
Local<Boolean> hasOutputFile =
|
Napi::Boolean hasOutputFile =
|
||||||
New<Boolean>(vips_type_find("VipsOperation", (f + "save").c_str()));
|
Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "save").c_str()));
|
||||||
Local<Boolean> hasOutputBuffer =
|
Napi::Boolean hasOutputBuffer =
|
||||||
New<Boolean>(vips_type_find("VipsOperation", (f + "save_buffer").c_str()));
|
Napi::Boolean::New(env, vips_type_find("VipsOperation", (f + "save_buffer").c_str()));
|
||||||
Local<Object> output = New<Object>();
|
Napi::Object output = Napi::Object::New(env);
|
||||||
Set(output, attrFile, hasOutputFile);
|
output.Set("file", hasOutputFile);
|
||||||
Set(output, attrBuffer, hasOutputBuffer);
|
output.Set("buffer", hasOutputBuffer);
|
||||||
Set(output, attrStream, hasOutputBuffer);
|
output.Set("stream", hasOutputBuffer);
|
||||||
// Other attributes
|
// Other attributes
|
||||||
Local<Object> container = New<Object>();
|
Napi::Object container = Napi::Object::New(env);
|
||||||
Local<String> formatId = New(f).ToLocalChecked();
|
container.Set("id", f);
|
||||||
Set(container, attrId, formatId);
|
container.Set("input", input);
|
||||||
Set(container, attrInput, input);
|
container.Set("output", output);
|
||||||
Set(container, attrOutput, output);
|
|
||||||
// Add to set of formats
|
// Add to set of formats
|
||||||
Set(format, formatId, container);
|
format.Set(f, container);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Raw, uncompressed data
|
// Raw, uncompressed data
|
||||||
Local<Object> raw = New<Object>();
|
Napi::Boolean supported = Napi::Boolean::New(env, true);
|
||||||
Local<String> rawId = New("raw").ToLocalChecked();
|
Napi::Boolean unsupported = Napi::Boolean::New(env, false);
|
||||||
Set(raw, attrId, rawId);
|
Napi::Object rawInput = Napi::Object::New(env);
|
||||||
Set(format, rawId, raw);
|
rawInput.Set("file", unsupported);
|
||||||
Local<Boolean> supported = New<Boolean>(true);
|
rawInput.Set("buffer", supported);
|
||||||
Local<Boolean> unsupported = New<Boolean>(false);
|
rawInput.Set("stream", supported);
|
||||||
Local<Object> rawInput = New<Object>();
|
Napi::Object rawOutput = Napi::Object::New(env);
|
||||||
Set(rawInput, attrFile, unsupported);
|
rawOutput.Set("file", unsupported);
|
||||||
Set(rawInput, attrBuffer, supported);
|
rawOutput.Set("buffer", supported);
|
||||||
Set(rawInput, attrStream, supported);
|
rawOutput.Set("stream", supported);
|
||||||
Set(raw, attrInput, rawInput);
|
Napi::Object raw = Napi::Object::New(env);
|
||||||
Local<Object> rawOutput = New<Object>();
|
raw.Set("id", "raw");
|
||||||
Set(rawOutput, attrFile, unsupported);
|
raw.Set("input", rawInput);
|
||||||
Set(rawOutput, attrBuffer, supported);
|
raw.Set("output", rawOutput);
|
||||||
Set(rawOutput, attrStream, supported);
|
format.Set("raw", raw);
|
||||||
Set(raw, attrOutput, rawOutput);
|
|
||||||
|
|
||||||
info.GetReturnValue().Set(format);
|
return format;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -207,65 +169,75 @@ NAN_METHOD(format) {
|
|||||||
Calculates the maximum colour distance using the DE2000 algorithm
|
Calculates the maximum colour distance using the DE2000 algorithm
|
||||||
between two images of the same dimensions and number of channels.
|
between two images of the same dimensions and number of channels.
|
||||||
*/
|
*/
|
||||||
NAN_METHOD(_maxColourDistance) {
|
Napi::Value _maxColourDistance(const Napi::CallbackInfo& info) {
|
||||||
using vips::VImage;
|
Napi::Env env = info.Env();
|
||||||
using vips::VError;
|
|
||||||
using sharp::DetermineImageType;
|
|
||||||
using sharp::ImageType;
|
|
||||||
using sharp::HasAlpha;
|
|
||||||
|
|
||||||
HandleScope();
|
|
||||||
|
|
||||||
// Open input files
|
// Open input files
|
||||||
VImage image1;
|
VImage image1;
|
||||||
ImageType imageType1 = DetermineImageType(*Utf8String(info[0]));
|
sharp::ImageType imageType1 = sharp::DetermineImageType(info[0].As<Napi::String>().Utf8Value().data());
|
||||||
if (imageType1 != ImageType::UNKNOWN) {
|
if (imageType1 != sharp::ImageType::UNKNOWN) {
|
||||||
try {
|
try {
|
||||||
image1 = VImage::new_from_file(*Utf8String(info[0]));
|
image1 = VImage::new_from_file(info[0].As<Napi::String>().Utf8Value().c_str());
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
return ThrowError("Input file 1 has corrupt header");
|
throw Napi::Error::New(env, "Input file 1 has corrupt header");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return ThrowError("Input file 1 is of an unsupported image format");
|
throw Napi::Error::New(env, "Input file 1 is of an unsupported image format");
|
||||||
}
|
}
|
||||||
VImage image2;
|
VImage image2;
|
||||||
ImageType imageType2 = DetermineImageType(*Utf8String(info[1]));
|
sharp::ImageType imageType2 = sharp::DetermineImageType(info[1].As<Napi::String>().Utf8Value().data());
|
||||||
if (imageType2 != ImageType::UNKNOWN) {
|
if (imageType2 != sharp::ImageType::UNKNOWN) {
|
||||||
try {
|
try {
|
||||||
image2 = VImage::new_from_file(*Utf8String(info[1]));
|
image2 = VImage::new_from_file(info[1].As<Napi::String>().Utf8Value().c_str());
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
return ThrowError("Input file 2 has corrupt header");
|
throw Napi::Error::New(env, "Input file 2 has corrupt header");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return ThrowError("Input file 2 is of an unsupported image format");
|
throw Napi::Error::New(env, "Input file 2 is of an unsupported image format");
|
||||||
}
|
}
|
||||||
// Ensure same number of channels
|
// Ensure same number of channels
|
||||||
if (image1.bands() != image2.bands()) {
|
if (image1.bands() != image2.bands()) {
|
||||||
return ThrowError("mismatchedBands");
|
throw Napi::Error::New(env, "mismatchedBands");
|
||||||
}
|
}
|
||||||
// Ensure same dimensions
|
// Ensure same dimensions
|
||||||
if (image1.width() != image2.width() || image1.height() != image2.height()) {
|
if (image1.width() != image2.width() || image1.height() != image2.height()) {
|
||||||
return ThrowError("mismatchedDimensions");
|
throw Napi::Error::New(env, "mismatchedDimensions");
|
||||||
}
|
}
|
||||||
|
|
||||||
double maxColourDistance;
|
double maxColourDistance;
|
||||||
try {
|
try {
|
||||||
// Premultiply and remove alpha
|
// Premultiply and remove alpha
|
||||||
if (HasAlpha(image1)) {
|
if (sharp::HasAlpha(image1)) {
|
||||||
image1 = image1.premultiply().extract_band(1, VImage::option()->set("n", image1.bands() - 1));
|
image1 = image1.premultiply().extract_band(1, VImage::option()->set("n", image1.bands() - 1));
|
||||||
}
|
}
|
||||||
if (HasAlpha(image2)) {
|
if (sharp::HasAlpha(image2)) {
|
||||||
image2 = image2.premultiply().extract_band(1, VImage::option()->set("n", image2.bands() - 1));
|
image2 = image2.premultiply().extract_band(1, VImage::option()->set("n", image2.bands() - 1));
|
||||||
}
|
}
|
||||||
// Calculate colour distance
|
// Calculate colour distance
|
||||||
maxColourDistance = image1.dE00(image2).max();
|
maxColourDistance = image1.dE00(image2).max();
|
||||||
} catch (VError const &err) {
|
} catch (vips::VError const &err) {
|
||||||
return ThrowError(err.what());
|
throw Napi::Error::New(env, err.what());
|
||||||
}
|
}
|
||||||
|
|
||||||
// Clean up libvips' per-request data and threads
|
// Clean up libvips' per-request data and threads
|
||||||
vips_error_clear();
|
vips_error_clear();
|
||||||
vips_thread_shutdown();
|
vips_thread_shutdown();
|
||||||
|
|
||||||
info.GetReturnValue().Set(New<Number>(maxColourDistance));
|
return Napi::Number::New(env, maxColourDistance);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(__GNUC__)
|
||||||
|
// mallctl will be resolved by the runtime linker when jemalloc is being used
|
||||||
|
extern "C" {
|
||||||
|
int mallctl(const char *name, void *oldp, size_t *oldlenp, void *newp, size_t newlen) __attribute__((weak));
|
||||||
|
}
|
||||||
|
Napi::Value _isUsingJemalloc(const Napi::CallbackInfo& info) {
|
||||||
|
Napi::Env env = info.Env();
|
||||||
|
return Napi::Boolean::New(env, mallctl != nullptr);
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
Napi::Value _isUsingJemalloc(const Napi::CallbackInfo& info) {
|
||||||
|
Napi::Env env = info.Env();
|
||||||
|
return Napi::Boolean::New(env, false);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019 Lovell Fuller and contributors.
|
// Copyright 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Lovell Fuller and contributors.
|
||||||
//
|
//
|
||||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
// you may not use this file except in compliance with the License.
|
// you may not use this file except in compliance with the License.
|
||||||
@@ -15,14 +15,15 @@
|
|||||||
#ifndef SRC_UTILITIES_H_
|
#ifndef SRC_UTILITIES_H_
|
||||||
#define SRC_UTILITIES_H_
|
#define SRC_UTILITIES_H_
|
||||||
|
|
||||||
#include <nan.h>
|
#include <napi.h>
|
||||||
|
|
||||||
NAN_METHOD(cache);
|
Napi::Value cache(const Napi::CallbackInfo& info);
|
||||||
NAN_METHOD(concurrency);
|
Napi::Value concurrency(const Napi::CallbackInfo& info);
|
||||||
NAN_METHOD(counters);
|
Napi::Value counters(const Napi::CallbackInfo& info);
|
||||||
NAN_METHOD(simd);
|
Napi::Value simd(const Napi::CallbackInfo& info);
|
||||||
NAN_METHOD(libvipsVersion);
|
Napi::Value libvipsVersion(const Napi::CallbackInfo& info);
|
||||||
NAN_METHOD(format);
|
Napi::Value format(const Napi::CallbackInfo& info);
|
||||||
NAN_METHOD(_maxColourDistance);
|
Napi::Value _maxColourDistance(const Napi::CallbackInfo& info);
|
||||||
|
Napi::Value _isUsingJemalloc(const Napi::CallbackInfo& info);
|
||||||
|
|
||||||
#endif // SRC_UTILITIES_H_
|
#endif // SRC_UTILITIES_H_
|
||||||
|
|||||||
@@ -8,17 +8,16 @@
|
|||||||
"test": "node perf && node random && node parallel"
|
"test": "node perf && node random && node parallel"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"async": "^2.6.1",
|
"async": "3.2.0",
|
||||||
"benchmark": "^2.1.4",
|
"benchmark": "2.1.4",
|
||||||
"gm": "^1.23.1",
|
"gm": "1.23.1",
|
||||||
"imagemagick": "^0.1.3",
|
"imagemagick": "0.1.3",
|
||||||
"imagemagick-native": "^1.9.3",
|
"jimp": "0.16.1",
|
||||||
"jimp": "^0.5.3",
|
"mapnik": "4.5.6",
|
||||||
"mapnik": "^4.0.1",
|
"semver": "7.3.4"
|
||||||
"semver": "^5.5.1"
|
|
||||||
},
|
},
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=6"
|
"node": "14"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
|
const os = require('os');
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
||||||
const async = require('async');
|
const async = require('async');
|
||||||
@@ -12,23 +13,24 @@ const gm = require('gm');
|
|||||||
const imagemagick = require('imagemagick');
|
const imagemagick = require('imagemagick');
|
||||||
const mapnik = require('mapnik');
|
const mapnik = require('mapnik');
|
||||||
const jimp = require('jimp');
|
const jimp = require('jimp');
|
||||||
let imagemagickNative;
|
|
||||||
try {
|
|
||||||
imagemagickNative = require('imagemagick-native');
|
|
||||||
} catch (err) {
|
|
||||||
console.log('Excluding imagemagick-native');
|
|
||||||
}
|
|
||||||
|
|
||||||
const fixtures = require('../fixtures');
|
const fixtures = require('../fixtures');
|
||||||
|
|
||||||
|
const outputJpg = fixtures.path('output.jpg');
|
||||||
|
const outputPng = fixtures.path('output.png');
|
||||||
|
const outputWebP = fixtures.path('output.webp');
|
||||||
|
|
||||||
const width = 720;
|
const width = 720;
|
||||||
const height = 588;
|
const height = 588;
|
||||||
|
|
||||||
// Disable libvips cache to ensure tests are as fair as they can be
|
// Disable libvips cache to ensure tests are as fair as they can be
|
||||||
sharp.cache(false);
|
sharp.cache(false);
|
||||||
|
|
||||||
|
// Spawn one thread per CPU
|
||||||
|
sharp.concurrency(os.cpus().length);
|
||||||
|
|
||||||
async.series({
|
async.series({
|
||||||
'jpeg': function (callback) {
|
jpeg: function (callback) {
|
||||||
const inputJpgBuffer = fs.readFileSync(fixtures.inputJpg);
|
const inputJpgBuffer = fs.readFileSync(fixtures.inputJpg);
|
||||||
const jpegSuite = new Benchmark.Suite('jpeg');
|
const jpegSuite = new Benchmark.Suite('jpeg');
|
||||||
// jimp
|
// jimp
|
||||||
@@ -62,7 +64,7 @@ async.series({
|
|||||||
image
|
image
|
||||||
.resize(width, height, jimp.RESIZE_BICUBIC)
|
.resize(width, height, jimp.RESIZE_BICUBIC)
|
||||||
.quality(80)
|
.quality(80)
|
||||||
.write(fixtures.outputJpg, function (err) {
|
.write(outputJpg, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -83,7 +85,7 @@ async.series({
|
|||||||
.resize(width, height, {
|
.resize(width, height, {
|
||||||
scaling_method: mapnik.imageScaling.lanczos
|
scaling_method: mapnik.imageScaling.lanczos
|
||||||
})
|
})
|
||||||
.save(fixtures.outputJpg, 'jpeg:quality=80', function (err) {
|
.save(outputJpg, 'jpeg:quality=80', function (err) {
|
||||||
if (err) throw err;
|
if (err) throw err;
|
||||||
deferred.resolve();
|
deferred.resolve();
|
||||||
});
|
});
|
||||||
@@ -111,7 +113,7 @@ async.series({
|
|||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
imagemagick.resize({
|
imagemagick.resize({
|
||||||
srcPath: fixtures.inputJpg,
|
srcPath: fixtures.inputJpg,
|
||||||
dstPath: fixtures.outputJpg,
|
dstPath: outputJpg,
|
||||||
quality: 0.8,
|
quality: 0.8,
|
||||||
width: width,
|
width: width,
|
||||||
height: height,
|
height: height,
|
||||||
@@ -126,29 +128,6 @@ async.series({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// imagemagick-native
|
|
||||||
if (typeof imagemagickNative !== 'undefined') {
|
|
||||||
jpegSuite.add('imagemagick-native-buffer-buffer', {
|
|
||||||
defer: true,
|
|
||||||
fn: function (deferred) {
|
|
||||||
imagemagickNative.convert({
|
|
||||||
srcData: inputJpgBuffer,
|
|
||||||
quality: 80,
|
|
||||||
width: width,
|
|
||||||
height: height,
|
|
||||||
format: 'JPEG',
|
|
||||||
filter: 'Lanczos'
|
|
||||||
}, function (err, buffer) {
|
|
||||||
if (err) {
|
|
||||||
throw err;
|
|
||||||
} else {
|
|
||||||
assert.notStrictEqual(null, buffer);
|
|
||||||
deferred.resolve();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// gm
|
// gm
|
||||||
jpegSuite.add('gm-buffer-file', {
|
jpegSuite.add('gm-buffer-file', {
|
||||||
defer: true,
|
defer: true,
|
||||||
@@ -157,7 +136,7 @@ async.series({
|
|||||||
.filter('Lanczos')
|
.filter('Lanczos')
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.quality(80)
|
.quality(80)
|
||||||
.write(fixtures.outputJpg, function (err) {
|
.write(outputJpg, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -188,7 +167,7 @@ async.series({
|
|||||||
.filter('Lanczos')
|
.filter('Lanczos')
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.quality(80)
|
.quality(80)
|
||||||
.write(fixtures.outputJpg, function (err) {
|
.write(outputJpg, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -219,7 +198,7 @@ async.series({
|
|||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputJpgBuffer)
|
sharp(inputJpgBuffer)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toFile(fixtures.outputJpg, function (err) {
|
.toFile(outputJpg, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -246,7 +225,7 @@ async.series({
|
|||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(fixtures.inputJpg)
|
sharp(fixtures.inputJpg)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toFile(fixtures.outputJpg, function (err) {
|
.toFile(outputJpg, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -258,7 +237,7 @@ async.series({
|
|||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
const readable = fs.createReadStream(fixtures.inputJpg);
|
const readable = fs.createReadStream(fixtures.inputJpg);
|
||||||
const writable = fs.createWriteStream(fixtures.outputJpg);
|
const writable = fs.createWriteStream(outputJpg);
|
||||||
writable.on('finish', function () {
|
writable.on('finish', function () {
|
||||||
deferred.resolve();
|
deferred.resolve();
|
||||||
});
|
});
|
||||||
@@ -289,6 +268,9 @@ async.series({
|
|||||||
.then(function (buffer) {
|
.then(function (buffer) {
|
||||||
assert.notStrictEqual(null, buffer);
|
assert.notStrictEqual(null, buffer);
|
||||||
deferred.resolve();
|
deferred.resolve();
|
||||||
|
})
|
||||||
|
.catch(function (err) {
|
||||||
|
throw err;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}).on('cycle', function (event) {
|
}).on('cycle', function (event) {
|
||||||
@@ -486,8 +468,7 @@ async.series({
|
|||||||
}).add('sharp-sequentialRead', {
|
}).add('sharp-sequentialRead', {
|
||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputJpgBuffer)
|
sharp(inputJpgBuffer, { sequentialRead: true })
|
||||||
.sequentialRead()
|
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toBuffer(function (err, buffer) {
|
.toBuffer(function (err, buffer) {
|
||||||
if (err) {
|
if (err) {
|
||||||
@@ -591,8 +572,9 @@ async.series({
|
|||||||
},
|
},
|
||||||
// PNG
|
// PNG
|
||||||
png: function (callback) {
|
png: function (callback) {
|
||||||
const inputPngBuffer = fs.readFileSync(fixtures.inputPng);
|
const inputPngBuffer = fs.readFileSync(fixtures.inputPngAlphaPremultiplicationLarge);
|
||||||
const pngSuite = new Benchmark.Suite('png');
|
const pngSuite = new Benchmark.Suite('png');
|
||||||
|
const minSamples = 64;
|
||||||
// jimp
|
// jimp
|
||||||
pngSuite.add('jimp-buffer-buffer', {
|
pngSuite.add('jimp-buffer-buffer', {
|
||||||
defer: true,
|
defer: true,
|
||||||
@@ -603,6 +585,8 @@ async.series({
|
|||||||
} else {
|
} else {
|
||||||
image
|
image
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
|
.deflateLevel(6)
|
||||||
|
.filterType(0)
|
||||||
.getBuffer(jimp.MIME_PNG, function (err) {
|
.getBuffer(jimp.MIME_PNG, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -616,13 +600,15 @@ async.series({
|
|||||||
}).add('jimp-file-file', {
|
}).add('jimp-file-file', {
|
||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
jimp.read(fixtures.inputPng, function (err, image) {
|
jimp.read(fixtures.inputPngAlphaPremultiplicationLarge, function (err, image) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
image
|
image
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.write(fixtures.outputPng, function (err) {
|
.deflateLevel(6)
|
||||||
|
.filterType(0)
|
||||||
|
.write(outputPng, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -637,7 +623,7 @@ async.series({
|
|||||||
pngSuite.add('mapnik-file-file', {
|
pngSuite.add('mapnik-file-file', {
|
||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
mapnik.Image.open(fixtures.inputPng, function (err, img) {
|
mapnik.Image.open(fixtures.inputPngAlphaPremultiplicationLarge, function (err, img) {
|
||||||
if (err) throw err;
|
if (err) throw err;
|
||||||
img.premultiply(function (err, img) {
|
img.premultiply(function (err, img) {
|
||||||
if (err) throw err;
|
if (err) throw err;
|
||||||
@@ -647,7 +633,7 @@ async.series({
|
|||||||
if (err) throw err;
|
if (err) throw err;
|
||||||
img.demultiply(function (err, img) {
|
img.demultiply(function (err, img) {
|
||||||
if (err) throw err;
|
if (err) throw err;
|
||||||
img.save(fixtures.outputPng, 'png', function (err) {
|
img.save(outputPng, 'png', function (err) {
|
||||||
if (err) throw err;
|
if (err) throw err;
|
||||||
deferred.resolve();
|
deferred.resolve();
|
||||||
});
|
});
|
||||||
@@ -684,11 +670,15 @@ async.series({
|
|||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
imagemagick.resize({
|
imagemagick.resize({
|
||||||
srcPath: fixtures.inputPng,
|
srcPath: fixtures.inputPngAlphaPremultiplicationLarge,
|
||||||
dstPath: fixtures.outputPng,
|
dstPath: outputPng,
|
||||||
width: width,
|
width: width,
|
||||||
height: height,
|
height: height,
|
||||||
filter: 'Lanczos'
|
filter: 'Lanczos',
|
||||||
|
customArgs: [
|
||||||
|
'-define', 'PNG:compression-level=6',
|
||||||
|
'-define', 'PNG:compression-filter=0'
|
||||||
|
]
|
||||||
}, function (err) {
|
}, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -698,30 +688,16 @@ async.series({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// imagemagick-native
|
|
||||||
if (typeof imagemagickNative !== 'undefined') {
|
|
||||||
pngSuite.add('imagemagick-native-buffer-buffer', {
|
|
||||||
defer: true,
|
|
||||||
fn: function (deferred) {
|
|
||||||
imagemagickNative.convert({
|
|
||||||
srcData: inputPngBuffer,
|
|
||||||
width: width,
|
|
||||||
height: height,
|
|
||||||
format: 'PNG',
|
|
||||||
filter: 'Lanczos'
|
|
||||||
});
|
|
||||||
deferred.resolve();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
// gm
|
// gm
|
||||||
pngSuite.add('gm-file-file', {
|
pngSuite.add('gm-file-file', {
|
||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
gm(fixtures.inputPng)
|
gm(fixtures.inputPngAlphaPremultiplicationLarge)
|
||||||
.filter('Lanczos')
|
.filter('Lanczos')
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.write(fixtures.outputPng, function (err) {
|
.define('PNG:compression-level=6')
|
||||||
|
.define('PNG:compression-filter=0')
|
||||||
|
.write(outputPng, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -732,9 +708,11 @@ async.series({
|
|||||||
}).add('gm-file-buffer', {
|
}).add('gm-file-buffer', {
|
||||||
defer: true,
|
defer: true,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
gm(fixtures.inputPng)
|
gm(fixtures.inputPngAlphaPremultiplicationLarge)
|
||||||
.filter('Lanczos')
|
.filter('Lanczos')
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
|
.define('PNG:compression-level=6')
|
||||||
|
.define('PNG:compression-filter=0')
|
||||||
.toBuffer(function (err, buffer) {
|
.toBuffer(function (err, buffer) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -748,10 +726,12 @@ async.series({
|
|||||||
// sharp
|
// sharp
|
||||||
pngSuite.add('sharp-buffer-file', {
|
pngSuite.add('sharp-buffer-file', {
|
||||||
defer: true,
|
defer: true,
|
||||||
|
minSamples,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputPngBuffer)
|
sharp(inputPngBuffer)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toFile(fixtures.outputPng, function (err) {
|
.png({ compressionLevel: 6 })
|
||||||
|
.toFile(outputPng, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -761,9 +741,11 @@ async.series({
|
|||||||
}
|
}
|
||||||
}).add('sharp-buffer-buffer', {
|
}).add('sharp-buffer-buffer', {
|
||||||
defer: true,
|
defer: true,
|
||||||
|
minSamples,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputPngBuffer)
|
sharp(inputPngBuffer)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
|
.png({ compressionLevel: 6 })
|
||||||
.toBuffer(function (err, buffer) {
|
.toBuffer(function (err, buffer) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -775,10 +757,12 @@ async.series({
|
|||||||
}
|
}
|
||||||
}).add('sharp-file-file', {
|
}).add('sharp-file-file', {
|
||||||
defer: true,
|
defer: true,
|
||||||
|
minSamples,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(fixtures.inputPng)
|
sharp(fixtures.inputPngAlphaPremultiplicationLarge)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toFile(fixtures.outputPng, function (err) {
|
.png({ compressionLevel: 6 })
|
||||||
|
.toFile(outputPng, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -788,9 +772,11 @@ async.series({
|
|||||||
}
|
}
|
||||||
}).add('sharp-file-buffer', {
|
}).add('sharp-file-buffer', {
|
||||||
defer: true,
|
defer: true,
|
||||||
|
minSamples,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(fixtures.inputPng)
|
sharp(fixtures.inputPngAlphaPremultiplicationLarge)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
|
.png({ compressionLevel: 6 })
|
||||||
.toBuffer(function (err, buffer) {
|
.toBuffer(function (err, buffer) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -802,10 +788,11 @@ async.series({
|
|||||||
}
|
}
|
||||||
}).add('sharp-progressive', {
|
}).add('sharp-progressive', {
|
||||||
defer: true,
|
defer: true,
|
||||||
|
minSamples,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputPngBuffer)
|
sharp(inputPngBuffer)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.png({ progressive: true })
|
.png({ compressionLevel: 6, progressive: true })
|
||||||
.toBuffer(function (err, buffer) {
|
.toBuffer(function (err, buffer) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -817,10 +804,27 @@ async.series({
|
|||||||
}
|
}
|
||||||
}).add('sharp-adaptiveFiltering', {
|
}).add('sharp-adaptiveFiltering', {
|
||||||
defer: true,
|
defer: true,
|
||||||
|
minSamples,
|
||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputPngBuffer)
|
sharp(inputPngBuffer)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.png({ adaptiveFiltering: true })
|
.png({ adaptiveFiltering: true, compressionLevel: 6 })
|
||||||
|
.toBuffer(function (err, buffer) {
|
||||||
|
if (err) {
|
||||||
|
throw err;
|
||||||
|
} else {
|
||||||
|
assert.notStrictEqual(null, buffer);
|
||||||
|
deferred.resolve();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}).add('sharp-compressionLevel=9', {
|
||||||
|
defer: true,
|
||||||
|
minSamples,
|
||||||
|
fn: function (deferred) {
|
||||||
|
sharp(inputPngBuffer)
|
||||||
|
.resize(width, height)
|
||||||
|
.png({ compressionLevel: 9 })
|
||||||
.toBuffer(function (err, buffer) {
|
.toBuffer(function (err, buffer) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
@@ -845,7 +849,7 @@ async.series({
|
|||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(inputWebPBuffer)
|
sharp(inputWebPBuffer)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toFile(fixtures.outputWebP, function (err) {
|
.toFile(outputWebP, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
@@ -872,7 +876,7 @@ async.series({
|
|||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
sharp(fixtures.inputWebP)
|
sharp(fixtures.inputWebP)
|
||||||
.resize(width, height)
|
.resize(width, height)
|
||||||
.toFile(fixtures.outputWebP, function (err) {
|
.toFile(outputWebP, function (err) {
|
||||||
if (err) {
|
if (err) {
|
||||||
throw err;
|
throw err;
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ new Benchmark.Suite('random').add('imagemagick', {
|
|||||||
fn: function (deferred) {
|
fn: function (deferred) {
|
||||||
imagemagick.resize({
|
imagemagick.resize({
|
||||||
srcPath: fixtures.inputJpg,
|
srcPath: fixtures.inputJpg,
|
||||||
dstPath: fixtures.outputJpg,
|
dstPath: fixtures.path('output.jpg'),
|
||||||
quality: 0.8,
|
quality: 0.8,
|
||||||
width: randomDimension(),
|
width: randomDimension(),
|
||||||
height: randomDimension(),
|
height: randomDimension(),
|
||||||
|
|||||||
BIN
test/fixtures/16-bit-grey-alpha.png
vendored
Normal file
|
After Width: | Height: | Size: 14 KiB |
BIN
test/fixtures/alpha-layer-1-fill-low-alpha.png
vendored
|
Before Width: | Height: | Size: 222 KiB |
BIN
test/fixtures/alpha-layer-2-ink-low-alpha.png
vendored
|
Before Width: | Height: | Size: 89 KiB |
BIN
test/fixtures/alpha-layer-2-ink.png
vendored
|
Before Width: | Height: | Size: 80 KiB |
BIN
test/fixtures/animated-loop-3.gif
vendored
Normal file
|
After Width: | Height: | Size: 7.6 KiB |
BIN
test/fixtures/animated-loop-3.webp
vendored
Normal file
|
After Width: | Height: | Size: 8.2 KiB |
BIN
test/fixtures/big-height.webp
vendored
Normal file
|
After Width: | Height: | Size: 7.1 KiB |
3
test/fixtures/circle.svg
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 8">
|
||||||
|
<circle r="3.75" cx="4" cy="4" fill="deeppink" />
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 122 B |
BIN
test/fixtures/concert.jpg
vendored
Normal file
|
After Width: | Height: | Size: 24 KiB |
BIN
test/fixtures/expected/16-bit-grey-alpha-identity.png
vendored
Normal file
|
After Width: | Height: | Size: 4.7 KiB |
BIN
test/fixtures/expected/affine-background-all-offsets-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 36 KiB |
BIN
test/fixtures/expected/affine-background-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 26 KiB |
BIN
test/fixtures/expected/affine-background-output-offsets-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 78 KiB |
BIN
test/fixtures/expected/affine-bicubic-2x-upscale-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 57 KiB |
BIN
test/fixtures/expected/affine-bilinear-2x-upscale-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
test/fixtures/expected/affine-extract-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 8.0 KiB |
BIN
test/fixtures/expected/affine-extract-rotate-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 38 KiB |
BIN
test/fixtures/expected/affine-lbb-2x-upscale-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 57 KiB |
BIN
test/fixtures/expected/affine-nearest-2x-upscale-expected.jpg
vendored
Normal file
|
After Width: | Height: | Size: 64 KiB |