Add LWDEBUGG macro in lwgeom_log.h

git-svn-id: http://svn.osgeo.org/postgis/trunk@14963 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/liblwgeom/lwgeom_log.h b/liblwgeom/lwgeom_log.h
index af581b95566b3e8556d4c48b76694e0840e90984..78e701401cb965ac21c7580cb75981b0ae956570 100644 (file)
--- a/liblwgeom/lwgeom_log.h
+++ b/liblwgeom/lwgeom_log.h
@@ -52,6 +52,18 @@
                 __FILE__, __func__, __LINE__, __VA_ARGS__); \
         } while (0);
 
+/* Display a notice and a WKT representation of a geometry
+ * at the given debug level */
+#define LWDEBUGG(level, geom, msg) \
+  if (POSTGIS_DEBUG_LEVEL >= level) \
+  do { \
+    size_t sz; \
+    char *wkt = lwgeom_to_wkt(geom, WKT_EXTENDED, 15, &sz); \
+    /* char *wkt = lwgeom_to_hexwkb(geom, WKT_EXTENDED, &sz); */ \
+    LWDEBUGF(level, msg ": %s", wkt); \
+    lwfree(wkt); \
+  } while (0);
+
 #else /* POSTGIS_DEBUG_LEVEL <= 0 */
 
 /* Empty prototype that can be optimised away by the compiler
@@ -64,6 +76,11 @@
 #define LWDEBUGF(level, msg, ...) \
         ((void) 0)
 
+/* Empty prototype that can be optimised away by the compiler
+ * for non-debug builds */
+#define LWDEBUGG(level, geom, msg) \
+        ((void) 0)
+
 #endif /* POSTGIS_DEBUG_LEVEL <= 0 */
 
 /**

diff --git a/liblwgeom/lwgeom_topo.c b/liblwgeom/lwgeom_topo.c
index 1aa7e11bd48c666c270f1040f8c5ec3edae9bf72..5297c11ff0c7254c2370fbd67bbf096eee8a783f 100644 (file)
--- a/liblwgeom/lwgeom_topo.c
+++ b/liblwgeom/lwgeom_topo.c
@@ -44,18 +44,6 @@
 # define LWTFMT_ELEMID PRId64
 #endif
 
-/* TODO: move this to lwgeom_log.h */
-#define LWDEBUGG(level, geom, msg) \
-  if (POSTGIS_DEBUG_LEVEL >= level) \
-  do { \
-    size_t sz; \
-    char *wkt1 = lwgeom_to_wkt(geom, WKT_EXTENDED, 15, &sz); \
-    /* char *wkt1 = lwgeom_to_hexwkb(geom, WKT_EXTENDED, &sz); */ \
-    LWDEBUGF(level, msg ": %s", wkt1); \
-    lwfree(wkt1); \
-  } while (0);
-
-
 /*********************************************************************
  *
  * Backend iface