[GRASS-SVN] r31529 - in grass-addons/imagery: i.spec.sam i.spec.unmix

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-05-26 10:43:08 -0400 (Mon, 26 May 2008)
New Revision: 31529

Modified:
   grass-addons/imagery/i.spec.sam/global.h
   grass-addons/imagery/i.spec.sam/hist.c
   grass-addons/imagery/i.spec.sam/main.c
   grass-addons/imagery/i.spec.sam/open.c
   grass-addons/imagery/i.spec.sam/spec_angle.c
   grass-addons/imagery/i.spec.unmix/main.c.meschach
   grass-addons/imagery/i.spec.unmix/spec_angle.c
Log:
fixes

Modified: grass-addons/imagery/i.spec.sam/global.h
===================================================================
--- grass-addons/imagery/i.spec.sam/global.h	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.sam/global.h	2008-05-26 14:43:08 UTC (rev 31529)
@@ -1,5 +1,5 @@
-#include "imagery.h"
 #include <math.h>
+#include <grass/imagery.h>
 #include "matrix.h"
 
 #ifndef GLOBAL

Modified: grass-addons/imagery/i.spec.sam/hist.c
===================================================================
--- grass-addons/imagery/i.spec.sam/hist.c	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.sam/hist.c	2008-05-26 14:43:08 UTC (rev 31529)
@@ -1,4 +1,4 @@
-#include "gis.h"
+#include <grass/gis.h>
 
 void make_history(name, group, matrixfile)
     char *name, *group, *matrixfile;

Modified: grass-addons/imagery/i.spec.sam/main.c
===================================================================
--- grass-addons/imagery/i.spec.sam/main.c	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.sam/main.c	2008-05-26 14:43:08 UTC (rev 31529)
@@ -23,8 +23,10 @@
 #include "matrix.h"
 #include "matrix2.h"
 
+int open_files();
+void spectral_angle();
+CELL myround (x);
 
-
 int main(argc,argv) 
 char *argv[];
 {
@@ -173,7 +175,7 @@
              {
               Avector = get_row(A, i, VNULL);  /* go row-wise through matrix*/
 	      spectral_angle();
-	      result_cell[i][col] = round (curr_angle);
+	      result_cell[i][col] = myround (curr_angle);
 	      V_FREE(Avector);
              }
 
@@ -183,7 +185,7 @@
 
 	/* write the resulting rows: */
         for (i = 0; i < Ref.nfiles; i++)
-          G_put_map_row (resultfd[i], result_cell[i], row);
+          G_put_map_row (resultfd[i], result_cell[i]);
 
     } /* rows loop */
 
@@ -208,7 +210,7 @@
 } /* main*/
 
 
-CELL round (x)
+CELL myround (x)
   double x;
   {
     CELL n;

Modified: grass-addons/imagery/i.spec.sam/open.c
===================================================================
--- grass-addons/imagery/i.spec.sam/open.c	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.sam/open.c	2008-05-26 14:43:08 UTC (rev 31529)
@@ -15,8 +15,8 @@
 
 #include "global.h"
 #include <stdio.h>
-#include "gis.h"
 #include <math.h>
+#include <grass/gis.h>
 #include "matrix.h"
 
 int open_files()

Modified: grass-addons/imagery/i.spec.sam/spec_angle.c
===================================================================
--- grass-addons/imagery/i.spec.sam/spec_angle.c	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.sam/spec_angle.c	2008-05-26 14:43:08 UTC (rev 31529)
@@ -55,4 +55,4 @@
       
    curr_angle = (acos(norm1/(norm2 * norm3)) * 180/MY_PI);  /* Calculate angle */
         /* return in degree*/
-}
\ No newline at end of file
+}

Modified: grass-addons/imagery/i.spec.unmix/main.c.meschach
===================================================================
--- grass-addons/imagery/i.spec.unmix/main.c.meschach	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.unmix/main.c.meschach	2008-05-26 14:43:08 UTC (rev 31529)
@@ -349,11 +349,11 @@
 
 	  /* write the resulting rows into output files: */
 	  for (i = 0; i < A->n; i++)   /* no. of spectra */
-	      G_put_map_row (resultfd[i], result_cell[i], row);
+	      G_put_map_row (resultfd[i], result_cell[i]);
 	  if (error_fd > 0)
-	      G_put_map_row (error_fd, error_cell, row);
+	      G_put_map_row (error_fd, error_cell);
 	  if (iter_fd > 0)
-	      G_put_map_row (iter_fd, iter_cell, row);
+	      G_put_map_row (iter_fd, iter_cell);
 
 	} /* rows loop */
 

Modified: grass-addons/imagery/i.spec.unmix/spec_angle.c
===================================================================
--- grass-addons/imagery/i.spec.unmix/spec_angle.c	2008-05-26 14:37:42 UTC (rev 31528)
+++ grass-addons/imagery/i.spec.unmix/spec_angle.c	2008-05-26 14:43:08 UTC (rev 31529)
@@ -62,3 +62,4 @@
    curr_angle = (acos(norm1/(norm2 * norm3)) * 180/MY_PI);  /* Calculate angle */
     /* return in degree globally*/
 }
+