ST_Centroid for geography fix uninitialized points issue

References #2951

git-svn-id: http://svn.osgeo.org/postgis/trunk@15526 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/postgis/geography_centroid.c b/postgis/geography_centroid.c
index c7710c84fcdfb4b3235c813b1caab6000ec48882..00b8b83c43325c348dbfded1f6bc981586795e3c 100644 (file)
--- a/postgis/geography_centroid.c
+++ b/postgis/geography_centroid.c
@@ -309,7 +309,7 @@ LWPOINT* geography_centroid_from_mpoly(const LWMPOLY* mpoly, bool use_spheroid,
        uint32_t i, ir, ip;
     for (ip = 0; ip < mpoly->ngeoms; ip++) {
                for (ir = 0; ir < mpoly->geoms[ip]->nrings; ir++) {
-               size += mpoly->geoms[ip]->rings[ir]->npoints;
+               size += mpoly->geoms[ip]->rings[ir]->npoints - 1;
                }
     }
 

diff --git a/regress/geography_centroid_expected b/regress/geography_centroid_expected
index 0701e361effb77cd568df47f4d05df979693511b..90375538eecb53060eb6e6e7c32de3945fa50acb 100644 (file)
--- a/regress/geography_centroid_expected
+++ b/regress/geography_centroid_expected
@@ -10,4 +10,4 @@ geog_centroid_sup_pt|0101000020E610000000000000000037400000000000004540
 geog_centroid_sup_line|0101000020E6100000753A468ED7B21CC00371ADA1B0AC4440
 geog_centroid_sup_mline|0101000020E61000009809DA1111101440C8CB7BE13F784540
 geog_centroid_sup_poly|0101000020E610000032ABE2FEB2DB25407A5DAC8D5A574940
-geog_centroid_sup_mpoly|0101000020E610000028B38B0AF4FFFFFF28B38B0AF4FFFFFF
+geog_centroid_sup_mpoly|0101000020E6100000AA6CB8CF16543C40828564C8CE403940