[SCM] PostGIS branch master updated. 3.6.0rc2-615-ge80ff0a0c

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  e80ff0a0cf01e8834eb7fdef7d17161dd2a825b1 (commit)
      from  afc9284efd51e84ce985e3637e5177fe93f41e36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e80ff0a0cf01e8834eb7fdef7d17161dd2a825b1
Author: Darafei Praliaskouski <me at komzpa.net>
Date:   Thu Jun 18 21:48:41 2026 +0400

    doc: flatten PDF manual images
    
    Closes #1408
    Closes https://github.com/postgis/postgis/pull/931

diff --git a/NEWS b/NEWS
index 8a8baa0d2..ad8c66e92 100644
--- a/NEWS
+++ b/NEWS
@@ -107,6 +107,8 @@ To take advantage of all postgis_sfcgal extension features SFCGAL 2.3+ is needed
  - #5593, Docs: render manual images with GraphicsMagick without temporary files,
           enabling parallel builds, keeping ImageMagick fallbacks working, and
           documenting the generator workflow for contributors (Darafei Praliaskouski)
+ - #1408, Docs: flatten transparent manual images onto white backgrounds for
+          PDF builds while keeping HTML images transparent (Darafei Praliaskouski)
  - [fuzzers] Centralize OSS-Fuzz build/dependency logic in PostGIS scripts,
           prefer requested CXX over pg_config --cc for internal C++ checks, and
           make fuzzer linking/runtime dependency packaging portable
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 418d46ab6..6230b2031 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -49,6 +49,7 @@ DOCSUFFIX=-en
 # TODO: change this ?
 html_builddir=$(abs_builddir)/html
 images_builddir=$(html_builddir)/images
+pdf_images_builddir=$(abs_builddir)/pdf/images
 
 ifneq (,$(findstring dev,$(POSTGIS_MICRO_VERSION)))
   POSTGIS_DOWNLOAD_URL=https://postgis.net/stuff
@@ -422,7 +423,7 @@ $(html_builddir)/postgis$(DOCSUFFIX).html: postgis-out.xml Makefile
 		$<
 
 
-postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf: postgis-out.xml $(abs_srcdir)/texstyle-common.sty $(abs_srcdir)/texstyle.sty | images
+postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}$(DOCSUFFIX).pdf: postgis-out.xml $(abs_srcdir)/texstyle-common.sty $(abs_srcdir)/texstyle.sty | images pdf-images
 ifeq ($(DBLATEX),)
 	@echo
 	@echo "configure was unable to find the 'dblatex' utility program."
@@ -432,7 +433,7 @@ ifeq ($(DBLATEX),)
 else
 	$(DBLATEX) -T native -t pdf \
 		 -x "--path $(XSLT_PATH)" \
-		 -I "$(abs_builddir)/html" \
+		 -I "$(abs_builddir)/pdf" \
 		 -P doc.collab.show=0 \
 		 -P figure.note="images/note" \
 		 -P figure.tip="images/tip" \
@@ -487,12 +488,16 @@ doxygen: doxygen.cfg
 images images-install images-uninstall images-clean:
 	$(MAKE) -C $(images_builddir) $@
 
+pdf-images: images
+	$(MAKE) -C $(images_builddir) $@ PDF_IMAGES_BUILD_DIR="$(pdf_images_builddir)"
+
 html-clean:
 	rm -f $(html_builddir)/postgis$(DOCSUFFIX).html
 	rm -rf $(html_builddir)/postgis$(DOCSUFFIX)/
 
 pdf-clean:
 	rm -f postgis*$(DOCSUFFIX).pdf
+	rm -rf $(abs_builddir)/pdf
 
 epub-clean:
 	rm -f postgis*$(DOCSUFFIX).epub
diff --git a/doc/html/images/Makefile.in b/doc/html/images/Makefile.in
index 288065530..daeb3b706 100644
--- a/doc/html/images/Makefile.in
+++ b/doc/html/images/Makefile.in
@@ -262,6 +262,9 @@ ALL_IMAGES = \
 	$(GENERATED_IMAGES_RESIZED) \
 	$(STATIC_IMAGES)
 
+PDF_IMAGES_BUILD_DIR ?= pdf-images
+PDF_IMAGES = $(ALL_IMAGES:%=$(PDF_IMAGES_BUILD_DIR)/%)
+
 OBJS=styles.o generator.o
 
 # Build the generator
@@ -270,6 +273,8 @@ all: generator
 # generate the images
 images: $(ALL_IMAGES)
 
+pdf-images: $(PDF_IMAGES)
+
 images-install: $(ALL_IMAGES)
 	mkdir -p $(DESTDIR)$(htmldir)/images
 	$(INSTALL_DATA) $(ALL_IMAGES) $(DESTDIR)$(htmldir)/images/
@@ -285,6 +290,23 @@ $(OBJS): %.o: %.c
 $(STATIC_IMAGES):
 	ln -fs $(srcdir)/static/$@ $@
 
+$(PDF_IMAGES_BUILD_DIR)/%: %
+	@mkdir -p $(dir $@)
+	@converter=$${POSTGIS_DOC_CONVERTER:-}; \
+	if test -z "$$converter"; then \
+		if command -v gm >/dev/null 2>&1; then \
+			converter="gm convert"; \
+		elif command -v magick >/dev/null 2>&1; then \
+			converter="magick convert"; \
+		elif command -v convert >/dev/null 2>&1; then \
+			converter="convert"; \
+		else \
+			echo "Could not find GraphicsMagick or ImageMagick executables (gm, magick, convert)." >&2; \
+			exit 1; \
+		fi; \
+	fi; \
+	$$converter "$<" -background white -flatten "$@"
+
 # Command to build each of the .wkt files
 $(GENERATED_IMAGES): %.png: wkt/%.wkt generator wkt/styles.conf
 	@./generator $< $@
@@ -312,3 +334,4 @@ distclean: clean
 
 images-clean:
 	rm -f $(ALL_IMAGES)
+	rm -rf $(PDF_IMAGES_BUILD_DIR)

-----------------------------------------------------------------------

Summary of changes:
 NEWS                        |  2 ++
 doc/Makefile.in             |  9 +++++++--
 doc/html/images/Makefile.in | 23 +++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
PostGIS