Fix MEOS build (MobilityDB#625)

mschoema · Oct 9, 2024 · 938ec62 · 938ec62
1 parent d57fa08
commit 938ec62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/meos/include/general/type_round.h b/meos/include/general/type_round.h
@@ -46,15 +46,14 @@
 
 extern double float_round(double d, int maxdd);
 extern Datum datum_round_float(Datum value, Datum size);
-
 extern Datum datum_round_geo(Datum value, Datum size);
-
-
+#if NPOINT
 extern Datum datum_npoint_round(Datum npoint, Datum size);
 extern Npoint *npoint_round(const Npoint *np, int maxdd);
 extern Nsegment *nsegment_round(const Nsegment *ns, int maxdd);
 extern Set *npointset_round(const Set *s, int maxdd);
 extern Temporal *tnpoint_round(const Temporal *temp, Datum size);
+#endif /* NPOINT */
 
 
 /*****************************************************************************/

diff --git a/meos/src/point/pgis_types.c b/meos/src/point/pgis_types.c
@@ -1826,11 +1826,11 @@ geo_out(const GSERIALIZED *gs)
 
 #if MEOS || DEBUG_BUILD
 /**
+ * @ingroup meos_pgis_types
  * @brief Return a geometry/geography from its WKT representation (and
  * optionally a SRID)
  * @param[in] wkt WKT string
  * @param[in] srid SRID
- * @param[in] geography True if it is a geometry
  */
 GSERIALIZED *
 geo_from_text(char *wkt, int srid)
@@ -2319,7 +2319,7 @@ geog_from_binary(const char *wkb_bytea)
   /* Error on any SRID != default */
   // srid_check_latlong(lwgeom->srid);
 
-  GSERIALIZED *result = geography_serialize(geom, -1);
+  GSERIALIZED *result = geo_serialize(geom);
   lwgeom_free(geom);
   return result;
 }