[GRASS-SVN] r49374 - in grass/branches/develbranch_6: include lib/ogsf

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Nov 26 18:48:12 EST 2011


Author: martinl
Date: 2011-11-26 15:48:12 -0800 (Sat, 26 Nov 2011)
New Revision: 49374

Modified:
   grass/branches/develbranch_6/include/ogsf_proto.h
   grass/branches/develbranch_6/lib/ogsf/gsd_objs.c
Log:
ogsflib: add missing declaration for gsd_scalebar_v2() - see r49357


Modified: grass/branches/develbranch_6/include/ogsf_proto.h
===================================================================
--- grass/branches/develbranch_6/include/ogsf_proto.h	2011-11-26 23:34:24 UTC (rev 49373)
+++ grass/branches/develbranch_6/include/ogsf_proto.h	2011-11-26 23:48:12 UTC (rev 49374)
@@ -505,6 +505,7 @@
 int gsd_arrow_onsurf(float *, float *, unsigned long, int, geosurf *);
 void gsd_3darrow(float *, unsigned long, float, float, float *, float);
 int gsd_scalebar(float *, float, GLuint, unsigned long, unsigned long);
+int gsd_scalebar_v2(float *, float, GLuint, unsigned long, unsigned long);
 void primitive_cone(unsigned long);
 void primitive_cylinder(unsigned long, int);
 

Modified: grass/branches/develbranch_6/lib/ogsf/gsd_objs.c
===================================================================
--- grass/branches/develbranch_6/lib/ogsf/gsd_objs.c	2011-11-26 23:34:24 UTC (rev 49373)
+++ grass/branches/develbranch_6/lib/ogsf/gsd_objs.c	2011-11-26 23:48:12 UTC (rev 49374)
@@ -1246,7 +1246,7 @@
    \return 1
  */
 int gsd_scalebar_v2(float *pos, float len, GLuint fontbase,
-		 unsigned long bar_clr, unsigned long text_clr)
+		    unsigned long bar_clr, unsigned long text_clr)
 {
     float base[6][3];
     float Ntop[] = { 0.0, 0.0, 1.0 };



More information about the grass-commit mailing list