Changeset: dc010fa32a4b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc010fa32a4b
Modified Files:
geom/monetdb5/geom.c
geom/monetdb5/geom.h
Branch: tracer
Log Message:
Removed DEBUG_GEOM directive
diffs (50 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -904,9 +904,8 @@ segmentizeLineString(GEOSGeometry **outG
//compute the distance of the current point to the last added
one
while ((dist = sqrt(pow(xl - xCoords_org[i], 2) + pow(yl -
yCoords_org[i], 2) + pow(zl - zCoords_org[i], 2))) > sz) {
-#ifdef DEBUG_GEOM
DEBUG(GEOM, "Old : (%f, %f, %f) vs (%f, %f, %f) =
%f\n", xl, yl, zl, xCoords_org[i], yCoords_org[i], zCoords_org[i], dist);
-#endif
+
additionalPoints++;
//compute the point
xl = xl + (xCoords_org[i] - xl) * sz / dist;
@@ -954,10 +953,8 @@ segmentizeLineString(GEOSGeometry **outG
//compute the distance of the current point to the last added
one
double dist;
while ((dist = sqrt(pow(xl - xCoords_org[i], 2) + pow(yl -
yCoords_org[i], 2) + pow(zl - zCoords_org[i], 2))) > sz) {
-
-#ifdef DEBUG_GEOM
DEBUG(GEOM, "Old: (%f, %f, %f) vs (%f, %f, %f) = %f\n",
xl, yl, zl, xCoords_org[i], yCoords_org[i], zCoords_org[i], dist);
-#endif
+
assert(j < additionalPoints);
//compute intermediate point
@@ -2397,11 +2394,7 @@ wkbAsBinary(char **toStr, wkb **geomWKB)
*s++ = hexit[val];
val = (*geomWKB)->data[i] & 0xf;
*s++ = hexit[val];
-
- #ifdef DEBUG_GEOM
DEBUG(GEOM, "%d: First: %c - Second: %c ==> Original %c
(%d)\n", i, *(s-2), *(s-1), (*geomWKB)->data[i], (int)((*geomWKB)->data[i]));
- #endif
-
}
*s = '\0';
return MAL_SUCCEED;
diff --git a/geom/monetdb5/geom.h b/geom/monetdb5/geom.h
--- a/geom/monetdb5/geom.h
+++ b/geom/monetdb5/geom.h
@@ -35,8 +35,6 @@
#define geom_export extern
#endif
-/* #define DEBUG_GEOM */
-
/* general functions */
geom_export str geoHasZ(int* res, int* info);
geom_export str geoHasM(int* res, int* info);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
