[SCM] PostGIS branch stable-3.5 updated. 3.5.2-22-gc675922c2

[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, stable-3.5 has been updated
       via  c675922c2a8cd1d1b4e9b5b987c390dd1b85b523 (commit)
       via  3bd22fb1aea0be2fa9df3152289651cdca44db9b (commit)
       via  f93f000d12086657f0098d4b51beb0bfd4ad8a9e (commit)
      from  bdf0f1ab2ec393271eb37037f6cda8e94632e576 (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 c675922c2a8cd1d1b4e9b5b987c390dd1b85b523
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Apr 15 11:27:27 2025 -0700

    gr2

diff --git a/liblwgeom/lwgeom_sfcgal.c b/liblwgeom/lwgeom_sfcgal.c
index 844fc202f..2e6d11e23 100644
--- a/liblwgeom/lwgeom_sfcgal.c
+++ b/liblwgeom/lwgeom_sfcgal.c
@@ -25,6 +25,15 @@
 #include "lwgeom_sfcgal.h"
 #include <stdio.h>
 
+#if POSTGIS_SFCGAL_VERSION >= 20100
+#define sfcgal_triangulated_surface_num_triangles(g) sfcgal_geometry_num_geometries((g))
+#define sfcgal_triangulated_surface_triangle_n(g,i)  sfcgal_geometry_get_geometry_n((g), (i))
+#define sfcgal_polyhedral_surface_num_polygons(g)    sfcgal_geometry_num_geometries((g))
+#define sfcgal_polyhedral_surface_polygon_n(g,i)     sfcgal_geometry_get_geometry_n((g), (i))
+#define sfcgal_geometry_collection_num_geometries(g) sfcgal_geometry_num_geometries((g))
+#define sfcgal_geometry_collection_geometry_n(g,i)   sfcgal_geometry_get_geometry_n((g), (i))
+#endif
+
 static int SFCGAL_type_to_lwgeom_type(sfcgal_geometry_type_t type);
 static POINTARRAY *ptarray_from_SFCGAL(const sfcgal_geometry_t *geom, int force3D);
 static sfcgal_geometry_t *ptarray_to_SFCGAL(const POINTARRAY *pa, int type);

commit 3bd22fb1aea0be2fa9df3152289651cdca44db9b
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Apr 15 11:23:30 2025 -0700

    gr

diff --git a/raster/rt_core/rt_warp.c b/raster/rt_core/rt_warp.c
index 80236f417..7be602e32 100644
--- a/raster/rt_core/rt_warp.c
+++ b/raster/rt_core/rt_warp.c
@@ -189,7 +189,9 @@ rt_raster rt_raster_gdal_warp(
 	char *dst_options[] = {"SUBCLASS=VRTWarpedDataset", NULL};
 	_rti_warp_arg arg = NULL;
 
+#if POSTGIS_GDAL_VERSION < 311
 	int hasnodata = 0;
+#endif
 
 	GDALRasterBandH band;
 	rt_band rtband = NULL;
@@ -819,7 +821,9 @@ rt_raster rt_raster_gdal_warp(
 
 		/* set nodata */
 		if (rt_band_get_hasnodata_flag(rtband) != FALSE) {
+#if POSTGIS_GDAL_VERSION < 311
 			hasnodata = 1;
+#endif
 			rt_band_get_nodata(rtband, &nodata);
 			if (GDALSetRasterNoDataValue(band, nodata) != CE_None)
 				rtwarn("rt_raster_gdal_warp: Could not set nodata value for band %d", i);
@@ -881,7 +885,7 @@ rt_raster rt_raster_gdal_warp(
 		arg->wopts->panDstBands[i] = arg->wopts->panSrcBands[i] = i + 1;
 
 /* See https://trac.osgeo.org/postgis/ticket/5881 */
-#if POSTGIS_GDAL_VERSION >= 311
+#if POSTGIS_GDAL_VERSION < 311
 	/* set nodata mapping */
 	if (hasnodata) {
 #endif
@@ -927,7 +931,7 @@ rt_raster rt_raster_gdal_warp(
 				arg->wopts->padfDstNoDataReal[i], arg->wopts->padfDstNoDataImag[i]
 			);
 		}
-#if POSTGIS_GDAL_VERSION >= 311
+#if POSTGIS_GDAL_VERSION < 311
 	}
 #endif
 

commit f93f000d12086657f0098d4b51beb0bfd4ad8a9e
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Tue Apr 15 10:48:37 2025 -0700

    Map nodata values for GDAL 3.11 and up, regardless of presence. References #5881

diff --git a/raster/rt_core/rt_warp.c b/raster/rt_core/rt_warp.c
index 73beef1f7..80236f417 100644
--- a/raster/rt_core/rt_warp.c
+++ b/raster/rt_core/rt_warp.c
@@ -880,8 +880,11 @@ rt_raster rt_raster_gdal_warp(
 	for (i = 0; i < arg->wopts->nBandCount; i++)
 		arg->wopts->panDstBands[i] = arg->wopts->panSrcBands[i] = i + 1;
 
+/* See https://trac.osgeo.org/postgis/ticket/5881 */
+#if POSTGIS_GDAL_VERSION >= 311
 	/* set nodata mapping */
 	if (hasnodata) {
+#endif
 		RASTER_DEBUG(3, "Setting nodata mapping");
 		arg->wopts->padfSrcNoDataReal = (double *) CPLMalloc(numBands * sizeof(double));
 		arg->wopts->padfDstNoDataReal = (double *) CPLMalloc(numBands * sizeof(double));
@@ -924,7 +927,9 @@ rt_raster rt_raster_gdal_warp(
 				arg->wopts->padfDstNoDataReal[i], arg->wopts->padfDstNoDataImag[i]
 			);
 		}
+#if POSTGIS_GDAL_VERSION >= 311
 	}
+#endif
 
 	/* warp raster */
 	RASTER_DEBUG(3, "Warping raster");

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

Summary of changes:
 liblwgeom/lwgeom_sfcgal.c | 9 +++++++++
 raster/rt_core/rt_warp.c  | 9 +++++++++
 2 files changed, 18 insertions(+)


hooks/post-receive
-- 
PostGIS