[geos-commits] [SCM] GEOS branch 3.7 updated. c4d43781b305aaa81e21bbbe2549b13a52d920ba

[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 "GEOS".

The branch, 3.7 has been updated
       via  c4d43781b305aaa81e21bbbe2549b13a52d920ba (commit)
      from  81bff22258238d4fd5885bcbdcfefc7507f94280 (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 c4d43781b305aaa81e21bbbe2549b13a52d920ba
Author: Paul Ramsey <pramsey at cleverelephant.ca>
Date:   Sun Oct 31 17:45:56 2021 -0700

    Polish up GH Actions on 3.7 branch

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fde6dcd1..04e53a705 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@
 #
 # Paul Ramsey <pramsey at cleverelephant dot ca>
 # Based on AZP configuration by Mateusz Loskot <mateusz at loskot dot net>
+#
 
 name: CI
 on: [push, pull_request]
@@ -24,14 +25,14 @@ jobs:
           packages: 'g++ automake doxygen git2cl',
           os: ubuntu-18.04
         }
-        - {
-          compiler: g++,
-          build: autotools,
-          cxxstd: 11,
-          arch: 32,
-          packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib doxygen automake git2cl',
-          os: ubuntu-18.04
-        }
+#        - {
+#          compiler: g++,
+#          build: autotools,
+#          cxxstd: 11,
+#          arch: 32,
+#          packages: 'g++-4.8-multilib gcc-4.8-multilib g++-multilib gcc-multilib doxygen automake git2cl',
+#          os: ubuntu-18.04
+#        }
 
 
     runs-on: ${{ matrix.ci.os }}
diff --git a/tests/geostest/geostest.c b/tests/geostest/geostest.c
index fbce49dc1..bcc7a746b 100644
--- a/tests/geostest/geostest.c
+++ b/tests/geostest/geostest.c
@@ -91,7 +91,7 @@ fineGrainedReconstructionTest(const GEOSGeometry* g1)
 			cs = GEOSCoordSeq_clone(GEOSGeom_getCoordSeq(gtmp));
 			shell = GEOSGeom_createLinearRing(cs);
 			ngeoms = GEOSGetNumInteriorRings(g1);
-			geoms = malloc(ngeoms*sizeof(GEOSGeometry*));
+			geoms = (GEOSGeometry**)malloc(ngeoms*sizeof(GEOSGeometry*));
 			for (i=0; i<ngeoms; i++)
 			{
 				gtmp = GEOSGetInteriorRingN(g1, i);
@@ -107,7 +107,7 @@ fineGrainedReconstructionTest(const GEOSGeometry* g1)
 		case GEOS_MULTIPOLYGON:
 		case GEOS_GEOMETRYCOLLECTION:
 			ngeoms = GEOSGetNumGeometries(g1);
-			geoms = malloc(ngeoms*sizeof(GEOSGeometry*));
+			geoms = (GEOSGeometry**)malloc(ngeoms*sizeof(GEOSGeometry*));
 			for (i=0; i<ngeoms; i++)
 			{
 				gtmp = GEOSGetGeometryN(g1, i);
diff --git a/tests/thread/badthreadtest.c b/tests/thread/badthreadtest.c
index 422ddeaa8..0456664ff 100644
--- a/tests/thread/badthreadtest.c
+++ b/tests/thread/badthreadtest.c
@@ -143,7 +143,7 @@ fineGrainedReconstructionTest(const GEOSGeometry* g1)
 			cs = GEOSCoordSeq_clone(GEOSGeom_getCoordSeq(gtmp));
 			shell = GEOSGeom_createLinearRing(cs);
 			ngeoms = GEOSGetNumInteriorRings(g1);
-			geoms = malloc(ngeoms*sizeof(GEOSGeometry*));
+			geoms = (GEOSGeometry**)malloc(ngeoms*sizeof(GEOSGeometry*));
 			for (i=0; i<ngeoms; i++)
 			{
 				gtmp = GEOSGetInteriorRingN(g1, i);
@@ -159,7 +159,7 @@ fineGrainedReconstructionTest(const GEOSGeometry* g1)
 		case GEOS_MULTIPOLYGON:
 		case GEOS_GEOMETRYCOLLECTION:
 			ngeoms = GEOSGetNumGeometries(g1);
-			geoms = malloc(ngeoms*sizeof(GEOSGeometry*));
+			geoms = (GEOSGeometry**)malloc(ngeoms*sizeof(GEOSGeometry*));
 			for (i=0; i<ngeoms; i++)
 			{
 				gtmp = GEOSGetGeometryN(g1, i);
diff --git a/tests/thread/threadtest.c b/tests/thread/threadtest.c
index bb67759d5..10f324abf 100644
--- a/tests/thread/threadtest.c
+++ b/tests/thread/threadtest.c
@@ -136,7 +136,7 @@ fineGrainedReconstructionTest(const GEOSGeometry* g1,
                                  GEOSGeom_getCoordSeq_r(handle, gtmp));
 			shell = GEOSGeom_createLinearRing_r(handle, cs);
 			ngeoms = GEOSGetNumInteriorRings_r(handle, g1);
-			geoms = malloc(ngeoms*sizeof(GEOSGeometry*));
+			geoms = (GEOSGeometry**)malloc(ngeoms*sizeof(GEOSGeometry*));
 			for (i=0; i<ngeoms; i++)
 			{
 				gtmp = GEOSGetInteriorRingN_r(handle, g1, i);
@@ -155,7 +155,7 @@ fineGrainedReconstructionTest(const GEOSGeometry* g1,
 		case GEOS_MULTIPOLYGON:
 		case GEOS_GEOMETRYCOLLECTION:
 			ngeoms = GEOSGetNumGeometries_r(handle, g1);
-			geoms = malloc(ngeoms*sizeof(GEOSGeometry*));
+			geoms = (GEOSGeometry**)malloc(ngeoms*sizeof(GEOSGeometry*));
 			for (i=0; i<ngeoms; i++)
 			{
 				gtmp = GEOSGetGeometryN_r(handle, g1, i);
@@ -411,7 +411,7 @@ void *threadfunc1( void *arg )
     GEOSContextHandle_t handle = NULL;
 
     handle = initGEOS_r( notice1, log_and_exit1 );
-    printf("GEOS version %s\n", GEOSversion(handle));
+    printf("GEOS version %s\n", GEOSversion());
     putc('.', stderr); fflush(stderr);
     do_all((char*)arg, handle);
     putc('+', stderr); fflush(stderr);
@@ -425,7 +425,7 @@ void *threadfunc2( void *arg )
     GEOSContextHandle_t handle = NULL;
 
     handle = initGEOS_r( notice2, log_and_exit2 );
-    printf("GEOS version %s\n", GEOSversion(handle));
+    printf("GEOS version %s\n", GEOSversion());
     putc('.', stderr); fflush(stderr);
     do_all((char *)arg, handle);
     putc('+', stderr); fflush(stderr);

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

Summary of changes:
 .github/workflows/ci.yml     | 17 +++++++++--------
 tests/geostest/geostest.c    |  4 ++--
 tests/thread/badthreadtest.c |  4 ++--
 tests/thread/threadtest.c    |  8 ++++----
 4 files changed, 17 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GEOS