r110: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 5c7c966c542262b44f33755fb505f63f33b93c20..1bb4c6b8723069a7ffdd787523d7954bf1afd362 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-1.9.1 - 6/20/2000
+1.9.2 - 6/17/2000
+   Reorganized include files
+   Fixed const pointers in strfuncs
+       
+1.9.1 - 6/16/2000
    Renamed directories, moved source files, combined source files
    to change from 6 libraries to 3 libraries (libctsim, libctsupport,
    and libctgraphics)

diff --git a/configure b/configure
index 6ca0a46c8469246e97e082e4b170826387f377d0..b525481f8594ea2a49116007531f9e96c5111902 100755 (executable)
--- a/configure
+++ b/configure
@@ -711,7 +711,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=1.9.1
+VERSION=1.9.2
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }

diff --git a/configure.in b/configure.in
index a930908b24bbece04f3bacf9e940b4184ef68737..2e4a23d4a1b45188acc1f5faed08105cbd64af4d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,7 @@ dnl Must reset CDPATH so that bash's cd does not print to stdout
 dnl CDPATH=
 
 AC_INIT(src/ctrec.cpp)
-AM_INIT_AUTOMAKE(ctsim,1.9.1)
+AM_INIT_AUTOMAKE(ctsim,1.9.2)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 349aaf5db270a704d64d8aac7c9cfc483953a5bc..3cc00f6c1c265d5ad221a6b81434d9a964d2d1c5 100644 (file)
--- a/include/ctsupport.h
+++ b/include/ctsupport.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsupport.h,v 1.2 2000/06/19 19:04:05 kevin Exp $
+**  $Id: ctsupport.h,v 1.3 2000/06/19 19:10:08 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -245,25 +245,25 @@ inline void minmax_array (const T* array, const int n, T& min, T& max)
 //////////////////////////////////////////////////////////////
 
 // clip.cpp 
-int clip_rect(double& x1, double& y1, double& x2, double& y2, const double rect[4]);
-int clip_segment(double& x1, double& y1, double& x2, double& y2, const double u, const double v);
-int clip_sector(double& x1, double& y1, double& x2, double& y2, const double u, const double v);
-int clip_circle(double& x1, double& y1, double& x2, double& y2, const double cx, const double cy, const double radius, double t1, double t2);
-int clip_triangle(double& x1, double& y1, double& x2, double& y2, const double u, const double v, const int clip_xaxis);
+int clip_rect (double& x1, double& y1, double& x2, double& y2, const double rect[4]);
+int clip_segment (double& x1, double& y1, double& x2, double& y2, const double u, const double v);
+int clip_sector (double& x1, double& y1, double& x2, double& y2, const double u, const double v);
+int clip_circle (double& x1, double& y1, double& x2, double& y2, const double cx, const double cy, const double radius, double t1, double t2);
+int clip_triangle (double& x1, double& y1, double& x2, double& y2, const double u, const double v, const int clip_xaxis);
 
 // norm_ang.cpp 
 double norm_ang (double theta);
 
 // xform.cpp 
-void indent_mtx2(GRFMTX_2D m);
-void xlat_mtx2(GRFMTX_2D m, const double x, const double y);
-void scale_mtx2(GRFMTX_2D m, const double sx, const double sy);
-void rot_mtx2(GRFMTX_2D m, const double theta);
-void mult_mtx2(GRFMTX_2D m1, GRFMTX_2D m2, GRFMTX_2D result);
-void xform_mtx2(GRFMTX_2D m, double& x, double& y);
-void rotate2d(double x[], double y[], int pts, double angle);
-void xlat2d(double x[], double y[], int pts, double xoffset, double yoffset);
-void scale2d(double x[], double y[], int pts, double xfact, double yfact);
+void indent_mtx2 (GRFMTX_2D m);
+void xlat_mtx2 (GRFMTX_2D m, const double x, const double y);
+void scale_mtx2 (GRFMTX_2D m, const double sx, const double sy);
+void rot_mtx2 (GRFMTX_2D m, const double theta);
+void mult_mtx2 (const GRFMTX_2D m1, const GRFMTX_2D m2, GRFMTX_2D result);
+void xform_mtx2 (const GRFMTX_2D m, double& x, double& y);
+void rotate2d (double x[], double y[], int pts, double angle);
+void xlat2d (double x[], double y[], int pts, double xoffset, double yoffset);
+void scale2d (double x[], double y[], int pts, double xfact, double yfact);
 
 // simpson.cpp
 double integrateSimpson (const double xmin, const double xmax, const double *y, const int np);

