phase 1 of 2 phase updates necessary to get rid of Numerical Recipes …

…for C functions
neurodebian · Nov 1, 2005 · 3a22c48 · 3a22c48
1 parent 5be9ed7
commit 3a22c48
Show file tree

Hide file tree

Showing 15 changed files with 35 additions and 49 deletions.
diff --git a/histo_register_block/histo_register_block.c b/histo_register_block/histo_register_block.c
@@ -14,11 +14,11 @@
 #include "matrix.h"
 #include "density.h"
 #include "mrisegment.h"
-#include "nr.h"
+#include "nr_wrapper.h"
 
 #define RGB_SIZE 500
 
-static char vcid[] = "$Id: histo_register_block.c,v 1.1 2004/08/04 20:39:07 fischl Exp $";
+static char vcid[] = "$Id: histo_register_block.c,v 1.2 2005/11/01 03:25:21 nicks Exp $";
 
 static int    powell_minimize(MRI *mri_block, MRI *mri_histo, MRI *mri_seg, DENSITY *pdf, MATRIX *mat, int cost_type) ;
 static double compute_overlap(MRI *mri_src, MRI *mri_dst, MATRIX *m_total) ;
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
 
 
   /* rkt: check for and handle version tag */
-  nargs = handle_version_option (argc, argv, "$Id: histo_register_block.c,v 1.1 2004/08/04 20:39:07 fischl Exp $", "$Name:  $");
+  nargs = handle_version_option (argc, argv, "$Id: histo_register_block.c,v 1.2 2005/11/01 03:25:21 nicks Exp $", "$Name:  $");
   if (nargs && argc - nargs == 1)
     exit (0);
   argc -= nargs;
