Skip to content

cxx/embed.cc: support 16-bit, float, grey, CMYK and alpha in watermarking #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tim-janik wants to merge 4 commits into from
Closed

cxx/embed.cc: support 16-bit, float, grey, CMYK and alpha in watermarking #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f0c7ecf
Dockerfile.alpine: add exiftool and vips-tools dependencies
tim-janik Aug 28, 2026
4971eb9
cxx/embed.cc: support 16-bit, float, grey, CMYK and alpha in watermar…
tim-janik Aug 28, 2026
f574a26
tests/formats: add pixel format, alpha, CMYK and metadata checks
tim-janik Aug 28, 2026
c6afe25
tests/formats, NEWS: address review nits
tim-janik Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/Dockerfile.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ RUN \
apk update

RUN : \
&& apk add --no-cache sudo git alpine-sdk sed bash openimageio-dev opencv-dev vips-dev imagemagick ghostscript-fonts rsvg-convert \
pandoc build-base libffi-dev openblas-dev freetype-dev libpng-dev jpeg-dev tiff-dev lcms2-dev jq \
&& apk add --no-cache sudo git alpine-sdk sed bash openimageio-dev opencv-dev vips-dev vips-tools imagemagick ghostscript-fonts rsvg-convert \
pandoc build-base libffi-dev openblas-dev freetype-dev libpng-dev jpeg-dev tiff-dev lcms2-dev jq exiftool \
python3-dev py3-opencv py3-numpy py3-scipy py3-matplotlib py3-pip py3-wheel py3-numpy py3-scipy \
&& apk cache clean && apk cache purge \
&& pip install --no-cache-dir --break-system-packages scikit-image
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,6 @@ x*
__pycache__
olddocs/
report.md
# Re-include tests/ (files under an ignored parent directory need explicit negations)
!tests/
!tests/formats/
9 changes: 9 additions & 0 deletions Makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,15 @@ check-syntax:
&& ( grep $$TCOLOR -nE '\bprint *\(' -r src/*.py || : )
.PHONY: check-syntax

# == check-formats ==
# Verify pixel format, alpha, CMYK and metadata handling of "imagewmark add"
tests/formats/check: imagewmark tests/formats/check-formats.sh
$(QCHECK)
$Q tests/formats/check-formats.sh
$(QOK)
.PHONY: tests/formats/check
check: tests/formats/check

# == check ==
check: check-syntax
.PHONY: check
Expand Down
3 changes: 3 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

### Added:
* Added `results.txt` generation to test suite, listing best JSD scores per extraction
* Added formats check to `make check`, verifying bit depth, alpha, CMYK and float pixel handling

### Changed:
* Preserve input image bit depth (8/16 bit, float), alpha channel, CMYK format and
colorspace in the C++ embedding pipeline; convert CMYK to RGB for non-JPEG/TIFF images
* Replaced OpenCV with libvips for the C++ watermark embedding pipeline
* Moved to affine transform with bicubic interpolation for image resizing
* Optimized PNG compression options when saving embedded images
Expand Down
Loading
Loading