From ee405282853525f1fa25c4f4321ba85652353564 Mon Sep 17 00:00:00 2001
From: "Kevin M. Rosenberg" <kevin@rosenberg.net>
Date: Fri, 29 Dec 2000 20:04:02 +0000
Subject: [PATCH] r321: include/ctsupport.h

---
 include/ctsupport.h  |   5 +-
 msvc/ctsim/ctsim.plg | 171 +++++++++++++++++++++++++++----------------
 2 files changed, 109 insertions(+), 67 deletions(-)

diff --git a/include/ctsupport.h b/include/ctsupport.h
index 9a9ca83..81479c9 100644
--- 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>
+#include <string>
 #include <vector>
 #include <algorithm>
 
diff --git a/msvc/ctsim/ctsim.plg b/msvc/ctsim/ctsim.plg
index 7a190d2..a51b06b 100644
--- a/msvc/ctsim/ctsim.plg
+++ b/msvc/ctsim/ctsim.plg
@@ -3,78 +3,119 @@
 <pre>
 <h1>Build Log</h1>
 <h3>
---------------------Configuration: libctsim - Win32 Debug--------------------
+--------------------Configuration: FFTW2st - Win32 Release--------------------
 </h3>
 <h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8B.tmp" with contents
+
+
+
+<h3>Results</h3>
+FFTW2st.lib - 0 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: FFTW2st - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+FFTW2st.lib - 0 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: RFFTW2st - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+RFFTW2st.lib - 0 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: RFFTW2st - Win32 Debug--------------------
+</h3>
+<h3>Command Lines</h3>
+
+
+
+<h3>Results</h3>
+RFFTW2st.lib - 0 error(s), 0 warning(s)
+<h3>
+--------------------Configuration: libctsim - Win32 Release--------------------
+</h3>
+<h3>Command Lines</h3>
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3.tmp" with contents
 [
-/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 
+/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 
+"C:\ctsim-2.0.6\libctsim\array2dfile.cpp"
+"C:\ctsim-2.0.6\libctsupport\clip.cpp"
+"C:\ctsim-2.0.6\libctsupport\consoleio.cpp"
+"C:\ctsim-2.0.6\libctgraphics\ezplot.cpp"
+"C:\ctsim-2.0.6\libctgraphics\ezset.cpp"
+"C:\ctsim-2.0.6\libctgraphics\ezsupport.cpp"
+"C:\ctsim-2.0.6\libctsim\filter.cpp"
+"C:\ctsim-2.0.6\libctsupport\fnetorderstream.cpp"
+"C:\ctsim-2.0.6\libctsupport\hashtable.cpp"
 "C:\ctsim-2.0.6\libctsim\imagefile.cpp"
+"C:\ctsim-2.0.6\libctsupport\mathfuncs.cpp"
+"C:\ctsim-2.0.6\libctsim\phantom.cpp"
+"C:\ctsim-2.0.6\libctsupport\plotfile.cpp"
+"C:\ctsim-2.0.6\libctgraphics\pol.cpp"
+"C:\ctsim-2.0.6\libctsim\procsignal.cpp"
+"C:\ctsim-2.0.6\libctsim\projections.cpp"
+"C:\ctsim-2.0.6\libctsim\reconstruct.cpp"
+"C:\ctsim-2.0.6\libctsim\scanner.cpp"
+"C:\ctsim-2.0.6\libctgraphics\sgp.cpp"
+"C:\ctsim-2.0.6\libctsupport\strfuncs.cpp"
+"C:\ctsim-2.0.6\libctsupport\syserror.cpp"
+"C:\ctsim-2.0.6\libctsim\trace.cpp"
+"C:\ctsim-2.0.6\libctgraphics\transformmatrix.cpp"
+"C:\ctsim-2.0.6\libctsupport\xform.cpp"
 ]
-Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8B.tmp" 
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8C.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP3.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP4.tmp" with contents
 [
-/nologo /out:"Debug\libctsim.lib" 
-".\Debug\array2dfile.obj"
-".\Debug\backprojectors.obj"
-".\Debug\clip.obj"
-".\Debug\consoleio.obj"
-".\Debug\ezplot.obj"
-".\Debug\ezset.obj"
-".\Debug\ezsupport.obj"
-".\Debug\filter.obj"
-".\Debug\fnetorderstream.obj"
-".\Debug\getopt.obj"
-".\Debug\getopt1.obj"
-".\Debug\hashtable.obj"
-".\Debug\imagefile.obj"
-".\Debug\mathfuncs.obj"
-".\Debug\phantom.obj"
-".\Debug\plotfile.obj"
-".\Debug\pol.obj"
-".\Debug\procsignal.obj"
-".\Debug\projections.obj"
-".\Debug\reconstruct.obj"
-".\Debug\scanner.obj"
-".\Debug\sgp.obj"
-".\Debug\strfuncs.obj"
-".\Debug\syserror.obj"
-".\Debug\trace.obj"
-".\Debug\transformmatrix.obj"
-".\Debug\xform.obj"
+/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 
+"C:\ctsim-2.0.6\libctsim\backprojectors.cpp"
 ]
-Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8C.tmp"
-<h3>Output Window</h3>
-Compiling...
-imagefile.cpp
-Creating library...
-<h3>
---------------------Configuration: ctsim - Win32 Debug--------------------
-</h3>
-<h3>Command Lines</h3>
-Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8D.tmp" with contents
+Creating command line "cl.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP4.tmp" 
+Creating temporary file "C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5.tmp" with contents
 [
-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" 
-".\Debug\ctsim.obj"
-".\Debug\dialogs.obj"
-".\Debug\dlgprojections.obj"
-".\Debug\dlgreconstruct.obj"
-".\Debug\docs.obj"
-".\Debug\views.obj"
-".\Debug\wx.res"
-"\ctsim-2.0.6\msvc\libctsim\Debug\libctsim.lib"
-"\fftw-2.1.3\Win32\FFTW2st\Debug\FFTW2st.lib"
-"\fftw-2.1.3\Win32\RFFTW2st\Debug\RFFTW2st.lib"
-"\wx2\lib\wxd.lib"
+/nologo /out:"Release\libctsim.lib" 
+".\Release\array2dfile.obj"
+".\Release\backprojectors.obj"
+".\Release\clip.obj"
+".\Release\consoleio.obj"
+".\Release\ezplot.obj"
+".\Release\ezset.obj"
+".\Release\ezsupport.obj"
+".\Release\filter.obj"
+".\Release\fnetorderstream.obj"
+".\Release\getopt.obj"
+".\Release\getopt1.obj"
+".\Release\hashtable.obj"
+".\Release\imagefile.obj"
+".\Release\mathfuncs.obj"
+".\Release\phantom.obj"
+".\Release\plotfile.obj"
+".\Release\pol.obj"
+".\Release\procsignal.obj"
+".\Release\projections.obj"
+".\Release\reconstruct.obj"
+".\Release\scanner.obj"
+".\Release\sgp.obj"
+".\Release\strfuncs.obj"
+".\Release\syserror.obj"
+".\Release\trace.obj"
+".\Release\transformmatrix.obj"
+".\Release\xform.obj"
 ]
-Creating command line "link.exe @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP8D.tmp"
+Creating command line "link.exe -lib @C:\DOCUME~1\kevin\LOCALS~1\Temp\RSP5.tmp"
 <h3>Output Window</h3>
-Linking...
-
-
-
-<h3>Results</h3>
-ctsim.exe - 0 error(s), 0 warning(s)
-</pre>
-</body>
-</html>
+Compiling...
+array2dfile.cpp
+clip.cpp
+consoleio.cpp
+ezplot.cpp
+ezset.cpp
+ezsupport.cpp
+filter.cpp
+fnetorderstream.cpp
-- 
2.34.1