From: Kevin M. Rosenberg Date: Mon, 4 Dec 2000 05:36:57 +0000 (+0000) Subject: r244: *** empty log message *** X-Git-Tag: debian-4.5.3-3~773 X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=01ee1e0085970643368d65c38b09008927e24cd5 r244: *** empty log message *** --- diff --git a/include/ct.h b/include/ct.h index ad04701..0928b91 100644 --- a/include/ct.h +++ b/include/ct.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ct.h,v 1.40 2000/12/04 04:15:48 kevin Exp $ +** $Id: ct.h,v 1.41 2000/12/04 05:36:57 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 @@ -28,7 +28,7 @@ #ifndef CT_H #define CT_H -#ifdef _WIN32 +#ifdef MSVC extern "C" {int strcasecmp(const char*, const char*);} typedef long off_t; #define HAVE_STRING_H 1 diff --git a/include/imagefile.h b/include/imagefile.h index 6b6b4d5..ae090e7 100644 --- a/include/imagefile.h +++ b/include/imagefile.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: imagefile.h,v 1.19 2000/12/04 04:15:48 kevin Exp $ +** $Id: imagefile.h,v 1.20 2000/12/04 05:36:57 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 @@ -48,17 +48,8 @@ using namespace std; class F32Image : public Array2dFile { public: - F32Image (int nx, int ny) - : Array2dFile::Array2dFile (nx, ny, sizeof(kfloat32), Array2dFile::PIXEL_FLOAT32) - { - } - - F32Image (void) - : Array2dFile::Array2dFile() - { - setPixelFormat (Array2dFile::PIXEL_FLOAT32); - setPixelSize (sizeof(kfloat32)); - } + F32Image (int nx, int ny); + F32Image (void); kfloat32** getArray (void) { return (kfloat32**) (m_arrayData); } @@ -81,17 +72,8 @@ class F64Image : public Array2dFile { public: - F64Image (int nx, int ny) - : Array2dFile::Array2dFile (nx, ny, sizeof(kfloat64), Array2dFile::PIXEL_FLOAT64) - { - } - - F64Image (void) - : Array2dFile::Array2dFile () - { - setPixelFormat (PIXEL_FLOAT64); - setPixelSize (sizeof(kfloat64)); - } + F64Image (int nx, int ny); + F64Image (void); kfloat64** getArray (void) { return (kfloat64**) (m_arrayData); } diff --git a/include/phantom.h b/include/phantom.h index 399c542..bc245ee 100644 --- a/include/phantom.h +++ b/include/phantom.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phantom.h,v 1.14 2000/09/04 09:06:46 kevin Exp $ +** $Id: phantom.h,v 1.15 2000/12/04 05:36:57 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 @@ -28,7 +28,9 @@ #ifndef PHANTOM_H #define PHANTOM_H +#ifndef MSVC #include +#endif #include "ctsupport.h" using namespace std; @@ -96,8 +98,8 @@ class PhantomElement double* m_yOutline; double m_rectLimits[4]; - static const int POINTS_PER_CIRCLE = 360; - static const double SCALE_PELEM_EXTENT=0.005; // increase pelem limits by 0.5% + static const int POINTS_PER_CIRCLE; + static const double SCALE_PELEM_EXTENT; // increase pelem limits by 0.5% static PhmElemType PhantomElement::convertNameToType (const char* const typeName); diff --git a/include/projections.h b/include/projections.h index eb1e853..4bad1e4 100644 --- a/include/projections.h +++ b/include/projections.h @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: projections.h,v 1.14 2000/09/02 05:10:39 kevin Exp $ +** $Id: projections.h,v 1.15 2000/12/04 05:36:57 kevin Exp $ ** ** ** This program is free software; you can redistribute it and/or modify @@ -32,7 +32,9 @@ class Scanner; class DetectorArray; class Array2dFileLabel; -class ostringstream; + +#include + // Projections class Projections @@ -91,7 +93,7 @@ class Projections private: int m_headerSize; // Size of disk file header int m_geometry; // Geometry of scanner - struct DetectorArray **m_projData; // Pointer to array of detarray_st pointers + class DetectorArray **m_projData; // Pointer to array of detarray_st pointers string m_remark; // description of raysum data int m_nDet; // number of detectors in array int m_nView; // number of rotated views @@ -112,7 +114,7 @@ class Projections string m_filename; Array2dFileLabel m_label; - const static kuint16 m_signature = ('P'*256 + 'J'); + const static kuint16 m_signature; bool headerRead (); bool headerWrite (); diff --git a/libctgraphics/pol.cpp b/libctgraphics/pol.cpp index dbc8b64..035f323 100644 --- a/libctgraphics/pol.cpp +++ b/libctgraphics/pol.cpp @@ -6,7 +6,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: pol.cpp,v 1.2 2000/07/31 14:48:35 kevin Exp $ +** $Id: pol.cpp,v 1.3 2000/12/04 05:36:57 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 @@ -24,6 +24,7 @@ /* */ /*----------------------------------------------------------------------*/ +#include "ct.h" #include #include #include diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp index 343470a..9657755 100644 --- a/libctsim/imagefile.cpp +++ b/libctsim/imagefile.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: imagefile.cpp,v 1.15 2000/11/22 16:39:59 kevin Exp $ +** $Id: imagefile.cpp,v 1.16 2000/12/04 05:36:57 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 @@ -28,6 +28,29 @@ #include "ct.h" +F32Image::F32Image (int nx, int ny) + : Array2dFile::Array2dFile (nx, ny, sizeof(kfloat32), Array2dFile::PIXEL_FLOAT32) + { + } + +F32Image::F32Image (void)[ + : Array2dFile::Array2dFile() + { + setPixelFormat (Array2dFile::PIXEL_FLOAT32); + setPixelSize (sizeof(kfloat32)); + } + +F64Image::F64Image (int nx, int ny) + : Array2dFile::Array2dFile (nx, ny, sizeof(kfloat64), Array2dFile::PIXEL_FLOAT64) + { + } + +F64Image::F64Image (void) + : Array2dFile::Array2dFile () + { + setPixelFormat (PIXEL_FLOAT64); + setPixelSize (sizeof(kfloat64)); + } void ImageFile::filterResponse (const char* const domainName, double bw, const char* const filterName, double filt_param) diff --git a/libctsim/phantom.cpp b/libctsim/phantom.cpp index 59b46ce..6058ce7 100644 --- a/libctsim/phantom.cpp +++ b/libctsim/phantom.cpp @@ -9,7 +9,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: phantom.cpp,v 1.19 2000/11/09 00:12:25 kevin Exp $ +** $Id: phantom.cpp,v 1.20 2000/12/04 05:36:57 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 @@ -27,6 +27,8 @@ #include "ct.h" +const int Phantom::POINTS_PER_CIRCLE = 360; +const double Phantom::SCALE_PELEM_EXTENT=0.005; // increase pelem limits by 0.5% const int Phantom::PHM_INVALID = -1; const int Phantom::PHM_HERMAN = 0; diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp index 7fdda64..ea3074b 100644 --- a/libctsim/projections.cpp +++ b/libctsim/projections.cpp @@ -8,7 +8,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: projections.cpp,v 1.26 2000/09/07 05:51:52 kevin Exp $ +** $Id: projections.cpp,v 1.27 2000/12/04 05:36:57 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 @@ -25,7 +25,8 @@ ******************************************************************************/ #include "ct.h" - + +const kuint16 Projections::m_signature = ('P'*256 + 'J'); /* NAME * Projections Constructor for projections matrix storage