[postgis-tickets] r17492 - Hide gserialized_peek_gbox_p() inside gserialized_read_gbox_p()

[Paul Ramsey]

Author: pramsey
Date: 2019-06-11 09:30:46 -0700 (Tue, 11 Jun 2019)
New Revision: 17492

Modified:
   trunk/liblwgeom/g_serialized.c
   trunk/postgis/lwgeom_out_mvt.c
Log:
Hide gserialized_peek_gbox_p() inside gserialized_read_gbox_p()


Modified: trunk/liblwgeom/g_serialized.c
===================================================================
--- trunk/liblwgeom/g_serialized.c	2019-06-11 15:42:03 UTC (rev 17491)
+++ trunk/liblwgeom/g_serialized.c	2019-06-11 16:30:46 UTC (rev 17492)
@@ -465,8 +465,12 @@
 		}
 		return LW_SUCCESS;
 	}
-
-	return LW_FAILURE;
+	else
+	{
+		/* Read directly off coordinates for  */
+		/* simple (point, 2-point line) cases */
+		return gserialized_peek_gbox_p(g, gbox);
+	}
 }
 
 /*

Modified: trunk/postgis/lwgeom_out_mvt.c
===================================================================
--- trunk/postgis/lwgeom_out_mvt.c	2019-06-11 15:42:03 UTC (rev 17491)
+++ trunk/postgis/lwgeom_out_mvt.c	2019-06-11 16:30:46 UTC (rev 17492)
@@ -89,8 +89,7 @@
 	{
 		GBOX gserialized_box;
 		/* We only apply the optimization if the bounding box is available */
-		if ((gserialized_read_gbox_p(geom_in, &gserialized_box) == LW_SUCCESS) ||
-		    (gserialized_peek_gbox_p(geom_in, &gserialized_box) == LW_SUCCESS))
+		if (gserialized_read_gbox_p(geom_in, &gserialized_box) == LW_SUCCESS)
 		{
 			/* Shortcut to drop geometries smaller than the resolution */
 			double geom_width = gserialized_box.xmax - gserialized_box.xmin;