r321: include/ctsupport.h

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 9a9ca835303e465999a1d1f3534f141c18cdb1e6..81479c964dbc56bacde5ce0e4645f845ecfb11e9 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.18 2000/12/29 15:45:06 kevin Exp $
+**  $Id: ctsupport.h,v 1.19 2000/12/29 20:04:02 kevin Exp $
 **
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -43,7 +43,8 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
-#include <cstdarg>
+#include <cstdarg>\r
+#include <string>
 #include <vector>\r
 #include <algorithm>\r
 

diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 7a190d284d45ec3903790e570bf65dfccd592771..a51b06b252a2597278a5aa8ee1241f8f119380b8 100644 (file)
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,78 +3,119 @@
 <pre>\r
 <h1>Build Log</h1>\r
 <h3>\r
---------------------Configuration: libctsim - Win32 Debug--------------------\r
+--------------------Configuration: FFTW2st - Win32 Release--------------------\r
 </h3>\r
 <h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8B.tmp" with contents\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+FFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: FFTW2st - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+FFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: RFFTW2st - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+RFFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: RFFTW2st - Win32 Debug--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+\r
+\r
+\r
+<h3>Results</h3>\r
+RFFTW2st.lib - 0 error(s), 0 warning(s)\r
+<h3>\r
+--------------------Configuration: libctsim - Win32 Release--------------------\r
+</h3>\r
+<h3>Command Lines</h3>\r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3.tmp" with contents\r
 [\r
-/nologo /G6 /MTd /W3 /Gm /GR /GX /ZI /Od /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "_DEBUG" /D "HAVE_WXWIN" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /FR"Debug/" /Fp"Debug/libctsim.pch" /YX /Fo"Debug/" /Fd"Debug/" /FD /GZ /c \r
+/nologo /G6 /MT /W3 /GR /GX /O2 /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "NDEBUG" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /Fp"Release/libctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
+"C:\ctsim-2.0.6\libctsim\array2dfile.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\clip.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\consoleio.cpp"\r
+"C:\ctsim-2.0.6\libctgraphics\ezplot.cpp"\r
+"C:\ctsim-2.0.6\libctgraphics\ezset.cpp"\r
+"C:\ctsim-2.0.6\libctgraphics\ezsupport.cpp"\r
+"C:\ctsim-2.0.6\libctsim\filter.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\fnetorderstream.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\hashtable.cpp"\r
 "C:\ctsim-2.0.6\libctsim\imagefile.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\mathfuncs.cpp"\r
+"C:\ctsim-2.0.6\libctsim\phantom.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\plotfile.cpp"\r
+"C:\ctsim-2.0.6\libctgraphics\pol.cpp"\r
+"C:\ctsim-2.0.6\libctsim\procsignal.cpp"\r
+"C:\ctsim-2.0.6\libctsim\projections.cpp"\r
+"C:\ctsim-2.0.6\libctsim\reconstruct.cpp"\r
+"C:\ctsim-2.0.6\libctsim\scanner.cpp"\r
+"C:\ctsim-2.0.6\libctgraphics\sgp.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\strfuncs.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\syserror.cpp"\r
+"C:\ctsim-2.0.6\libctsim\trace.cpp"\r
+"C:\ctsim-2.0.6\libctgraphics\transformmatrix.cpp"\r
+"C:\ctsim-2.0.6\libctsupport\xform.cpp"\r
 ]\r
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8B.tmp" \r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8C.tmp" with contents\r
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3.tmp" \r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP4.tmp" with contents\r
 [\r
-/nologo /out:"Debug\libctsim.lib" \r
-".\Debug\array2dfile.obj"\r
-".\Debug\backprojectors.obj"\r
-".\Debug\clip.obj"\r
-".\Debug\consoleio.obj"\r
-".\Debug\ezplot.obj"\r
-".\Debug\ezset.obj"\r
-".\Debug\ezsupport.obj"\r
-".\Debug\filter.obj"\r
-".\Debug\fnetorderstream.obj"\r
-".\Debug\getopt.obj"\r
-".\Debug\getopt1.obj"\r
-".\Debug\hashtable.obj"\r
-".\Debug\imagefile.obj"\r
-".\Debug\mathfuncs.obj"\r
-".\Debug\phantom.obj"\r
-".\Debug\plotfile.obj"\r
-".\Debug\pol.obj"\r
-".\Debug\procsignal.obj"\r
-".\Debug\projections.obj"\r
-".\Debug\reconstruct.obj"\r
-".\Debug\scanner.obj"\r
-".\Debug\sgp.obj"\r
-".\Debug\strfuncs.obj"\r
-".\Debug\syserror.obj"\r
-".\Debug\trace.obj"\r
-".\Debug\transformmatrix.obj"\r
-".\Debug\xform.obj"\r
+/nologo /G6 /MT /W3 /GR- /GX /O2 /I "..\..\..\zlib" /I "..\..\INCLUDE" /I "..\..\getopt" /I "..\..\..\lpng108" /I "..\..\..\fftw-2.1.3\fftw" /I "..\..\..\fftw-2.1.3\rfftw" /I "..\..\..\wx2\include" /D "NDEBUG" /D "HAVE_STRING_H" /D "HAVE_GETOPT_H" /D "WIN32" /D "_MBCS" /D "_LIB" /D "MSVC" /D "HAVE_FFTW" /D "HAVE_PNG" /D "HAVE_SGP" /D "HAVE_WXWINDOWS" /D "__WXMSW__" /Fp"Release/libctsim.pch" /YX /Fo"Release/" /Fd"Release/" /FD /c \r
+"C:\ctsim-2.0.6\libctsim\backprojectors.cpp"\r
 ]\r
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8C.tmp"\r
-<h3>Output Window</h3>\r
-Compiling...\r
-imagefile.cpp\r
-Creating library...\r
-<h3>\r
---------------------Configuration: ctsim - Win32 Debug--------------------\r
-</h3>\r
-<h3>Command Lines</h3>\r
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8D.tmp" with contents\r
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP4.tmp" \r
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5.tmp" with contents\r
 [\r
-comctl32.lib winmm.lib rpcrt4.lib ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ../libctsim/Debug/libctsim.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\lpng108\msvc\win32\libpng\lib_dbg\libpng.lib ..\..\..\lpng108\msvc\win32\zlib\lib_dbg\zlib.lib libcmtd.lib ..\..\..\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib ..\..\..\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib ../../../wx2/lib/wxd.lib /nologo /subsystem:windows /incremental:yes /pdb:"Debug/ctsim.pdb" /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrtd.lib" /out:"Debug/ctsim.exe" /pdbtype:sept /libpath:"..\..\..\lpng108\msvc\win32\libpng\lib" /libpath:"..\..\..\lpng108\msvc\win32\zlib\lib" \r
-".\Debug\ctsim.obj"\r
-".\Debug\dialogs.obj"\r
-".\Debug\dlgprojections.obj"\r
-".\Debug\dlgreconstruct.obj"\r
-".\Debug\docs.obj"\r
-".\Debug\views.obj"\r
-".\Debug\wx.res"\r
-"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"\r
-"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"\r
-"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"\r
-"\wx2\lib\wxd.lib"\r
+/nologo /out:"Release\libctsim.lib" \r
+".\Release\array2dfile.obj"\r
+".\Release\backprojectors.obj"\r
+".\Release\clip.obj"\r
+".\Release\consoleio.obj"\r
+".\Release\ezplot.obj"\r
+".\Release\ezset.obj"\r
+".\Release\ezsupport.obj"\r
+".\Release\filter.obj"\r
+".\Release\fnetorderstream.obj"\r
+".\Release\getopt.obj"\r
+".\Release\getopt1.obj"\r
+".\Release\hashtable.obj"\r
+".\Release\imagefile.obj"\r
+".\Release\mathfuncs.obj"\r
+".\Release\phantom.obj"\r
+".\Release\plotfile.obj"\r
+".\Release\pol.obj"\r
+".\Release\procsignal.obj"\r
+".\Release\projections.obj"\r
+".\Release\reconstruct.obj"\r
+".\Release\scanner.obj"\r
+".\Release\sgp.obj"\r
+".\Release\strfuncs.obj"\r
+".\Release\syserror.obj"\r
+".\Release\trace.obj"\r
+".\Release\transformmatrix.obj"\r
+".\Release\xform.obj"\r
 ]\r
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8D.tmp"\r
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5.tmp"\r
 <h3>Output Window</h3>\r
-Linking...\r
-\r
-\r
-\r
-<h3>Results</h3>\r
-ctsim.exe - 0 error(s), 0 warning(s)\r
-</pre>\r
-</body>\r
-</html>\r
+Compiling...\r
+array2dfile.cpp\r
+clip.cpp\r
+consoleio.cpp\r
+ezplot.cpp\r
+ezset.cpp\r
+ezsupport.cpp\r
+filter.cpp\r
+fnetorderstream.cpp\r