[GRASS-SVN] r64252 - grass-addons/grass7/imagery/i.spec.sam
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jan 19 18:13:18 PST 2015
Author: ychemin
Date: 2015-01-19 18:13:18 -0800 (Mon, 19 Jan 2015)
New Revision: 64252
Modified:
grass-addons/grass7/imagery/i.spec.sam/Makefile
grass-addons/grass7/imagery/i.spec.sam/machine.h
grass-addons/grass7/imagery/i.spec.sam/main.c
grass-addons/grass7/imagery/i.spec.sam/matrix.h
grass-addons/grass7/imagery/i.spec.sam/matrix2.h
Log:
Fixed machine.h Real double confusion with ogr double Real
Modified: grass-addons/grass7/imagery/i.spec.sam/Makefile
===================================================================
--- grass-addons/grass7/imagery/i.spec.sam/Makefile 2015-01-19 21:33:20 UTC (rev 64251)
+++ grass-addons/grass7/imagery/i.spec.sam/Makefile 2015-01-20 02:13:18 UTC (rev 64252)
@@ -3,6 +3,7 @@
PGM = i.spec.sam
EXTRALIB = meschach.a
+EXTRA_INC = $(PROJINC)
LIBES = $(IMAGERYLIB) $(GMATHLIB) $(RASTERLIB) $(GISLIB)
DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(RASTERDEP) $(GISDEP)
Modified: grass-addons/grass7/imagery/i.spec.sam/machine.h
===================================================================
--- grass-addons/grass7/imagery/i.spec.sam/machine.h 2015-01-19 21:33:20 UTC (rev 64251)
+++ grass-addons/grass7/imagery/i.spec.sam/machine.h 2015-01-20 02:13:18 UTC (rev 64252)
@@ -121,7 +121,7 @@
/* single precision */
#ifdef REAL_FLT
-#define Real float
+#define RReal float
#define LongReal float
#define REAL FLOAT
#define LONGREAL FLOAT
@@ -129,7 +129,7 @@
/* double precision */
#ifdef REAL_DBL
-#define Real double
+#define RReal double
#define LongReal double
#define REAL DOUBLE
#define LONGREAL DOUBLE
Modified: grass-addons/grass7/imagery/i.spec.sam/main.c
===================================================================
--- grass-addons/grass7/imagery/i.spec.sam/main.c 2015-01-19 21:33:20 UTC (rev 64251)
+++ grass-addons/grass7/imagery/i.spec.sam/main.c 2015-01-20 02:13:18 UTC (rev 64252)
@@ -48,7 +48,7 @@
int open_files();
void spectral_angle();
-CELL myround (x);
+CELL myround(x);
int main(argc,argv)
char *argv[];
@@ -58,7 +58,7 @@
int band;
int i, j, error=0;
VEC *svd_values;
- char command[80];
+ /*char command[80]; rm by Yann temporarily see grayscale palette*/
float anglefield[255][255];
struct
{
Modified: grass-addons/grass7/imagery/i.spec.sam/matrix.h
===================================================================
--- grass-addons/grass7/imagery/i.spec.sam/matrix.h 2015-01-19 21:33:20 UTC (rev 64251)
+++ grass-addons/grass7/imagery/i.spec.sam/matrix.h 2015-01-20 02:13:18 UTC (rev 64252)
@@ -47,14 +47,14 @@
/* vector definition */
typedef struct {
u_int dim, max_dim;
- Real *ve;
+ RReal *ve;
} VEC;
/* matrix definition */
typedef struct {
u_int m, n;
u_int max_m, max_n, max_size;
- Real **me,*base; /* base is base of alloc'd mem */
+ RReal **me,*base; /* base is base of alloc'd mem */
} MAT;
/* band matrix definition */
@@ -423,7 +423,7 @@
*v_map(double (*f)(),VEC *,VEC *), /* out[i] <- f(x[i]) */
*_v_map(double (*f)(),void *,VEC *,VEC *),
#endif
- *v_lincomb(int,VEC **,Real *,VEC *),
+ *v_lincomb(int,VEC **,RReal *,VEC *),
/* out <- sum_i s[i].x[i] */
*v_linlist(VEC *out,VEC *v1,double a1,...);
/* out <- s1.x1 + s2.x2 + ... */
@@ -445,14 +445,14 @@
/* returns inner product starting at component i0 */
extern double _in_prod(VEC *x,VEC *y,u_int i0),
/* returns sum_{i=0}^{len-1} x[i].y[i] */
- __ip__(Real *,Real *,int);
+ __ip__(RReal *,RReal *,int);
/* see v_mltadd(), v_add(), v_sub() and v_zero() */
-extern void __mltadd__(Real *,Real *,double,int),
- __add__(Real *,Real *,Real *,int),
- __sub__(Real *,Real *,Real *,int),
- __smlt__(Real *,double,Real *,int),
- __zero__(Real *,int);
+extern void __mltadd__(RReal *,RReal *,double,int),
+ __add__(RReal *,RReal *,RReal *,int),
+ __sub__(RReal *,RReal *,RReal *,int),
+ __smlt__(RReal *,double,RReal *,int),
+ __zero__(RReal *,int);
#endif
@@ -593,7 +593,7 @@
mrand(void); /* returns random # in [0,1) */
void smrand(int seed), /* seeds mrand() */
- mrandlist(Real *x, int len); /* generates len random numbers */
+ mrandlist(RReal *x, int len); /* generates len random numbers */
void m_dump(FILE *fp,MAT *a), px_dump(FILE *,PERM *px),
v_dump(FILE *fp,VEC *x), iv_dump(FILE *fp, IVEC *ix);
Modified: grass-addons/grass7/imagery/i.spec.sam/matrix2.h
===================================================================
--- grass-addons/grass7/imagery/i.spec.sam/matrix2.h 2015-01-19 21:33:20 UTC (rev 64251)
+++ grass-addons/grass7/imagery/i.spec.sam/matrix2.h 2015-01-20 02:13:18 UTC (rev 64252)
@@ -171,12 +171,12 @@
-extern VEC *hhvec(VEC *,u_int,Real *,VEC *,Real *);
+extern VEC *hhvec(VEC *,u_int,RReal *,VEC *,RReal *);
extern VEC *hhtrvec(VEC *,double,u_int,VEC *,VEC *);
extern MAT *hhtrrows(MAT *,u_int,u_int,VEC *,double);
extern MAT *hhtrcols(MAT *,u_int,u_int,VEC *,double);
-extern void givens(double,double,Real *,Real *);
+extern void givens(double,double,RReal *,RReal *);
extern VEC *rot_vec(VEC *,u_int,u_int,double,double,VEC *); /* in situ */
extern MAT *rot_rows(MAT *,u_int,u_int,double,double,MAT *); /* in situ */
extern MAT *rot_cols(MAT *,u_int,u_int,double,double,MAT *); /* in situ */
More information about the grass-commit
mailing list