r406: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 45942f70309757a04810515e78b38ad20717d8d5..32e398ea961ce4bd8f0e8a106cfbc62f1462c7ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 
        * pjinfo: Fixed bug when doing --dump and not specifing --endview
 
+       * ctsimtext-lam: Changes for first version to compile under lam
+       
 3.0.0alpha5 - Released 1/12/00
 
        * ctsim: Added EZPlotDialog, used by debugging plots in

diff --git a/configure b/configure
index 0ee33b00e4dc7f1f6ddf642e013659dd6224d586..da4bdadfbda1decc6c343088f58f2f13cf61bfbc 100755 (executable)
--- a/configure
+++ b/configure
@@ -715,7 +715,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=3.0.0alpha5
+VERSION=3.0.0beta1
 
 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/libctsim/Makefile.in b/libctsim/Makefile.in
index 07f00b990079b7ea0b8309043d1e2b6372f4f5e3..4ebc7ca0fd50cc05471cc49e158be8eccd5c3cbd 100644 (file)
--- a/libctsim/Makefile.in
+++ b/libctsim/Makefile.in
@@ -91,7 +91,7 @@ wxconfig = @wxconfig@
 wxlibs = @wxlibs@
 
 noinst_LIBRARIES = libctsim.a 
-libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp  dlgezplot.cpp
+libctsim_a_SOURCES = filter.cpp scanner.cpp projections.cpp phantom.cpp imagefile.cpp backprojectors.cpp array2dfile.cpp trace.cpp procsignal.cpp reconstruct.cpp fourier.cpp globalvars.cpp 
 
 INCLUDES = @my_includes@
 EXTRA_DIST = Makefile.nt
@@ -108,7 +108,7 @@ LIBS = @LIBS@
 libctsim_a_LIBADD = 
 libctsim_a_OBJECTS =  filter.o scanner.o projections.o phantom.o \
 imagefile.o backprojectors.o array2dfile.o trace.o procsignal.o \
-reconstruct.o fourier.o globalvars.o dlgezplot.o
+reconstruct.o fourier.o globalvars.o
 AR = ar
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -121,10 +121,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = gtar
 GZIP_ENV = --best
-DEP_FILES =  .deps/array2dfile.P .deps/backprojectors.P \
-.deps/dlgezplot.P .deps/filter.P .deps/fourier.P .deps/globalvars.P \
-.deps/imagefile.P .deps/phantom.P .deps/procsignal.P \
-.deps/projections.P .deps/reconstruct.P .deps/scanner.P .deps/trace.P
+DEP_FILES =  .deps/array2dfile.P .deps/backprojectors.P .deps/filter.P \
+.deps/fourier.P .deps/globalvars.P .deps/imagefile.P .deps/phantom.P \
+.deps/procsignal.P .deps/projections.P .deps/reconstruct.P \
+.deps/scanner.P .deps/trace.P
 SOURCES = $(libctsim_a_SOURCES)
 OBJECTS = $(libctsim_a_OBJECTS)
 

diff --git a/tools/ctsimtext.cpp b/tools/ctsimtext.cpp
index 4c632a3e9cce0ce45e5f9819abe39d0ba60ca5a5..af29a13f01ff1575b0070e214cbe2b8a619b1761 100644 (file)
--- a/tools/ctsimtext.cpp
+++ b/tools/ctsimtext.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: ctsimtext.cpp,v 1.15 2001/01/16 20:55:29 kevin Exp $
+**  $Id: ctsimtext.cpp,v 1.16 2001/01/16 23:48:45 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
@@ -45,7 +45,7 @@ extern "C" {
 // If linked to ctsimtext, but executed as another name, eg pjrec, then program will use that
 // linked name as name of function.
 
-static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.15 2001/01/16 20:55:29 kevin Exp $";
+static const char* const g_szIdStr = "$Id: ctsimtext.cpp,v 1.16 2001/01/16 23:48:45 kevin Exp $";
 static const char* const s_szProgramName = "ctsimtext";
 static const char* const s_szProgramName2 = "ctsimtext.exe";
 
@@ -152,7 +152,6 @@ ctsimtext_main (int argc, char * argv[])
     }
   }
   
-  
   return iReturn;
 }
 
@@ -259,8 +258,10 @@ processCommand (int argc, char* const argv[])
   } catch (exception e) {
     std::cerr << "Exception: " << e.what() << std::endl;
   } catch (...) {
-std:cerr << "Unknown exception caught\n";
+    std::cerr << "Unknown exception caught\n";
   }  
+
+  return 1;
 }
 
 int