[postgis-commits] svn - r2840 - trunk/liblwgeom

[postgis-commits at postgis.refractions.net]

Author: mcayland
Date: 2008-07-13 04:09:34 -0700 (Sun, 13 Jul 2008)
New Revision: 2840

Modified:
   trunk/liblwgeom/lwgunparse.c
Log:
Add some additional LWDEBUG(F) statements for debugging that I missed the first time around with the new debugging infrastructure

Modified: trunk/liblwgeom/lwgunparse.c
===================================================================
--- trunk/liblwgeom/lwgunparse.c	2008-07-13 10:50:56 UTC (rev 2839)
+++ trunk/liblwgeom/lwgunparse.c	2008-07-13 11:09:34 UTC (rev 2840)
@@ -243,9 +243,7 @@
 uchar *output_compound(uchar* geom, int suppress) {
         unsigned type;
 
-#ifdef PGIS_DEBUG_CALLS
-        lwnotice("output_compound called.");
-#endif
+        LWDEBUG(2, "output_compound called.");
 
         type=*geom++;
         switch(TYPE_GETTYPE(type)) 
@@ -264,9 +262,7 @@
 uchar *output_multisurface(uchar* geom, int suppress) {
         unsigned type;
 
-#ifdef PGIS_DEBUG_CALLS
-        lwnotice("output_multisurface called.");
-#endif
+        LWDEBUG(2, "output_multisurface called.");
 
         type=*geom++;
         switch(TYPE_GETTYPE(type))
@@ -295,9 +291,7 @@
 	char writeM=0;
 	dims = TYPE_NDIMS(type); /* ((type & 0x30) >> 4)+2; */
 
-#ifdef PGIS_DEBUG_CALLS
-        lwnotice("output_wkt called.");
-#endif
+        LWDEBUG(2, "output_wkt called.");
 
 	if ( ! supress && !TYPE_HASZ(type) && TYPE_HASM(type) ) writeM=1;
 
@@ -448,9 +442,7 @@
 unparse_WKT(uchar* serialized, allocator alloc, freeor free)
 {
 
-#ifdef PGIS_DEBUG_CALLS
-        lwnotice("unparse_WKT called.");
-#endif
+        LWDEBUG(2, "unparse_WKT called.");
 
 	if (serialized==NULL)
 		return NULL;
@@ -560,9 +552,9 @@
 output_wkb_collection(uchar* geom,outwkbfunc func)
 {
 	int cnt = read_int(&geom);
-#ifdef PGIS_DEBUG
-	lwnotice("output_wkb_collection: %d iterations loop", cnt);
-#endif
+
+	LWDEBUGF(2, "output_wkb_collection: %d iterations loop", cnt);
+
 	write_wkb_int(cnt);
 	while(cnt--) geom=func(geom);
 	return geom;
@@ -580,10 +572,9 @@
 	int4 wkbtype;
 
 	dims = TYPE_NDIMS(type); 
-#ifdef PGIS_DEBUG
-	lwnotice("output_wkb: dims set to %d", dims);
-#endif
 
+	LWDEBUGF(2, "output_wkb: dims set to %d", dims);
+
 	/* Skip the bounding box */
 	if ( TYPE_HASBBOX(type) ) { 
 		geom+=16;
@@ -667,9 +658,7 @@
 char *
 unparse_WKB(uchar* serialized, allocator alloc, freeor free, char endian, size_t *outsize, uchar hex)
 {
-#ifdef PGIS_DEBUG
-	lwnotice("unparse_WKB(%p,...) called", serialized);
-#endif
+	LWDEBUGF(2, "unparse_WKB(%p,...) called", serialized);
 
 	if (serialized==NULL)
 		return NULL;