[SCM] PostGIS branch master updated. 3.5.0-451-g60b0e880d

[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  60b0e880d24ffcdf2d17ab22bc8109549f69fd16 (commit)
       via  0126bb42242eab4c65594489daca39df0285eb8c (commit)
      from  78f9f7ad7322265989946a14f67acd8bf8f3d80c (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 60b0e880d24ffcdf2d17ab22bc8109549f69fd16
Author: Paul Ramsey <paul.ramsey at snowflake.com>
Date:   Fri Jul 11 11:06:01 2025 -0700

    Fix syntax error from merge

diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index ec9963cd6..6697186d8 100644
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -1134,7 +1134,9 @@ lwgeom_has_patches(const LWGEOM *geom)
 	default:
 		return LW_FALSE;
 	}
+}
 
+int
 lwgeom_is_unitary(const LWGEOM *geom)
 {
 	return lwtype_is_unitary(geom->type);

commit 0126bb42242eab4c65594489daca39df0285eb8c
Author: Paul Ramsey <paul.ramsey at snowflake.com>
Date:   Fri Jul 11 10:50:15 2025 -0700

    Fix bug in reading geometry type off head of
    serialization in ST_IsCollection. References #5927

diff --git a/.editorconfig b/.editorconfig
index fa6aa5610..d9aad2c76 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -78,10 +78,6 @@ indent_size = 2
 [postgis/sfcgal.sql.in]
 indent_style = space
 
-# .h.in files want space indentation
-[*.h.in]
-indent_style = space
-
 # Makefiles want tab indentation
 [{Makefile.in,Makefile,GNUmakefile.in}]
 indent_style = tab
diff --git a/liblwgeom/liblwgeom.h.in b/liblwgeom/liblwgeom.h.in
index 847a1ff6e..54eb1e7ed 100644
--- a/liblwgeom/liblwgeom.h.in
+++ b/liblwgeom/liblwgeom.h.in
@@ -906,6 +906,7 @@ extern int lwgeom_is_collection(const LWGEOM *lwgeom);
 * are all unitary, they are not just bags of other geometries.
 */
 extern int lwgeom_is_unitary(const LWGEOM *geom);
+extern int lwtype_is_unitary(uint32_t lwtype);
 
 /*
  * Check if geometry type contains patches
diff --git a/liblwgeom/lwgeom.c b/liblwgeom/lwgeom.c
index a40181423..ec9963cd6 100644
--- a/liblwgeom/lwgeom.c
+++ b/liblwgeom/lwgeom.c
@@ -1101,9 +1101,9 @@ lwgeom_is_collection(const LWGEOM *geom)
 }
 
 int
-lwgeom_is_unitary(const LWGEOM *geom)
+lwtype_is_unitary(uint32_t lwtype)
 {
-	switch (geom->type)
+	switch (lwtype)
 	{
 	case POINTTYPE:
 	case LINETYPE:
@@ -1134,6 +1134,10 @@ lwgeom_has_patches(const LWGEOM *geom)
 	default:
 		return LW_FALSE;
 	}
+
+lwgeom_is_unitary(const LWGEOM *geom)
+{
+	return lwtype_is_unitary(geom->type);
 }
 
 int
diff --git a/postgis/lwgeom_functions_basic.c b/postgis/lwgeom_functions_basic.c
index 974fad631..1e126ce82 100644
--- a/postgis/lwgeom_functions_basic.c
+++ b/postgis/lwgeom_functions_basic.c
@@ -2161,8 +2161,8 @@ PG_FUNCTION_INFO_V1(ST_IsCollection);
 Datum ST_IsCollection(PG_FUNCTION_ARGS)
 {
 	GSERIALIZED *geom = PG_GETARG_GSERIALIZED_HEADER(0);
-	LWGEOM *lwg = lwgeom_from_gserialized(geom);
-	PG_RETURN_BOOL(!lwgeom_is_unitary(lwg));
+	uint32_t lwtype = gserialized_get_type(geom);
+	PG_RETURN_BOOL(!lwtype_is_unitary(lwtype));
 }
 
 PG_FUNCTION_INFO_V1(LWGEOM_makepoint);

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

Summary of changes:
 .editorconfig                    |  4 ----
 liblwgeom/liblwgeom.h.in         |  1 +
 liblwgeom/lwgeom.c               | 10 ++++++++--
 postgis/lwgeom_functions_basic.c |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS