Merge pull request #16659 from niden-code/T16658-watermark

T16658 watermark
phalcon · Oct 20, 2024 · 738cbdf · 738cbdf
2 parents 04edb15 + 5e1b704
commit 738cbdf
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 78 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -101,8 +101,8 @@ jobs:
         include:
           # Linux
           - { name: ubuntu-gcc, os: ubuntu-20.04, compiler: gcc }
-          # macOS
-          - { name: macos-clang, os: macos-12, compiler: clang }
+#          # macOS
+#          - { name: macos-clang, os: macos-latest, compiler: clang }
           # Windows
           - { php: '8.0', ts: 'ts',  arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }
           - { php: '8.0', ts: 'nts', arch: 'x64', name: 'windows2019-vs16', os: 'windows-2019', compiler: 'vs16' }

diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -13,6 +13,7 @@
 
 - Fixed `Phalcon\Encryption\Crypt` to use `strlen` instead of `mb_strlen` for padding calculations [#16642](https://github.com/phalcon/cphalcon/issues/16642)
 - Fixed `Phalcon\Filter\Validation\Validator\File\MimeType::validate` to close the handle when using `finfo` [#16647](https://github.com/phalcon/cphalcon/issues/16647)
+- Fixed `Phalcon\Image\Adapters\AbstractAdapter::watermark` to correctly calculate the Y offset [#16658](https://github.com/phalcon/cphalcon/issues/16658)
 
 ### Removed