[GRASS-SVN] r61828 - in grass-addons/grass6: general/g.xremove imagery/i.homography imagery/i.linespoints imagery/i.points.auto imagery/i.spec.sam raster/r.boxcount raster/r.mcda.electre raster/r.mcda.fuzzy raster/r.mcda.regime raster/r.roughset
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Sep 7 06:54:13 PDT 2014
Author: neteler
Date: 2014-09-07 06:54:13 -0700 (Sun, 07 Sep 2014)
New Revision: 61828
Added:
grass-addons/grass6/imagery/i.homography/local_proto.h
grass-addons/grass6/imagery/i.spec.sam/local_proto.h
Modified:
grass-addons/grass6/general/g.xremove/Makefile
grass-addons/grass6/general/g.xremove/main.c
grass-addons/grass6/imagery/i.homography/Makefile
grass-addons/grass6/imagery/i.homography/main.c
grass-addons/grass6/imagery/i.homography/open.c
grass-addons/grass6/imagery/i.linespoints/Makefile
grass-addons/grass6/imagery/i.linespoints/analyze.c
grass-addons/grass6/imagery/i.linespoints/ask.c
grass-addons/grass6/imagery/i.linespoints/ask_mag.c
grass-addons/grass6/imagery/i.linespoints/call.c
grass-addons/grass6/imagery/i.linespoints/colors.c
grass-addons/grass6/imagery/i.linespoints/debug.c
grass-addons/grass6/imagery/i.linespoints/defs.h
grass-addons/grass6/imagery/i.linespoints/dot.c
grass-addons/grass6/imagery/i.linespoints/drawcell.c
grass-addons/grass6/imagery/i.linespoints/graphics.c
grass-addons/grass6/imagery/i.linespoints/input.c
grass-addons/grass6/imagery/i.linespoints/main.c
grass-addons/grass6/imagery/i.linespoints/mark.c
grass-addons/grass6/imagery/i.linespoints/mouse.c
grass-addons/grass6/imagery/i.linespoints/points.c
grass-addons/grass6/imagery/i.linespoints/title.c
grass-addons/grass6/imagery/i.linespoints/view.c
grass-addons/grass6/imagery/i.linespoints/zoom_box.c
grass-addons/grass6/imagery/i.linespoints/zoom_pnt.c
grass-addons/grass6/imagery/i.points.auto/line.c
grass-addons/grass6/imagery/i.spec.sam/main.c
grass-addons/grass6/raster/r.boxcount/main.c
grass-addons/grass6/raster/r.mcda.electre/local_proto.h
grass-addons/grass6/raster/r.mcda.fuzzy/local_proto.h
grass-addons/grass6/raster/r.mcda.regime/local_proto.h
grass-addons/grass6/raster/r.roughset/rules_extr.c
Log:
GRASS 6 Addons: some compiler fixes for http://grass.osgeo.org/addons/grass6/logs/
Modified: grass-addons/grass6/general/g.xremove/Makefile
===================================================================
--- grass-addons/grass6/general/g.xremove/Makefile 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/general/g.xremove/Makefile 2014-09-07 13:54:13 UTC (rev 61828)
@@ -4,6 +4,8 @@
LIBES = $(GISLIB) $(VECTLIB) $(G3DLIB)
DEPENDENCIES = $(GISDEP) $(VECTDEP) $(G3DDEP)
+EXTRA_INC = $(VECT_INC)
+EXTRA_CFLAGS = $(VECT_CFLAGS)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass-addons/grass6/general/g.xremove/main.c
===================================================================
--- grass-addons/grass6/general/g.xremove/main.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/general/g.xremove/main.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -27,6 +27,7 @@
#define MAIN
#include <stdlib.h>
+#include <unistd.h>
#include <regex.h>
#include "global.h"
Modified: grass-addons/grass6/imagery/i.homography/Makefile
===================================================================
--- grass-addons/grass6/imagery/i.homography/Makefile 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.homography/Makefile 2014-09-07 13:54:13 UTC (rev 61828)
@@ -2,12 +2,10 @@
PGM = i.homography
-LIBES = $(GPROJLIB) $(GISLIB)
-DEPENDENCIES = $(GPROJDEP) $(GISDEP)
EXTRA_INC = $(PROJINC)
-LIBES = $(IMAGERYLIB) $(GPROJLIB) $(GISLIB) $(VASKLIB) $(CURSES) $(GMATHLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GPROJDEP) $(GISDEP) $(VASKDEP) $(GMATHDEP)
+LIBES = $(IMAGERYLIB) $(GPROJLIB) $(GISLIB) $(GMATHLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GPROJDEP) $(GISDEP) $(GMATHDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Added: grass-addons/grass6/imagery/i.homography/local_proto.h
===================================================================
--- grass-addons/grass6/imagery/i.homography/local_proto.h (rev 0)
+++ grass-addons/grass6/imagery/i.homography/local_proto.h 2014-09-07 13:54:13 UTC (rev 61828)
@@ -0,0 +1 @@
+double brent_iterate(double (*f) (), double, double, int);
Modified: grass-addons/grass6/imagery/i.homography/main.c
===================================================================
--- grass-addons/grass6/imagery/i.homography/main.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.homography/main.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -24,9 +24,11 @@
#include <unistd.h>
#include <math.h>
#include <grass/gis.h>
+#include <grass/gmath.h>
#include <grass/imagery.h>
#include <grass/gprojects.h>
#include "global.h"
+#include "local_proto.h"
/* #define DEBUG 1 */
Modified: grass-addons/grass6/imagery/i.homography/open.c
===================================================================
--- grass-addons/grass6/imagery/i.homography/open.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.homography/open.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -6,6 +6,7 @@
open new raster maps
*/
+#include <stdlib.h>
#include <grass/gis.h>
int open_new_CELL(name)
Modified: grass-addons/grass6/imagery/i.linespoints/Makefile
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/Makefile 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/Makefile 2014-09-07 13:54:13 UTC (rev 61828)
@@ -2,14 +2,11 @@
PGM = i.linespoints
-# grass5
-#LIBES = $(IMAGERYLIB) $(D_LIB) $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(VASKLIB) $(CURSES) $(GMATHLIB)
-#DEPENDENCIES= $(IMAGERYDEP) $(D_DEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(VASKDEP) $(GMATHDEP)
-#default: inter
-LIBES = $(IMAGERYLIB) $(GMATHLIB) $(D_LIB) $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(VASKLIB) $(CURSES) $(FFTWLIB)
-DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(D_DEP) $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(VASKDEP)
+LIBES = $(IMAGERYLIB) $(GMATHLIB) $(D_LIB) $(DISPLAYLIB) $(GISLIB) $(VASKLIB) $(CURSES) $(FFTWLIB)
+DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(D_DEP) $(DISPLAYDEP) $(GISDEP) $(VASKDEP)
+
include $(MODULE_TOPDIR)/include/Make/Module.make
default: cmd
Modified: grass-addons/grass6/imagery/i.linespoints/analyze.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/analyze.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/analyze.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -2,7 +2,7 @@
#include <unistd.h>
#include <math.h>
#include <stdlib.h>
-#include "raster.h"
+#include <grass/raster.h>
#include "globals.h"
#include "local_proto.h"
#define NLINES 18
Modified: grass-addons/grass6/imagery/i.linespoints/ask.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/ask.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/ask.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include <string.h>
#include <stdlib.h>
-#include "raster.h"
+#include <grass/raster.h>
#include "globals.h"
#include "local_proto.h"
#define NLINES 18
Modified: grass-addons/grass6/imagery/i.linespoints/ask_mag.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/ask_mag.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/ask_mag.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
struct box
{
Modified: grass-addons/grass6/imagery/i.linespoints/call.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/call.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/call.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -3,7 +3,7 @@
#include <sys/wait.h>
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
/*
* call a subroutine, but as a child process
* allowing interrupts for the child
Modified: grass-addons/grass6/imagery/i.linespoints/colors.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/colors.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/colors.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "gis.h"
-#include "display.h"
-#include "D.h"
+#include <grass/display>
+#include <grass/D.h>
int
set_colors (struct Colors *colors)
{
Modified: grass-addons/grass6/imagery/i.linespoints/debug.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/debug.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/debug.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,7 +1,7 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
int
debug (char *msg)
{
Modified: grass-addons/grass6/imagery/i.linespoints/defs.h
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/defs.h 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/defs.h 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,4 +1,4 @@
-#include "imagery.h"
+#include <grass/imagery.h>
#include <curses.h>
/* this is a curses structure */
Modified: grass-addons/grass6/imagery/i.linespoints/dot.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/dot.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/dot.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include "raster.h"
+#include <grass/raster.h>
int
dot (int x, int y)
{
Modified: grass-addons/grass6/imagery/i.linespoints/drawcell.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/drawcell.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/drawcell.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include "globals.h"
-#include "display.h"
-#include "raster.h"
+#include <grass/display>
+#include <grass/raster.h>
#include "local_proto.h"
int drawcell(View *view)
Modified: grass-addons/grass6/imagery/i.linespoints/graphics.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/graphics.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/graphics.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,8 +1,8 @@
#include "globals.h"
#include "local_proto.h"
-#include "display.h"
-#include "D.h"
-#include "raster.h"
+#include <grass/display.h>
+#include <grass/D.h>
+#include <grass/raster.h>
static View *
makeview (double bottom, double top, double left, double right)
Modified: grass-addons/grass6/imagery/i.linespoints/input.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/input.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/input.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
#include <strings.h>
static int active = 0;
Modified: grass-addons/grass6/imagery/i.linespoints/main.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/main.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/main.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -24,7 +24,7 @@
#include <signal.h>
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
#ifdef __GNUC_MINOR__
int quit (int) __attribute__ ((__noreturn__));
Modified: grass-addons/grass6/imagery/i.linespoints/mark.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/mark.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/mark.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
static int get_point2 (double *,double *);
static int keyboard();
Modified: grass-addons/grass6/imagery/i.linespoints/mouse.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/mouse.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/mouse.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,5 +1,5 @@
#include "globals.h"
-#include "raster.h"
+#include <grass/raster.h>
static int first = 1;
static int curx, cury;
Modified: grass-addons/grass6/imagery/i.linespoints/points.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/points.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/points.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
int display_line (View *view, double *east, double *north,int *status,int count);
Modified: grass-addons/grass6/imagery/i.linespoints/title.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/title.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/title.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
int
display_title (View *view)
Modified: grass-addons/grass6/imagery/i.linespoints/view.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/view.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/view.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,5 +1,5 @@
#include <string.h>
-#include "raster.h"
+#include <grass/raster.h>
#include "globals.h"
#include "local_proto.h"
Modified: grass-addons/grass6/imagery/i.linespoints/zoom_box.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/zoom_box.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/zoom_box.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
static int zoom2(int,int);
Modified: grass-addons/grass6/imagery/i.linespoints/zoom_pnt.c
===================================================================
--- grass-addons/grass6/imagery/i.linespoints/zoom_pnt.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.linespoints/zoom_pnt.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -1,6 +1,6 @@
#include "globals.h"
#include "local_proto.h"
-#include "raster.h"
+#include <grass/raster.h>
static int cancel(void);
Modified: grass-addons/grass6/imagery/i.points.auto/line.c
===================================================================
--- grass-addons/grass6/imagery/i.points.auto/line.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.points.auto/line.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -4,7 +4,7 @@
#include "local_proto.h"
static int cancel();
-static int select(int x1,int y1,int button);
+static int bselect(int x1,int y1,int button);
double temp_e1,temp_e2,temp_n1,temp_n2;
@@ -22,7 +22,7 @@
{
MENU("CANCEL",cancel,&use),
INFO("select first line (left side) ",&use),
- OTHER(select, &use),
+ OTHER(bselect, &use),
{0}
};
@@ -30,7 +30,7 @@
{
MENU("CANCEL",cancel,&use),
INFO("select second line (right side) ",&use),
- OTHER(select, &use),
+ OTHER(bselect, &use),
{0}
};
@@ -85,7 +85,7 @@
return 0; /* return, but don't QUIT */
}
-static int select(int x,int y,int button)
+static int bselect(int x,int y,int button)
{
if (button != 1)
return where (x,y);
Added: grass-addons/grass6/imagery/i.spec.sam/local_proto.h
===================================================================
--- grass-addons/grass6/imagery/i.spec.sam/local_proto.h (rev 0)
+++ grass-addons/grass6/imagery/i.spec.sam/local_proto.h 2014-09-07 13:54:13 UTC (rev 61828)
@@ -0,0 +1 @@
+void make_history(char *, char *, char *);
Modified: grass-addons/grass6/imagery/i.spec.sam/main.c
===================================================================
--- grass-addons/grass6/imagery/i.spec.sam/main.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/imagery/i.spec.sam/main.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -22,6 +22,7 @@
#include <math.h>
#include "matrix.h"
#include "matrix2.h"
+#include "local_proto.h"
int open_files();
void spectral_angle();
Modified: grass-addons/grass6/raster/r.boxcount/main.c
===================================================================
--- grass-addons/grass6/raster/r.boxcount/main.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/raster/r.boxcount/main.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -89,6 +89,7 @@
#include <unistd.h>
#include <grass/gis.h>
#include <grass/glocale.h>
+#include "bits.h"
#include "sort.h"
#include "file.h"
#include "record.h"
Modified: grass-addons/grass6/raster/r.mcda.electre/local_proto.h
===================================================================
--- grass-addons/grass6/raster/r.mcda.electre/local_proto.h 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/raster/r.mcda.electre/local_proto.h 2014-09-07 13:54:13 UTC (rev 61828)
@@ -13,3 +13,10 @@
int infd;
void *inrast; /* input buffer */
};
+
+void build_weight_vect(int nrows, int ncols, int ncriteria,
+ struct Option *weight, double *weight_vect);
+
+void build_dominance_matrix(int nrows, int ncols, int ncriteria,
+ double *weight_vect, double ***decision_vol);
+
Modified: grass-addons/grass6/raster/r.mcda.fuzzy/local_proto.h
===================================================================
--- grass-addons/grass6/raster/r.mcda.fuzzy/local_proto.h 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/raster/r.mcda.fuzzy/local_proto.h 2014-09-07 13:54:13 UTC (rev 61828)
@@ -13,3 +13,10 @@
int infd;
void *inrast; /* input buffer */
};
+
+void build_weight_vect(int nrows, int ncols, int ncriteria,
+ struct Option *weight, double *weight_vect);
+
+void build_fuzzy_matrix(int nrows, int ncols, int ncriteria,
+ double *weight_vect, double ***decision_vol);
+
Modified: grass-addons/grass6/raster/r.mcda.regime/local_proto.h
===================================================================
--- grass-addons/grass6/raster/r.mcda.regime/local_proto.h 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/raster/r.mcda.regime/local_proto.h 2014-09-07 13:54:13 UTC (rev 61828)
@@ -13,3 +13,10 @@
int infd;
void *inrast; /* input buffer */
};
+
+void build_weight_vect(int nrows, int ncols, int ncriteria,
+ struct Option *weight, double *weight_vect);
+
+void build_regime_matrix(int nrows, int ncols, int ncriteria,
+ double *weight_vect, double ***decision_vol);
+
Modified: grass-addons/grass6/raster/r.roughset/rules_extr.c
===================================================================
--- grass-addons/grass6/raster/r.roughset/rules_extr.c 2014-09-07 13:42:23 UTC (rev 61827)
+++ grass-addons/grass6/raster/r.roughset/rules_extr.c 2014-09-07 13:54:13 UTC (rev 61828)
@@ -15,7 +15,7 @@
* License (>=v2). Read the file COPYING that comes with GRASS
* for details.
*
-/************************************************************************
+ ************************************************************************
** EXTRACT RULE FROM GEOGRAPHICS THEMES (Based on Rough Set Library
** written by M.Gawrys J.Sienkiewiczbrary )
**
@@ -29,7 +29,7 @@
** - MATRIX D, is the discernibility matrix
** - MATRIX X, is called a reduced discernibility matrix.
-/***********************************************************************/
+***********************************************************************/
#include "rough.h"
#include "localproto.h"
More information about the grass-commit
mailing list