projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r247: *** empty log message ***
[ctsim.git]
/
libctsim
/
scanner.cpp
diff --git
a/libctsim/scanner.cpp
b/libctsim/scanner.cpp
index 77fbb1e7510ba0e9af77b1a70a168b739d9485d3..c8c86632d1c15924cf9e9f4794ed8be6b9703c9a 100644
(file)
--- a/
libctsim/scanner.cpp
+++ b/
libctsim/scanner.cpp
@@
-9,7
+9,7
@@
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: scanner.cpp,v 1.1
6 2000/12/03 12:22:46
kevin Exp $
+** $Id: scanner.cpp,v 1.1
7 2000/12/06 01:46:43
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
**
** 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
@@
-260,7
+260,7
@@
Scanner::collectProjections (Projections& proj, const Phantom& phm, const int tr
}
void
}
void
-Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, bool bStoreAtViewPosition, const int trace, SGP* pSGP
= NULL
)
+Scanner::collectProjections (Projections& proj, const Phantom& phm, const int iStartView, const int iNumViews, bool bStoreAtViewPosition, const int trace, SGP* pSGP)
{
m_trace = trace;
double start_angle = iStartView * proj.rotInc();
{
m_trace = trace;
double start_angle = iStartView * proj.rotInc();
@@
-532,7
+532,11
@@
Scanner::traceShowParamRasterOp (int iRasterOp, const char *szLabel, const char
{
char szValue[256];
{
char szValue[256];
- vsnprintf (szValue, sizeof(szValue), fmt, args);
+#ifdef MSVC
+ vsprintf (szValue, fmt, args);
+#else
+ vnsprintf (szValue, sizeof(szValue), fmt, args);
+#endif
// cio_set_cpos (raysum_trace_menu_column, row);
// cio_set_text_clr (color - 8, 0);
// cio_set_cpos (raysum_trace_menu_column, row);
// cio_set_text_clr (color - 8, 0);