[GRASS-SVN] r33005 - grass/branches/develbranch_6/vector/v.label.sa

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-08-22 11:54:05 -0400 (Fri, 22 Aug 2008)
New Revision: 33005

Modified:
   grass/branches/develbranch_6/vector/v.label.sa/Makefile
   grass/branches/develbranch_6/vector/v.label.sa/annealing.c
   grass/branches/develbranch_6/vector/v.label.sa/main.c
Log:
glynn: Don't use C++/C99 comments in GRASS
(merge from devbr6, r33004)


Modified: grass/branches/develbranch_6/vector/v.label.sa/Makefile
===================================================================
--- grass/branches/develbranch_6/vector/v.label.sa/Makefile	2008-08-22 15:48:53 UTC (rev 33004)
+++ grass/branches/develbranch_6/vector/v.label.sa/Makefile	2008-08-22 15:54:05 UTC (rev 33005)
@@ -6,7 +6,7 @@
 LIBES = $(DISPLAYLIB) $(RASTERLIB) $(VECTLIB) $(GISLIB) $(FTLIB)
 DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(FTINC)
-EXTRA_CFLAGS = $(VECT_CFLAGS) -Wall -Wmissing-prototypes -std=c99
+EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 

Modified: grass/branches/develbranch_6/vector/v.label.sa/annealing.c
===================================================================
--- grass/branches/develbranch_6/vector/v.label.sa/annealing.c	2008-08-22 15:48:53 UTC (rev 33004)
+++ grass/branches/develbranch_6/vector/v.label.sa/annealing.c	2008-08-22 15:54:05 UTC (rev 33005)
@@ -197,7 +197,7 @@
 	if (ol->current_candidate == oc) {
 	    ol->current_score -= LABEL_OVERLAP_WEIGHT;
 	    label->current_score -= LABEL_OVERLAP_WEIGHT;
-	    //          ol->candidates[oc].score -= LABEL_OVERLAP_WEIGHT;
+	    /* ol->candidates[oc].score -= LABEL_OVERLAP_WEIGHT; */
 	    overlaps_removed++;
 	}
     }
@@ -212,7 +212,7 @@
 	if (ol->current_candidate == oc) {
 	    ol->current_score += LABEL_OVERLAP_WEIGHT;
 	    label->current_score += LABEL_OVERLAP_WEIGHT;
-	    //          ol->candidates[oc]->score += 40;
+	    /* ol->candidates[oc]->score += 40; */
 	    overlaps_created++;
 	}
     }

Modified: grass/branches/develbranch_6/vector/v.label.sa/main.c
===================================================================
--- grass/branches/develbranch_6/vector/v.label.sa/main.c	2008-08-22 15:48:53 UTC (rev 33004)
+++ grass/branches/develbranch_6/vector/v.label.sa/main.c	2008-08-22 15:54:05 UTC (rev 33005)
@@ -46,7 +46,6 @@
     module->description =
 	_("Create optimally placed labels for vector map(s)");
 
-    //    fprintf(stderr, "Parsing options and flags\n");
     /* parse options and flags */
     parse_args(argc, argv, &p);
 
@@ -245,8 +244,8 @@
 
     fprintf(labelf, "east: %lf\n", label->candidates[cc].point.x);
     fprintf(labelf, "north: %lf\n", label->candidates[cc].point.y);
-    fprintf(labelf, "xoffset: %lf\n", 0.0);	// * (size));
-    fprintf(labelf, "yoffset: %lf\n", 0.0);	// * (size));
+    fprintf(labelf, "xoffset: %lf\n", 0.0);	/*  * (size)); */
+    fprintf(labelf, "yoffset: %lf\n", 0.0);	/*  * (size)); */
     fprintf(labelf, "ref: %s\n", "bottom left");
 
     fprintf(labelf, "font: %s\n", p->font->answer);