[postgis-tickets] [SCM] PostGIS branch stable-3.0 updated. 3.0.1-38-g134d865
git at osgeo.org
git at osgeo.org
Mon Aug 3 15:07:17 PDT 2020
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.0 has been updated
via 134d865cc8f7dd8224c03da387c2d455bad38b38 (commit)
from 8e4f510903995abde22468a6e9a107021dacde60 (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 134d865cc8f7dd8224c03da387c2d455bad38b38
Author: Regina Obe <lr at pcorp.us>
Date: Mon Aug 3 18:07:08 2020 -0400
Get rid of more const, unused variables - quieting more gittie complaints. References #4734 for PostGIS 3.0.2
diff --git a/raster/test/cunit/cu_gdal.c b/raster/test/cunit/cu_gdal.c
index 680c262..54daa3e 100644
--- a/raster/test/cunit/cu_gdal.c
+++ b/raster/test/cunit/cu_gdal.c
@@ -98,16 +98,6 @@ static void test_gdal_rasterize() {
cu_free_raster(raster);
}
-static char *
-lwgeom_to_text(const LWGEOM *lwgeom) {
- char *wkt;
- size_t wkt_size;
-
- wkt = lwgeom_to_wkt(lwgeom, WKT_ISO, DBL_DIG, &wkt_size);
-
- return wkt;
-}
-
static rt_raster fillRasterToPolygonize(int hasnodata, double nodataval) {
rt_band band = NULL;
rt_pixtype pixtype = PT_32BF;
@@ -189,12 +179,12 @@ static void test_gdal_polygonize() {
CU_ASSERT_DOUBLE_EQUAL(lwgeom_area(gobserved), lwgeom_area(gexpected), FLT_EPSILON );
CU_ASSERT_DOUBLE_EQUAL(gv[2].val, 2.8, FLT_EPSILON);
- gobserved = (const LWGEOM *)gv[2].geom;
+ gobserved = (LWGEOM *)gv[2].geom;
gexpected = lwgeom_from_wkt("POLYGON((5 1,5 3,6 3,6 6,5 6,5 8,6 8,6 7,7 7,7 6,8 6,8 3,7 3,7 2,6 2,6 1,5 1))",
LW_PARSER_CHECK_NONE);
CU_ASSERT_DOUBLE_EQUAL(lwgeom_area(gobserved), lwgeom_area(gexpected), FLT_EPSILON);
- gobserved = (const LWGEOM *)gv[3].geom;
+ gobserved = (LWGEOM *)gv[3].geom;
gexpected = lwgeom_from_wkt(
"POLYGON((0 0,0 9,9 9,9 0,0 0),(6 7,6 8,3 8,3 7,2 7,2 6,1 6,1 3,2 3,2 2,3 2,3 1,6 1,6 2,7 2,7 3,8 3,8 6,7 6,7 7,6 7))",
LW_PARSER_CHECK_NONE);
@@ -223,7 +213,7 @@ static void test_gdal_polygonize() {
*/
CU_ASSERT_DOUBLE_EQUAL(gv[1].val, 0.0, FLT_EPSILON);
- gobserved = (const LWGEOM *)gv[1].geom;
+ gobserved = (LWGEOM *)gv[1].geom;
gexpected = lwgeom_from_wkt("POLYGON((3 3,3 6,6 6,6 3,3 3))", LW_PARSER_CHECK_NONE);
CU_ASSERT_DOUBLE_EQUAL(lwgeom_area(gobserved), lwgeom_area(gexpected), FLT_EPSILON);
//wkt = lwgeom_to_text((const LWGEOM *) gv[1].geom);
@@ -231,7 +221,7 @@ static void test_gdal_polygonize() {
//rtdealloc(wkt);
CU_ASSERT_DOUBLE_EQUAL(gv[2].val, 2.8, FLT_EPSILON);
- gobserved = (const LWGEOM *)gv[2].geom;
+ gobserved = (LWGEOM *)gv[2].geom;
gexpected = lwgeom_from_wkt("POLYGON((5 1,5 3,6 3,6 6,5 6,5 8,6 8,6 7,7 7,7 6,8 6,8 3,7 3,7 2,6 2,6 1,5 1))",
LW_PARSER_CHECK_NONE);
CU_ASSERT_DOUBLE_EQUAL(lwgeom_area(gobserved), lwgeom_area(gexpected), FLT_EPSILON);
@@ -240,7 +230,7 @@ static void test_gdal_polygonize() {
//rtdealloc(wkt);
CU_ASSERT_DOUBLE_EQUAL(gv[3].val, 0.0, FLT_EPSILON);
- gobserved = (const LWGEOM *)gv[3].geom;
+ gobserved = (LWGEOM *)gv[3].geom;
gexpected = lwgeom_from_wkt(
"POLYGON((0 0,0 9,9 9,9 0,0 0),(6 7,6 8,3 8,3 7,2 7,2 6,1 6,1 3,2 3,2 2,3 2,3 1,6 1,6 2,7 2,7 3,8 3,8 6,7 6,7 7,6 7))",
LW_PARSER_CHECK_NONE);
@@ -268,7 +258,7 @@ static void test_gdal_polygonize() {
*/
CU_ASSERT_DOUBLE_EQUAL(gv[3].val, 0.0, FLT_EPSILON);
- gobserved = (const LWGEOM *)gv[3].geom;
+ gobserved = (LWGEOM *)gv[3].geom;
gexpected = lwgeom_from_wkt(
"POLYGON((0 0,0 9,9 9,9 0,0 0),(6 7,6 8,3 8,3 7,2 7,2 6,1 6,1 3,2 3,2 2,3 2,3 1,6 1,6 2,7 2,7 3,8 3,8 6,7 6,7 7,6 7))",
LW_PARSER_CHECK_NONE);
diff --git a/raster/test/cunit/cu_raster_geometry.c b/raster/test/cunit/cu_raster_geometry.c
index 1f75666..1836441 100644
--- a/raster/test/cunit/cu_raster_geometry.c
+++ b/raster/test/cunit/cu_raster_geometry.c
@@ -258,7 +258,6 @@ static void test_raster_surface() {
const int maxX = 5;
const int maxY = 5;
int x, y;
- char *wkt = NULL;
LWMPOLY *mpoly = NULL;
int err;
LWGEOM *gexpected, *gobserved;
-----------------------------------------------------------------------
Summary of changes:
raster/test/cunit/cu_gdal.c | 22 ++++++----------------
raster/test/cunit/cu_raster_geometry.c | 1 -
2 files changed, 6 insertions(+), 17 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list