[SCM] PostGIS branch master updated. 3.6.0beta1-41-g3b7600f8a
git at osgeo.org
git at osgeo.org
Sat Aug 16 16:19:34 PDT 2025
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 3b7600f8ab8edc415bbae951c4958acf03cf4909 (commit)
from 69d326a43118f39204bae44a85aaad3c5e4b142d (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 3b7600f8ab8edc415bbae951c4958acf03cf4909
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date: Sat Aug 16 16:19:03 2025 -0700
Build under pg19
diff --git a/libpgcommon/lwgeom_pg.h b/libpgcommon/lwgeom_pg.h
index 102d84f35..2cb698faf 100644
--- a/libpgcommon/lwgeom_pg.h
+++ b/libpgcommon/lwgeom_pg.h
@@ -89,8 +89,18 @@ void pg_install_lwgeom_handlers(void);
/* Argument handling macros */
#define PG_GETARG_GSERIALIZED_P(varno) ((GSERIALIZED *)PG_DETOAST_DATUM(PG_GETARG_DATUM(varno)))
#define PG_GETARG_GSERIALIZED_P_COPY(varno) ((GSERIALIZED *)PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(varno)))
+
#define PG_GSERIALIZED_DATUM_NEEDS_DETOAST(datum) \
- (VARATT_IS_EXTENDED((datum)) || VARATT_IS_EXTERNAL((datum)) || VARATT_IS_COMPRESSED((datum)))
+ (VARATT_IS_EXTENDED(DatumGetPointer(datum)) || \
+ VARATT_IS_EXTERNAL(DatumGetPointer(datum)) || \
+ VARATT_IS_COMPRESSED(DatumGetPointer(datum)))
+
+// #define PG_GSERIALIZED_DATUM_NEEDS_DETOAST(datum) \
+// (VARATT_IS_EXTENDED((datum)) || \
+// VARATT_IS_EXTERNAL((datum)) || \
+// VARATT_IS_COMPRESSED((datum)))
+
+
#define PG_GETARG_GSERIALIZED_HEADER(varno) \
PG_GSERIALIZED_DATUM_NEEDS_DETOAST(PG_GETARG_DATUM(varno)) \
? ((GSERIALIZED *)PG_DETOAST_DATUM_SLICE(PG_GETARG_DATUM(varno), 0, gserialized_max_header_size())) \
diff --git a/postgis/gserialized_gist_2d.c b/postgis/gserialized_gist_2d.c
index 6e2c28e5e..2b33a7e4b 100644
--- a/postgis/gserialized_gist_2d.c
+++ b/postgis/gserialized_gist_2d.c
@@ -476,7 +476,7 @@ gserialized_datum_get_internals_p(Datum gsdatum, GBOX *gbox, lwflags_t *flags, u
{
int result = LW_SUCCESS;
GSERIALIZED *gpart = NULL;
- int need_detoast = PG_GSERIALIZED_DATUM_NEEDS_DETOAST((struct varlena *)gsdatum);
+ int need_detoast = PG_GSERIALIZED_DATUM_NEEDS_DETOAST(gsdatum);
if (need_detoast)
{
gpart = (GSERIALIZED *)PG_DETOAST_DATUM_SLICE(gsdatum, 0, gserialized_max_header_size());
@@ -528,7 +528,7 @@ gserialized_datum_get_box2df_p(Datum gsdatum, BOX2DF *box2df)
{
int result = LW_SUCCESS;
GSERIALIZED *gpart = NULL;
- int need_detoast = PG_GSERIALIZED_DATUM_NEEDS_DETOAST((struct varlena *)gsdatum);
+ int need_detoast = PG_GSERIALIZED_DATUM_NEEDS_DETOAST(gsdatum);
if (need_detoast)
{
gpart = (GSERIALIZED *)PG_DETOAST_DATUM_SLICE(gsdatum, 0, gserialized_max_header_size());
-----------------------------------------------------------------------
Summary of changes:
libpgcommon/lwgeom_pg.h | 12 +++++++++++-
postgis/gserialized_gist_2d.c | 4 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list