[GRASS-SVN] r56416 - grass/trunk/vector/v.label.sa

[svn_grass at osgeo.org]

Author: neteler
Date: 2013-05-25 12:59:06 -0700 (Sat, 25 May 2013)
New Revision: 56416

Modified:
   grass/trunk/vector/v.label.sa/Makefile
   grass/trunk/vector/v.label.sa/labels.c
Log:
v.label.sa: DIG2LIB,GRAPHLIB used; free_freetypecap() -> free_fontcap() since r34923; still not compiling

Modified: grass/trunk/vector/v.label.sa/Makefile
===================================================================
--- grass/trunk/vector/v.label.sa/Makefile	2013-05-25 19:43:37 UTC (rev 56415)
+++ grass/trunk/vector/v.label.sa/Makefile	2013-05-25 19:59:06 UTC (rev 56416)
@@ -3,8 +3,8 @@
 
 PGM = v.label.sa
 
-LIBES = $(DISPLAYLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(FTLIB)
-DEPENDENCIES= $(DISPLAYDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
+LIBES = $(DISPLAYLIB) $(DIG2LIB) $(GRAPHLIB) $(VECTORLIB) $(DBMILIB) $(GISLIB) $(FTLIB)
+DEPENDENCIES= $(DISPLAYDEP) $(DIG2DEP) $(GRAPHDEP) $(VECTORDEP) $(DBMIDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(FTINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 

Modified: grass/trunk/vector/v.label.sa/labels.c
===================================================================
--- grass/trunk/vector/v.label.sa/labels.c	2013-05-25 19:43:37 UTC (rev 56415)
+++ grass/trunk/vector/v.label.sa/labels.c	2013-05-25 19:59:06 UTC (rev 56416)
@@ -95,7 +95,7 @@
     else if (error)
 	G_fatal_error(_("Font file can not be loaded"));
     p->font->answer = G_store(font_cap->name);
-    free_freetypecap(font_cap);
+    free_fontcap(font_cap);
 
     font_size = atof(p->size->answer);
     buffer = atof(p->isize->answer);