@@ -1272,7 +1272,6 @@ probe_cost_function(MRI *mri_src, MRI *mri_dst, MRI *mri_seg, DENSITY *pdf, MATR
 #endif
 #define TOL 1e-12
 
-#include "nrutil.h"
 static MRI *Gmri_histo, *Gmri_block, *Gmri_seg ;
 static DENSITY *Gpdf ;
 static int Gcost_type ;

diff --git a/mri_hires_register/mri_hires_register.c b/mri_hires_register/mri_hires_register.c
@@ -5,9 +5,9 @@
 // Nov. 9th ,2000
 // 
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2005/09/26 17:34:24 $
-// Revision       : $Revision: 1.8 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:21 $
+// Revision       : $Revision: 1.9 $
 //
 ////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 #include "cma.h"
 #include "version.h"
 #include "transform.h"
-#include "nr.h"
+#include "nr_wrapper.h"
 #include "fastmarching.h"
 #include "voxlist.h"
 
@@ -1412,7 +1412,6 @@ find_optimal_linear_xform(VOXEL_LIST *vl_lowres, VOXEL_LIST *vl_hires,
 #endif
 #define TOL 1e-12
 
-#include "nrutil.h"
 static VOXEL_LIST *Gvl_lowres, *Gvl_hires ;
 
 static int

diff --git a/mri_hires_register/mri_linear_align.c b/mri_hires_register/mri_linear_align.c
@@ -5,9 +5,9 @@
 // Nov. 9th ,2000
 // 
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2005/09/30 00:55:13 $
-// Revision       : $Revision: 1.1 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:21 $
+// Revision       : $Revision: 1.2 $
 //
 ////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 #include "cma.h"
 #include "version.h"
 #include "transform.h"
-#include "nr.h"
+#include "nr_wrapper.h"
 #include "fastmarching.h"
 #include "voxlist.h"
 
@@ -818,7 +818,6 @@ find_optimal_linear_xform(VOXEL_LIST *vl_target, VOXEL_LIST *vl_source,
 #endif
 #define TOL 1e-12
 
-#include "nrutil.h"
 static VOXEL_LIST *Gvl_target, *Gvl_source ;
 
 static int

diff --git a/mri_hires_register/mri_linear_align_binary.c b/mri_hires_register/mri_linear_align_binary.c
@@ -5,9 +5,9 @@
 // Nov. 9th ,2000
 // 
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2005/09/26 17:34:25 $
-// Revision       : $Revision: 1.1 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:21 $
+// Revision       : $Revision: 1.2 $
 //
 ////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 #include "cma.h"
 #include "version.h"
 #include "transform.h"
-#include "nr.h"
+#include "nr_wrapper.h"
 #include "fastmarching.h"
 #include "voxlist.h"
 
@@ -1003,7 +1003,6 @@ find_optimal_linear_xform(VOXEL_LIST *vl_target, VOXEL_LIST *vl_source,
 #endif
 #define TOL 1e-12
 
-#include "nrutil.h"
 static VOXEL_LIST *Gvl_target, *Gvl_source ;
 
 static int

diff --git a/mri_hires_register/mri_nl_align.c b/mri_hires_register/mri_nl_align.c
@@ -5,9 +5,9 @@
 // Nov. 9th ,2000
 // 
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2005/09/30 00:54:52 $
-// Revision       : $Revision: 1.1 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:21 $
+// Revision       : $Revision: 1.2 $
 //
 ////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 #include "cma.h"
 #include "version.h"
 #include "transform.h"
-#include "nr.h"
+#include "nr_wrapper.h"
 #include "fastmarching.h"
 #include "voxlist.h"
 

diff --git a/mri_hires_register/mri_nl_align_binary.c b/mri_hires_register/mri_nl_align_binary.c
@@ -5,9 +5,9 @@
 // Nov. 9th ,2000
 // 
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2005/10/27 13:02:46 $
-// Revision       : $Revision: 1.3 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:21 $
+// Revision       : $Revision: 1.4 $
 //
 ////////////////////////////////////////////////////////////////////
 
@@ -29,7 +29,7 @@
 #include "cma.h"
 #include "version.h"
 #include "transform.h"
-#include "nr.h"
+#include "nr_wrapper.h"
 #include "fastmarching.h"
 #include "voxlist.h"
 

diff --git a/utils/matrix.c b/utils/matrix.c
@@ -1,4 +1,4 @@
-// $Id: matrix.c,v 1.71 2005/09/02 17:28:45 greve Exp $
+// $Id: matrix.c,v 1.72 2005/11/01 03:25:18 nicks Exp $
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -10,14 +10,14 @@
 #include <sys/mman.h>
 #endif
 
-#include "nr.h"
 #include "matrix.h"
 #include "proto.h"
 #include "error.h"
 #include "utils.h"
 #include "diag.h"
 #include "eigen.h"
 #include "macros.h"
+#include "nr_wrapper.h"
 
 MATRIX *
 MatrixCopy(MATRIX *mIn, MATRIX *mOut)
@@ -1273,7 +1273,6 @@ MatrixEigenSystem(MATRIX *m, float *evalues, MATRIX *m_evectors)
 }
 
 
-#include "nrutil.h"
 
 void identity_matrix(float **I,int n) ;
 void svd(float **A, float **V, float *z, int m, int n) ;

diff --git a/utils/mri.c b/utils/mri.c
@@ -8,10 +8,10 @@
  *
  */
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2005/10/27 18:07:37 $
-// Revision       : $Revision: 1.317 $
-char *MRI_C_VERSION = "$Revision: 1.317 $";
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:20 $
+// Revision       : $Revision: 1.318 $
+char *MRI_C_VERSION = "$Revision: 1.318 $";
 
 /*-----------------------------------------------------
   INCLUDE FILES
@@ -34,7 +34,6 @@ char *MRI_C_VERSION = "$Revision: 1.317 $";
 #include "filter.h"
 #include "box.h"
 #include "region.h"
-#include "nr.h"
 #include "mri_transform.h"
 #include "utils.h"
 #include "matrix.h"

diff --git a/utils/mrifilter.c b/utils/mrifilter.c
@@ -26,7 +26,6 @@
 #include "filter.h"
 #include "box.h"
 #include "region.h"
-#include "nr.h"
 #include "talairachex.h" 
 
 /*-----------------------------------------------------

diff --git a/utils/mrihisto.c b/utils/mrihisto.c
@@ -26,7 +26,6 @@
 #include "filter.h"
 #include "box.h"
 #include "region.h"
-#include "nr.h"
 #include "mrinorm.h"
 
 /*-----------------------------------------------------

diff --git a/utils/mrimorph.c b/utils/mrimorph.c
@@ -10,9 +10,9 @@
  *       DATE:        1/8/97
  *
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: fischl $
-// Revision Date  : $Date: 2004/11/22 19:33:29 $
-// Revision       : $Revision: 1.44 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:20 $
+// Revision       : $Revision: 1.45 $
 */
 
 /*-----------------------------------------------------
@@ -6865,8 +6865,6 @@ mriOrthonormalizeTransform(MATRIX *m_L)
 
         Description
 ------------------------------------------------------*/
-#include "nr.h"
-#include "nrutil.h"
 #include "gca.h"
 
 static MRI *g_mri_in, *g_mri_ref ;

diff --git a/utils/mrinorm.c b/utils/mrinorm.c
@@ -26,7 +26,6 @@
 #include "filter.h"
 #include "box.h"
 #include "region.h"
-#include "nr.h"
 #include "mrinorm.h"
 #include "talairachex.h"
 #include "ctrpoints.h"

diff --git a/utils/mripolv.c b/utils/mripolv.c
@@ -28,7 +28,6 @@
 #include "filter.h"
 #include "box.h"
 #include "region.h"
-#include "nr.h"
 #include "mrisegment.h"
 
 /*-----------------------------------------------------

diff --git a/utils/mriset.c b/utils/mriset.c
@@ -26,7 +26,6 @@
 #include "filter.h"
 #include "box.h"
 #include "region.h"
-#include "nr.h"
 
 /*-----------------------------------------------------
                     MACROS AND CONSTANTS

diff --git a/utils/utils.c b/utils/utils.c
@@ -12,9 +12,9 @@
     Description: miscellaneous utility functions
 
 // Warning: Do not edit the following four lines.  CVS maintains them.
-// Revision Author: $Author: greve $
-// Revision Date  : $Date: 2005/09/09 22:30:07 $
-// Revision       : $Revision: 1.46 $
+// Revision Author: $Author: nicks $
+// Revision Date  : $Date: 2005/11/01 03:25:20 $
+// Revision       : $Revision: 1.47 $
 
 ------------------------------------------------------------------------*/
 
@@ -39,7 +39,6 @@
 
 #include <time.h> /* msvc (dng) */
 
-#include "nr.h"
 #include "const.h"
 #include "utils.h"
 #include "proto.h"