[mapserver-commits] r13174 - sandbox/tb-labels

[svn at osgeo.org]

Author: sdlime
Date: 2012-02-25 08:04:34 -0800 (Sat, 25 Feb 2012)
New Revision: 13174

Modified:
   sandbox/tb-labels/mapdraw.c
Log:
Added signatures for a couple of functions that willproperly compute marker bbox and a corresponding label offset. This will fine tune computations that are already done but don't take into account multiple styles or style offsets.

Modified: sandbox/tb-labels/mapdraw.c
===================================================================
--- sandbox/tb-labels/mapdraw.c	2012-02-25 12:30:26 UTC (rev 13173)
+++ sandbox/tb-labels/mapdraw.c	2012-02-25 16:04:34 UTC (rev 13174)
@@ -2595,6 +2595,20 @@
    return retval;
 }
 
+/*
+** Computes a marker rect relative to a point for a class and (potentially) multiple styles.
+*/
+static void getMarkerRect(classObj *class, pointObj *point, rectObj *rect) {
+  int i;
+}
+
+/*
+** Computes the offset for a label position so there is no conflict with the underlying marker.
+*/
+static void getLabelMarkerOffet(rectObj *r, int position, double *offset_x, double *offset_y) {
+
+} 
+
 int msDrawLabelCache(imageObj *image, mapObj *map)
 {
   int nReturnVal = MS_SUCCESS;