r202: *** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 608135408c6b01e92e26780a9cf0ab30e493560c..951d903059a49b7e1475be325c2882df1808b8ab 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2.0.1 - 10/1/00
+   Fixed syntax error in fftw configuration
+   Slight modifications to support gcc v2.9.6
+       
 2.0.0 - 9/7/00
    Version 2.0.0 released!
    ctsim: Added Window menu to Main frame

diff --git a/config.h.in b/config.h.in
index ec4c2ac3176fe7fabd408eb5c82906d5e0549fa8..be75cbb3eb4f0684c0cd6d236ebaec6f9bf3efc0 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -135,6 +135,9 @@
 /* Define if you have the <setjmp.h> header file.  */
 #undef HAVE_SETJMP_H
 
+/* Define if you have the <sstream> header file.  */
+#undef HAVE_SSTREAM
+
 /* Define if you have the <stdarg.h> header file.  */
 #undef HAVE_STDARG_H
 

diff --git a/configure b/configure
index 06a77057f598b10cefc9a62d3da2b60428a1a0c0..23f265fe93a16ccbb1155f8ebcfc5147884a3ef7 100755 (executable)
--- a/configure
+++ b/configure
@@ -715,7 +715,7 @@ fi
 
 PACKAGE=ctsim
 
-VERSION=2.0.0
+VERSION=2.0.1
 
 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; }
@@ -2073,7 +2073,7 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  fttw=true; cat >> confdefs.h <<\EOF
+  fftw=true; cat >> confdefs.h <<\EOF
 #define HAVE_FFTW 1
 EOF
 
@@ -2310,7 +2310,7 @@ EOF
 
 fi
 
-for ac_hdr in fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h
+for ac_hdr in fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h sstream
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index b6df487ccd35eb51aa82c7c25e5015082670419f..22566cdd28c1bf15a1334080042cdea29beddf7a 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/ctsim.cpp)
-AM_INIT_AUTOMAKE(ctsim,2.0.0)
+AM_INIT_AUTOMAKE(ctsim,2.0.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl Checks for programs.
@@ -84,7 +84,7 @@ wxwin=false
 AC_CHECK_LIB(wx_gtk, main, [wxwin=true; wx_gtk=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(wx, main, [wxwin=true; wx_msw=true; AC_DEFINE(HAVE_WXWINDOWS)])
 AC_CHECK_LIB(hdf5, main, [hdf5=true], [hdf5=false], -lz)
-AC_CHECK_LIB(fftw, fftw_one, [fttw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
+AC_CHECK_LIB(fftw, fftw_one, [fftw=true; AC_DEFINE(HAVE_FFTW)], [fftw=false])
 
 if test "$zlib" = "true" ; then
   AC_CHECK_LIB(png, main, [png=true ; AC_DEFINE(HAVE_PNG)], [png=false])
@@ -92,7 +92,7 @@ fi
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h)
+AC_CHECK_HEADERS(fcntl.h unistd.h getopt.h sys/fcntl.h setjmp.h stdarg.h stddef.h sys/types.h sys/stat.h string.h ctype.h math.h stdio.h netinet/in.h inttypes.h sys/param.h stdint.h stdlib.h g2.h assert.h sys/time.h sys/resource.h sys/time.h sstream)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp
index d9c9caad553a7b466eb5d257411d51bb48fc16c9..07e103f182e054d3f20fbd74c1cf83de54169e1c 100644 (file)
--- a/libctgraphics/sgp.cpp
+++ b/libctgraphics/sgp.cpp
@@ -7,7 +7,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: sgp.cpp,v 1.15 2000/09/07 04:59:42 kevin Exp $
+**  $Id: sgp.cpp,v 1.16 2000/10/11 08:16: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
@@ -460,7 +460,7 @@ SGP::setTextPointSize (double height)
 #endif
 #if HAVE_WXWINDOWS
   if (m_driver.isWX()) {
-      m_font.SetPointSize (height);
+      m_font.SetPointSize (static_cast<int>(height+0.5));
       m_driver.idWX()->SetFont (m_font);
   }
 #endif

diff --git a/src/views.cpp b/src/views.cpp
index 2edb737e0e0c74af7c010acf7a521b75dddb0884..8ceaf03501b79bd47e73e223d02ef27aa1b10c61 100644 (file)
--- a/src/views.cpp
+++ b/src/views.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: views.cpp,v 1.22 2000/09/07 01:28:33 kevin Exp $
+**  $Id: views.cpp,v 1.23 2000/10/11 08:16: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
@@ -396,9 +396,9 @@ void
 PhantomView::OnProperties (wxCommandEvent& event)
 {
   const int idPhantom = GetDocument()->getPhantomID();
-  const string& namePhantom = GetDocument()->getPhantomName();
+  const wxString& namePhantom = GetDocument()->getPhantomName();
   ostringstream os;
-  os << "Phantom " << namePhantom << " (" << idPhantom << ")\n";
+  os << "Phantom " << namePhantom.c_str() << " (" << idPhantom << ")\n";
   *theApp->getLog() << os.str().c_str();
 #if DEBUG
   const Phantom& rPhantom = GetDocument()->getPhantom();