From a15d906c1d178275ea9a3ba5593e4da648af22dc Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Mon, 13 Jun 2011 21:31:49 +0000 Subject: [PATCH] Move from GSERIALIZED off by default to on by default. Adjust minor regression changes as necessary. git-svn-id: http://svn.osgeo.org/postgis/trunk@7389 b70326c6-7e19-0410-871a-916f4a2858ee --- postgis/gserialized.h | 2 +- regress/dump_expected | 2 +- regress/lwgeom_regress_expected | 10 +++++----- regress/regress_expected | 6 +++--- regress/sql-mm-circularstring_expected | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/postgis/gserialized.h b/postgis/gserialized.h index d50e3f8b4..24d5b0510 100644 --- a/postgis/gserialized.h +++ b/postgis/gserialized.h @@ -1,3 +1,3 @@ -#undef GSERIALIZED_ON +#define GSERIALIZED_ON diff --git a/regress/dump_expected b/regress/dump_expected index 2cb883ee5..9f8738033 100644 --- a/regress/dump_expected +++ b/regress/dump_expected @@ -15,4 +15,4 @@ t9|{3}|POLYGON((0 0,0 1,1 1,0 0)) t9|{4}|POLYGON((0 0,0 9,9 9,9 0,0 0),(5 5,5 6,6 6,5 5)) t9|{5,1}|POLYGON((0 0,0 9,9 9,9 0,0 0),(5 5,5 6,6 6,5 5)) t10|0 -t11|2 +t11|3 diff --git a/regress/lwgeom_regress_expected b/regress/lwgeom_regress_expected index 02f0a9daa..aafdbafde 100644 --- a/regress/lwgeom_regress_expected +++ b/regress/lwgeom_regress_expected @@ -1,7 +1,7 @@ BOX(0 0.1,11 12) BOX3D(0 0.1 -55,11 12 12) -10431 -15063 -19695 -15063 -10431 +11184 +15824 +20464 +15824 +11184 diff --git a/regress/regress_expected b/regress/regress_expected index 967e3a80c..4a736698b 100644 --- a/regress/regress_expected +++ b/regress/regress_expected @@ -133,7 +133,7 @@ HINT: "MULTIPOINT(1 1, 2 2" <-- parse error at position 19 within geometry 108|2 109|4 110|6 -111|528 +111|552 112|3 121|BOX3D(1.19894826 1.20265412 0,999.932129 999.692932 0)|BOX3D(1.40486765 1.3484304 0,999.857666 999.936401 0) 122|f @@ -143,7 +143,7 @@ HINT: "MULTIPOINT(1 1, 2 2" <-- parse error at position 19 within geometry 126|f 127|f 128|f -129|34009|34009 +129|48016|48016 131|1 132|2 133| @@ -183,7 +183,7 @@ ERROR: Input geometries must be points 164|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 1)) ERROR: geometry contains non-closed rings HINT: "...(0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0.1 1)" <-- parse error at position 45 within geometry -166|MULTIPOINT EMPTY +166|POINT EMPTY 167|LINESTRING EMPTY 168|POLYGON EMPTY 169|CIRCULARSTRING EMPTY diff --git a/regress/sql-mm-circularstring_expected b/regress/sql-mm-circularstring_expected index c73ebdfd7..ab0de42e0 100644 --- a/regress/sql-mm-circularstring_expected +++ b/regress/sql-mm-circularstring_expected @@ -108,5 +108,5 @@ public.circularstring.the_geom_4d effectively removed. public.circularstring.the_geom_3dz effectively removed. public.circularstring.the_geom_3dm effectively removed. public.circularstring.the_geom_2d effectively removed. -POLYGON((220187.375 150406.421875,220187.375 150506.71875,220288.828125 150506.71875,220288.828125 150406.421875,220187.375 150406.421875)) +POLYGON((220187.382089758 150406.434743975,220187.382089758 150506.717070259,220288.81590723 150506.717070259,220288.81590723 150406.434743975,220187.382089758 150406.434743975)) npoints_is_null| -- 2.50.1