[SCM] PostGIS branch master updated. 3.4.0rc1-999-g5a54c64f2

git at osgeo.org git at osgeo.org
Sat Mar 9 06:59:21 PST 2024


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  5a54c64f2c618c2e64b9e275e481cdb9439b877f (commit)
      from  b7990ecf8b6981f4a20e7121d0e75222075df6e9 (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 5a54c64f2c618c2e64b9e275e481cdb9439b877f
Author: Loïc Bartoletti <loic.bartoletti at oslandia.com>
Date:   Thu Mar 7 18:47:53 2024 +0100

    lwgeom_sfcgal.c: add ifdef when using sfcgal_point_m
    
    sfcgal_point_m is available since 1.3.8.
    Add an #if POSTGIS_SFCGAL_VERSION >= 10308 accordingly.

diff --git a/liblwgeom/lwgeom_sfcgal.c b/liblwgeom/lwgeom_sfcgal.c
index 3310b681d..844fc202f 100644
--- a/liblwgeom/lwgeom_sfcgal.c
+++ b/liblwgeom/lwgeom_sfcgal.c
@@ -157,8 +157,10 @@ ptarray_from_SFCGAL(const sfcgal_geometry_t *geom, int want3d)
 		else if (want3d)
 			point.z = 0.0;
 
+#if POSTGIS_SFCGAL_VERSION >= 10308
 		if (is_measured)
 			point.m = sfcgal_point_m(geom);
+#endif
 
 		ptarray_set_point4d(pa, 0, &point);
 	}
@@ -180,8 +182,10 @@ ptarray_from_SFCGAL(const sfcgal_geometry_t *geom, int want3d)
 			else if (want3d)
 				point.z = 0.0;
 
+#if POSTGIS_SFCGAL_VERSION >= 10308
 			if (is_measured)
 				point.m = sfcgal_point_m(pt);
+#endif
 
 			ptarray_set_point4d(pa, i, &point);
 		}
@@ -203,8 +207,10 @@ ptarray_from_SFCGAL(const sfcgal_geometry_t *geom, int want3d)
 			else if (want3d)
 				point.z = 0.0;
 
+#if POSTGIS_SFCGAL_VERSION >= 10308
 			if (is_measured)
 				point.m = sfcgal_point_m(pt);
+#endif
 
 			ptarray_set_point4d(pa, i, &point);
 		}

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

Summary of changes:
 liblwgeom/lwgeom_sfcgal.c | 6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
PostGIS


More information about the postgis-tickets mailing list