Changeset: 9bc70feccecb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9bc70feccecb
Modified Files:
geom/monetdb5/geom.h
geom/monetdb5/geomBulk.c
Branch: geo-update
Log Message:
fixes for compiling without proj library
diffs (30 lines):
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -169,12 +169,14 @@ geom_export str wkbGeometryN_bat(bat *ou
geom_export str wkbNumGeometries(int* out, wkb** geom);
geom_export str wkbNumGeometries_bat(bat *outBAT_id, bat *inBAT_id);
+#ifdef HAVE_PROJ
str transformPoint(GEOSGeometry **transformedGeometry, const GEOSGeometry
*geosGeometry, PJ *P);
str transformLine(GEOSCoordSeq *gcs_new, const GEOSGeometry *geosGeometry, PJ
*P);
str transformLineString(GEOSGeometry **transformedGeometry, const GEOSGeometry
*geosGeometry, PJ *P);
str transformLinearRing(GEOSGeometry **transformedGeometry, const GEOSGeometry
*geosGeometry, PJ *P);
str transformPolygon(GEOSGeometry **transformedGeometry, const GEOSGeometry
*geosGeometry, PJ *P, int srid);
str transformMultiGeometry(GEOSGeometry **transformedGeometry, const
GEOSGeometry *geosGeometry, PJ *P, int srid, int geometryType);
+#endif
geom_export str wkbTransform(wkb**, wkb**, int*, int*, char**, char**);
geom_export str wkbTransform_bat(bat *outBAT_id, bat *inBAT_id, int *srid_src,
int *srid_dst, char **proj4_src_str, char **proj4_dst_str);
geom_export str wkbTransform_bat_cand(bat *outBAT_id, bat *inBAT_id, bat
*s_id, int *srid_src, int *srid_dst, char **proj4_src_str, char
**proj4_dst_str);
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -692,7 +692,7 @@ str
wkbTransform_bat_cand(bat *outBAT_id, bat *inBAT_id, bat *s_id, int *srid_src,
int *srid_dst, char **proj4_src_str, char **proj4_dst_str)
{
#ifndef HAVE_PROJ
- *outBAT_id = NULL;
+ *outBAT_id = 0;
(void) inBAT_id;
(void) s_id;
(void) srid_src;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
