[SCM] PostGIS branch stable-3.5 updated. 3.5.3-25-g3fddeb479
git at osgeo.org
git at osgeo.org
Thu Jul 3 09:35:58 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, stable-3.5 has been updated
via 3fddeb47969fe6337694549035c3d4c0776cc4ab (commit)
via 02839b684ecd8d555fce6ff21fa7f30533e614d4 (commit)
via 9a31e3bfb4b3af576f2247cf7243e5c0e6ce70bd (commit)
via dcf7c2085ce0e6d6dea114920387e452852a48a2 (commit)
from f3fc45595528bbf5172855730991eadc3e25b367 (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 3fddeb47969fe6337694549035c3d4c0776cc4ab
Author: Regina Obe <lr at pcorp.us>
Date: Thu Jul 3 12:35:40 2025 -0400
GHA testing replace latest with pg18-geosmain
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c042da6d..120c7f25d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
#- { tag: pg13-geos39-gdal31-proj71, mode: usan_gcc }
- { tag: pg13-clang-geos39-gdal31-proj71, mode: usan_clang }
# Run tests with different dependency combinations
- - { tag: latest, mode: tests }
+ - { tag: pg18-geosmain-gdal311-proj96, mode: tests }
- { tag: pg17-geos313-gdal39-proj94, mode: garden }
- { tag: pg13-geos38-gdal31-proj71, mode: tests }
- { tag: pg12-geos38-gdal30-proj611, mode: tests }
commit 02839b684ecd8d555fce6ff21fa7f30533e614d4
Author: Regina Obe <lr at pcorp.us>
Date: Thu Jul 3 12:20:34 2025 -0400
Get rid of pg version conditional for geojson so works on PG 19
diff --git a/postgis/lwgeom_out_geojson.c b/postgis/lwgeom_out_geojson.c
index f3fa046df..67c1cafa6 100644
--- a/postgis/lwgeom_out_geojson.c
+++ b/postgis/lwgeom_out_geojson.c
@@ -32,7 +32,6 @@
#include "lwgeom_log.h"
#include "liblwgeom.h"
-#if POSTGIS_PGSQL_VERSION < 190
typedef enum /* type categories for datum_to_json */
{
JSONTYPE_NULL, /* null, so we didn't bother to identify */
@@ -47,7 +46,6 @@ typedef enum /* type categories for datum_to_json */
JSONTYPE_CAST, /* something with an explicit cast to JSON */
JSONTYPE_OTHER /* all else */
} JsonTypeCategory;
-#endif
static void array_dim_to_json(StringInfo result, int dim, int ndims, int *dims,
Datum *vals, bool *nulls, int *valcount,
@@ -69,11 +67,11 @@ static void composite_to_json(Datum composite, StringInfo result,
static void datum_to_json(Datum val, bool is_null, StringInfo result,
JsonTypeCategory tcategory, Oid outfuncoid,
bool key_scalar);
-#if POSTGIS_PGSQL_VERSION < 190
+
static void json_categorize_type(Oid typoid,
JsonTypeCategory *tcategory,
Oid *outfuncoid);
-#endif
+
static char * postgis_JsonEncodeDateTime(char *buf, Datum value, Oid typid);
static int postgis_time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec);
static int postgis_timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp);
@@ -283,7 +281,6 @@ composite_to_geojson(FunctionCallInfo fcinfo,
* output function OID. If the returned category is JSONTYPE_CAST, we
* return the OID of the type->JSON cast function instead.
*/
-#if POSTGIS_PGSQL_VERSION < 190
static void
json_categorize_type(Oid typoid,
JsonTypeCategory *tcategory,
@@ -376,7 +373,6 @@ json_categorize_type(Oid typoid,
break;
}
}
-#endif
/*
* Turn a Datum into JSON text, appending the string to "result".
*
commit 9a31e3bfb4b3af576f2247cf7243e5c0e6ce70bd
Author: Regina Obe <lr at pcorp.us>
Date: Thu Jul 3 12:17:59 2025 -0400
News and Credits
References #5935 for PostGIS 3.5.4
diff --git a/NEWS b/NEWS
index f63f98657..8f8616fcf 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,8 @@ PostgreSQL 12-18 required. GEOS 3.8+ required. Proj 6.1+ required.
- #5909, ST_ValueCount crashes on empty table (Paul Ramsey)
- #5917, ST_Relate becomes unresponsive (Paul Ramsey)
- #5923, CG_ExtrudeStraightSkeleton crashes on empty polygon (Loïc Bartoletti)
+- #5935, Require GDAL 2.4 for postgis_raster
+ and switch to GDALGetDataTypeSizeBytes (Laurențiu Nicola)
PostGIS 3.5.3
diff --git a/doc/introduction.xml b/doc/introduction.xml
index 26bfec40f..1f0e2ba18 100644
--- a/doc/introduction.xml
+++ b/doc/introduction.xml
@@ -289,6 +289,7 @@
<member>Kashif Rasul</member>
<member>Klaus Foerster</member>
<member>Kris Jurka</member>
+ <member>Laurențiu Nicola</member>
<member>Laurenz Albe</member>
<member>Lars Roessiger</member>
<member>Leo Hsu</member>
commit dcf7c2085ce0e6d6dea114920387e452852a48a2
Author: Regina Obe <lr at pcorp.us>
Date: Thu Jul 3 12:02:46 2025 -0400
Require GDAL 2.4 for postgis_raster and switch to GDALGetDataTypeSizeBytes
Credit: Laurențiu Nicola
Closes #5935 for PostGIS 3.5.4
diff --git a/configure.ac b/configure.ac
index ed5d17255..a60828c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1581,8 +1581,8 @@ if test "x$with_raster" != "xno"; then
LIBGDAL_DEPLIBS_LDFLAGS=""
dnl GDAL version constants, update here
- GDAL_MIN_VERSION=2.0.0
- GDAL_MIN_VERSION_NUMBER=180 dnl TODO: Use GDAL version calculation MAJOR*1000+MINOR*100+REV*10+BUILD
+ GDAL_MIN_VERSION=2.4.0
+ GDAL_MIN_VERSION_NUMBER=240 dnl TODO: Use GDAL version calculation MAJOR*1000+MINOR*100+REV*10+BUILD
AC_ARG_WITH(
[gdalconfig],
diff --git a/raster/rt_core/rt_raster.c b/raster/rt_core/rt_raster.c
index ca055cf6c..6e6fd3dbc 100644
--- a/raster/rt_core/rt_raster.c
+++ b/raster/rt_core/rt_raster.c
@@ -2402,7 +2402,7 @@ rt_raster_from_gdal_dataset(GDALDatasetH ds) {
/* pixtype */
gdpixtype = GDALGetRasterDataType(gdband);
- RASTER_DEBUGF(4, "gdpixtype, size = %s, %d", GDALGetDataTypeName(gdpixtype), GDALGetDataTypeSize(gdpixtype) / 8);
+ RASTER_DEBUGF(4, "gdpixtype, size = %s, %d", GDALGetDataTypeName(gdpixtype), GDALGetDataTypeSizeBytes(gdpixtype));
pt = rt_util_gdal_datatype_to_pixtype(gdpixtype);
if (pt == PT_END) {
rterror("rt_raster_from_gdal_dataset: Unknown pixel type for GDAL band");
diff --git a/raster/rt_pg/rtpg_gdal.c b/raster/rt_pg/rtpg_gdal.c
index 039ea61d5..c3bc5f3ee 100644
--- a/raster/rt_pg/rtpg_gdal.c
+++ b/raster/rt_pg/rtpg_gdal.c
@@ -719,7 +719,7 @@ Datum RASTER_InterpolateRaster(PG_FUNCTION_ARGS)
in_band_height = rt_band_get_height(in_band);
in_band_pixtype = rt_band_get_pixtype(in_band);
in_band_gdaltype = rt_util_pixtype_to_gdal_datatype(in_band_pixtype);
- in_band_gdaltype_size = GDALGetDataTypeSize(in_band_gdaltype) / 8;
+ in_band_gdaltype_size = GDALGetDataTypeSizeBytes(in_band_gdaltype);
/* Quickly copy options struct into local memory context, so we */
/* don't have malloc'ed memory lying around */
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 2 +-
NEWS | 2 ++
configure.ac | 4 ++--
doc/introduction.xml | 1 +
postgis/lwgeom_out_geojson.c | 8 ++------
raster/rt_core/rt_raster.c | 2 +-
raster/rt_pg/rtpg_gdal.c | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list