diff --git a/libctsim/backprojectors.cpp b/libctsim/backprojectors.cpp
index d05bccae2cbcaeb2fac8322d3452a03fc04de44b..ef0de98cfaec261d8aa6aae9a5fcadd644c67c40 100644 (file)
--- a/libctsim/backprojectors.cpp
+++ b/libctsim/backprojectors.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: backprojectors.cpp,v 1.1 2000/06/19 02:59:34 kevin Exp $
+**  $Id: backprojectors.cpp,v 1.2 2000/06/19 19:07:33 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -337,22 +337,18 @@ BackprojectIntDiff2::BackprojectView (const double* const filteredProj, const do
 {
   double theta = - view_angle;  // add half PI to view angle to get perpendicular theta angle
 
-#if SIZEOF_LONG == 8
-  long int scale = 1 << 32;
-#else
-  long int scale = 1 << 16;
-#endif
+  kint32 scale = 1 << 16;
   double dScale = scale;
-  long int halfScale = scale / 2;
+  kint32 halfScale = scale / 2;
 
-  long int det_dx = nearest<long int> (xInc * sin (theta) / detInc * scale);
-  long int det_dy = nearest<long int> (yInc * cos (theta) / detInc * scale);
+  kint32 det_dx = nearest<kint32> (xInc * sin (theta) / detInc * scale);
+  kint32 det_dy = nearest<kint32> (yInc * cos (theta) / detInc * scale);
 
   // calculate L for first point in image (0, 0) 
-  long int detPosColStart = nearest<long int> (start_r * cos (theta - start_phi) / detInc * scale);
+  kint32 detPosColStart = nearest<kint32> (start_r * cos (theta - start_phi) / detInc * scale);
        
   for (int ix = 0; ix < nx; ix++, detPosColStart += det_dx) {
-    long int curDetPos = detPosColStart;
+    kint32 curDetPos = detPosColStart;
     ImageFileColumn pImCol = v[ix];
 
     for (int iy = 0; iy < ny; iy++, curDetPos += det_dy) {
@@ -365,8 +361,8 @@ BackprojectIntDiff2::BackprojectView (const double* const filteredProj, const do
        else
          *pImCol++ += filteredProj[iDetPos];
       } else if (interpType == I_LINEAR) {
-       long int detPosFloor = curDetPos / scale;
-       long int detPosRemainder = curDetPos % scale;
+       kint32 detPosFloor = curDetPos / scale;
+       kint32 detPosRemainder = curDetPos % scale;
        if (detPosRemainder < 0) {
          detPosFloor--;
          detPosRemainder += scale;

diff --git a/libctsupport/xform.cpp b/libctsupport/xform.cpp
index abf47500ad675a5b15ac96e8ac253c69d4fb5182..9836e26c30fe36922d8e28cc60dfde95cc81f58a 100644 (file)
--- a/libctsupport/xform.cpp
+++ b/libctsupport/xform.cpp
@@ -2,7 +2,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: xform.cpp,v 1.2 2000/06/19 19:04:05 kevin Exp $
+**  $Id: xform.cpp,v 1.3 2000/06/19 19:10:08 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -122,7 +122,7 @@ rot_mtx2 (GRFMTX_2D m, const double theta)
 }
 
 void 
-mult_mtx2 (GRFMTX_2D m1, GRFMTX_2D m2, GRFMTX_2D result)
+mult_mtx2 (const GRFMTX_2D m1, const GRFMTX_2D m2, GRFMTX_2D result)
 {
   GRFMTX_2D temp;
 
@@ -139,7 +139,7 @@ mult_mtx2 (GRFMTX_2D m1, GRFMTX_2D m2, GRFMTX_2D result)
 }
 
 void 
-xform_mtx2 (GRFMTX_2D m, double& x, double& y)
+xform_mtx2 (const GRFMTX_2D m, double& x, double& y)
 {
   double xt = x * m[0][0] + y * m[1][0] + m[2][0];
   double yt = x * m[0][1] + y * m[1][1] + m[2][1];