[SCM] PostGIS branch master updated. 3.4.0rc1-1114-g4ffca201c

[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  4ffca201c5b5c97fd3a951c12a2fd7b034ed1806 (commit)
       via  c2acf6095e414993cb1c8b402425eb79e538c193 (commit)
      from  de88a07ca71e80f52ebf5be5e1aa74ce2f678280 (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 4ffca201c5b5c97fd3a951c12a2fd7b034ed1806
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri May 17 23:36:45 2024 +0200

    Fix printf format warnings in loader

diff --git a/loader/shp2pgsql-core.c b/loader/shp2pgsql-core.c
index 32c63e4e0..e86b5abae 100644
--- a/loader/shp2pgsql-core.c
+++ b/loader/shp2pgsql-core.c
@@ -1467,7 +1467,7 @@ ShpLoaderGetSQLHeader(SHPLOADERSTATE *state, char **strheader)
 		{
 			stringbuffer_aprintf(sb, "\"%s\".",state->config->schema);
 		}
-		stringbuffer_aprintf(sb, "\"%s\" WHERE false;\n", state->config->table, state->geo_col);
+		stringbuffer_aprintf(sb, "\"%s\" WHERE false;\n", state->config->table);
 		/**out input data is going to be in different srid from target, so need to remove type constraint **/
 		stringbuffer_aprintf(sb, "ALTER TABLE \"pgis_tmp_%s\" ALTER COLUMN \"%s\" TYPE geometry USING ( (\"%s\"::geometry) ); \n", state->config->table,  state->geo_col, state->geo_col);
 	}

commit c2acf6095e414993cb1c8b402425eb79e538c193
Author: Sandro Santilli <strk at kbt.io>
Date:   Fri May 17 23:26:16 2024 +0200

    Fix printf format warnings in rt_core

diff --git a/raster/rt_core/rt_wkb.c b/raster/rt_core/rt_wkb.c
index 9113274f7..ccec01a35 100644
--- a/raster/rt_core/rt_wkb.c
+++ b/raster/rt_core/rt_wkb.c
@@ -31,6 +31,8 @@
 #include "librtcore_internal.h"
 #include "rt_serialize.h"
 
+#include <inttypes.h>
+
 /* Read band from WKB as at start of band */
 static rt_band
 rt_band_from_wkb(
@@ -286,7 +288,8 @@ rt_raster_from_wkb(const uint8_t* wkb, uint32_t wkbsize) {
 
 	/* Check that wkbsize is >= sizeof(rt_raster_serialized) */
 	if (wkbsize < RT_WKB_HDR_SZ) {
-		rterror("rt_raster_from_wkb: wkb size (%d)  < min size (%d)",
+		rterror("rt_raster_from_wkb: wkb size (%" PRIu32
+			") < min size (%zu)",
 			wkbsize, RT_WKB_HDR_SZ);
 		return NULL;
 	}
@@ -350,11 +353,11 @@ rt_raster_from_wkb(const uint8_t* wkb, uint32_t wkbsize) {
 	if (!rast->numBands) {
 		/* Here ptr should have been left to right after last used byte */
 		if (ptr < wkbend) {
-			rtwarn("%d bytes of WKB remained unparsed", wkbend - ptr);
+			rtwarn("%" PRIu64 " bytes of WKB remained unparsed", wkbend - ptr);
 		}
 		else if (ptr > wkbend) {
 			/* Easier to get a segfault before I guess */
-			rtwarn("We parsed %d bytes more then available!", ptr - wkbend);
+			rtwarn("We parsed %zu bytes more then available!", ptr - wkbend);
 		}
 
 		rast->bands = NULL;
@@ -392,11 +395,11 @@ rt_raster_from_wkb(const uint8_t* wkb, uint32_t wkbsize) {
 
 	/* Here ptr should have been left to right after last used byte */
 	if (ptr < wkbend) {
-		rtwarn("%d bytes of WKB remained unparsed", wkbend - ptr);
+		rtwarn("%zu bytes of WKB remained unparsed", wkbend - ptr);
 	}
 	else if (ptr > wkbend) {
 		/* Easier to get a segfault before I guess */
-		rtwarn("We parsed %d bytes more then available!", ptr - wkbend);
+		rtwarn("We parsed %zu bytes more then available!", ptr - wkbend);
 	}
 
 	return rast;

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

Summary of changes:
 loader/shp2pgsql-core.c |  2 +-
 raster/rt_core/rt_wkb.c | 13 ++++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
PostGIS