Changeset: 90754e8791e1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=90754e8791e1
Modified Files:
geom/monetdb5/geom.mx
Branch: Aug2011
Log Message:
geom: Check for errors differently.
When geos calls fail, they call GDKerror through a callback
mechanism. Instead of checking return values, we now check whether
GDKerror was called.
This is because in geos-3.3.0, the function GEOSGeom_getDimensions now
legitimately returns 0 which previously was only returned in the case
of error.
diffs (15 lines):
diff --git a/geom/monetdb5/geom.mx b/geom/monetdb5/geom.mx
--- a/geom/monetdb5/geom.mx
+++ b/geom/monetdb5/geom.mx
@@ -1104,10 +1104,8 @@ wkb@1( @2 *out, wkb **geom)
GEOSGeom_destroy(geosGeometry);
-#if @6
- if (*out == @5)
+ if (GDKerrbuf && GDKerrbuf[0])
throw(MAL, "geom.@1", "@3 failed");
-#endif
return MAL_SUCCEED;
}
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list