Browse Source

Update changelog & docs

DarthSim 3 years ago
parent
commit
ce73e0935c
2 changed files with 18 additions and 0 deletions
  1. 1 0
      CHANGELOG.md
  2. 17 0
      docs/generating_the_url.md

+ 1 - 0
CHANGELOG.md

@@ -3,6 +3,7 @@
 ## [Unreleased]
 ### Add
 - Add `IMGPROXY_FALLBACK_IMAGE_TTL` config.
+- Add [watermark_size](https://docs.imgproxy.net/generating_the_url?id=watermark-size) processing option.
 
 ### Change
 - (pro) Don't check `Content-Length` header of videos.

+ 17 - 0
docs/generating_the_url.md

@@ -465,6 +465,23 @@ If you want to use a custom font, you need to put it in `/usr/share/fonts` insid
 
 Default: blank
 
+### Watermark Size<i class='badge badge-pro'></i> :id=watermark-size
+
+```
+watermark_size:%width:%height
+wms:%width:%height
+```
+
+Defines the desired width and height of the watermark. imgproxy always uses `fit` resizing type when resizing watermarks and enlarges them when needed.
+
+When `%width` is set to `0`, imgproxy will calculate the width using the defined height and watermark's aspect ratio.
+
+When `%height` is set to `0`, imgproxy will calculate the height using the defined width and watermark's aspect ratio.
+
+**📝Note:** This processing option takes effect only when the `scale` argument of the `watermark` option is set to zero.
+
+Default: `0:0`
+
 ### Style<i class='badge badge-pro'></i> :id=style
 
 ```