From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 4 Mar 2001 04:30:45 +0000 (+0000)
Subject: r603: no message
X-Git-Tag: debian-4.5.3-3~414
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=e98a8a9d72a7b919debbbc9d1b0f237fe71c0fb3

r603: no message
---

diff --git a/src/threadproj.cpp b/src/threadproj.cpp
index eb054f3..b2d169f 100644
--- a/src/threadproj.cpp
+++ b/src/threadproj.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadproj.cpp,v 1.11 2001/03/04 04:27:55 kevin Exp $
+**  $Id: threadproj.cpp,v 1.12 2001/03/04 04:30:45 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
@@ -57,10 +57,9 @@
 ProjectorSupervisorThread::ProjectorSupervisorThread (PhantomFileView* pProjView, int iNDet, int iNView, 
    const char* pszGeometry, int iNSample, double dRotation, double dFocalLength, double dCenterDetectorLength,
    double dViewRatio, double dScanRatio, const char* const pszLabel)
-: m_pPhantomView(pProjView), m_iNDet(iNDet), m_iNView(iNView), m_strGeometry(pszGeometry), 
+: SupervisorThread(), m_pPhantomView(pProjView), m_iNDet(iNDet), m_iNView(iNView), m_strGeometry(pszGeometry), 
   m_iNSample(iNSample), m_dRotation(dRotation), m_dFocalLength(dFocalLength), m_dCenterDetectorLength(dCenterDetectorLength),
-  m_dViewRatio(dViewRatio), m_dScanRatio(dScanRatio), m_strLabel(pszLabel),
-  SupervisorThread()
+  m_dViewRatio(dViewRatio), m_dScanRatio(dScanRatio), m_strLabel(pszLabel)
 {
 }
 
@@ -118,7 +117,7 @@ ProjectorSupervisor::ProjectorSupervisor (SupervisorThread* pThread, PhantomFile
                   m_iNView, m_iNSample, m_dRotation, m_dFocalLength, m_dCenterDetectorLength, m_dViewRatio, m_dScanRatio);
 
   m_vecpChildProjections.reserve (getNumWorkers());
-  for (unsigned int iThread = 0; iThread < getNumWorkers(); iThread++) {
+  for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
     m_vecpChildProjections[iThread] = new Projections (*m_pScanner);    
   }
 
diff --git a/src/threadraster.cpp b/src/threadraster.cpp
index 837a22f..9853117 100644
--- a/src/threadraster.cpp
+++ b/src/threadraster.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadraster.cpp,v 1.6 2001/03/04 04:27:55 kevin Exp $
+**  $Id: threadraster.cpp,v 1.7 2001/03/04 04:30:45 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
@@ -109,7 +109,7 @@ RasterizerSupervisor::RasterizerSupervisor (SupervisorThread* pThread, PhantomFi
       m_iNX(iNX), m_iNY(iNY), m_iNSample(iNSample), m_dViewRatio(dViewRatio), m_pszLabel(pszLabel)
 {
   m_vecpChildImageFiles.reserve (getNumWorkers());
-  for (unsigned int iThread = 0; iThread < getNumWorkers(); iThread++) {
+  for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
     m_vecpChildImageFiles[iThread] = new ImageFile;
   }
 
@@ -167,7 +167,7 @@ RasterizerSupervisor::getImageFile()
   int iGlobalCol = 0;
   for (int iw = 0; iw < getNumWorkers(); iw++) {
     ImageFileArray childArray = m_vecpChildImageFiles[iw]->getArray();
-    for (int iCol = 0; iCol < m_vecpChildImageFiles[iw]->nx(); iCol++) {
+    for (unsigned int iCol = 0; iCol < m_vecpChildImageFiles[iw]->nx(); iCol++) {
       memcpy (globalArray[iGlobalCol++], childArray[iCol], iColSize);
     }
   }
diff --git a/src/threadrecon.cpp b/src/threadrecon.cpp
index 7f4e951..4ece6ed 100644
--- a/src/threadrecon.cpp
+++ b/src/threadrecon.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2001 Kevin Rosenberg
 **
-**  $Id: threadrecon.cpp,v 1.18 2001/03/04 04:16:20 kevin Exp $
+**  $Id: threadrecon.cpp,v 1.19 2001/03/04 04:30:45 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
@@ -116,7 +116,7 @@ ReconstructorSupervisor::ReconstructorSupervisor (SupervisorThread* pThread, Pro
       BackgroundSupervisor (pThread, pProjView->GetFrame(), pProjView->GetDocument(), "Reconstructing", pProjView->GetDocument()->getProjections().nView())
 {
   m_vecpChildImageFile.reserve (getNumWorkers());
-  for (unsigned int iThread = 0; iThread < getNumWorkers(); iThread++) {
+  for (int iThread = 0; iThread < getNumWorkers(); iThread++) {
     m_vecpChildImageFile[iThread] = new ImageFile (m_iImageNX, m_iImageNY);    
   }