r322: *** empty log message ***

[ctsim.git] / libctsim / imagefile.cpp

diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp
index 84c66741ec86b223bdac6254ebd6b6bc6be0bc15..b6525e1fda69077f252b2994aede0cb997d01d21 100644 (file)
--- 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.26 2000/12/29 19:30:08 kevin Exp $
+**  $Id: imagefile.cpp,v 1.27 2000/12/29 20:15:37 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
@@ -298,9 +298,9 @@ ImageFile::convertRealToComplex ()
     return false;\r
 \r
   ImageFileArray vImag = getImaginaryArray();\r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumn vCol = vImag[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
       *vCol++ = 0;\r
   }\r
 \r
@@ -315,10 +315,10 @@ ImageFile::convertComplexToReal ()
 \r
   ImageFileArray vReal = getArray();\r
   ImageFileArray vImag = getImaginaryArray();\r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumn vRealCol = vReal[ix];\r
     ImageFileColumn vImagCol = vImag[ix];\r
-    for (int iy = 0; iy < m_ny; iy++) {\r
+    for (unsigned int iy = 0; iy < m_ny; iy++) {\r
       std::complex<double> c (*vRealCol, *vImagCol);\r
       *vRealCol++ = std::abs (c);\r
       vImagCol++;\r
@@ -340,11 +340,11 @@ ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const
   ImageFileArrayConst vRHS = rRHS.getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in1 = vLHS[ix];\r
     ImageFileColumnConst in2 = vRHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
         *out++ = *in1++ - *in2++;\r
   }\r
 \r
@@ -363,11 +363,11 @@ ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const
   ImageFileArrayConst vRHS = rRHS.getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in1 = vLHS[ix];\r
     ImageFileColumnConst in2 = vRHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
         *out++ = *in1++ + *in2++;\r
   }\r
 \r
@@ -386,11 +386,11 @@ ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const
   ImageFileArrayConst vRHS = rRHS.getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in1 = vLHS[ix];\r
     ImageFileColumnConst in2 = vRHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
         *out++ = *in1++ * *in2++;\r
   }\r
 \r
@@ -409,11 +409,11 @@ ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const
   ImageFileArrayConst vRHS = rRHS.getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in1 = vLHS[ix];\r
     ImageFileColumnConst in2 = vRHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++) {\r
+    for (unsigned int iy = 0; iy < m_ny; iy++) {\r
       if (*in2 != 0.)\r
         *out++ = *in1++ / *in2++;\r
       else\r
@@ -436,10 +436,10 @@ ImageFile::invertPixelValues (ImageFile& result) const
   ImageFileArrayConst vLHS = getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in = vLHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
         *out++ = - *in++;\r
   }\r
 \r
@@ -457,10 +457,10 @@ ImageFile::sqrt (ImageFile& result) const
   ImageFileArrayConst vLHS = getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in = vLHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
       if (*in < 0)\r
         *out++ = -::sqrt(-*in++);\r
       else\r
@@ -481,10 +481,10 @@ ImageFile::log (ImageFile& result) const
   ImageFileArrayConst vLHS = getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in = vLHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
       if (*in <= 0)\r
         *out++ = 0;\r
       else\r
@@ -505,10 +505,10 @@ ImageFile::exp (ImageFile& result) const
   ImageFileArrayConst vLHS = getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in = vLHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++)\r
       *out++ = ::exp (*in++);\r
   }\r
 \r
@@ -543,7 +543,7 @@ ImageFile::fourier (ImageFile& result) const
   ImageFileArray vRealResult = result.getArray();\r
   ImageFileArray vImagResult = result.getImaginaryArray();\r
 \r
-  int ix, iy;\r
+  unsigned int ix, iy;\r
   double* pY = new double [m_ny];\r
   std::complex<double>** complexOut = new std::complex<double>* [m_nx];\r
   for (ix = 0; ix < m_nx; ix++)\r
@@ -611,13 +611,13 @@ ImageFile::magnitude (ImageFile& result) const
   ImageFileArray vRealResult = result.getArray();\r
   if (result.dataType() == Array2dFile::DATA_TYPE_COMPLEX) {\r
     ImageFileArray vImagResult = result.getImaginaryArray();\r
-    for (int ix = 0; ix < m_nx; ix++)\r
-      for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int ix = 0; ix < m_nx; ix++)\r
+      for (unsigned int iy = 0; iy < m_ny; iy++)\r
         vImagResult[ix][iy] = 0;\r
   }\r
 \r
-  for (int ix = 0; ix < m_nx; ix++)\r
-    for (int iy = 0; iy < m_ny; iy++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++) {\r
       if (dataType() == Array2dFile::DATA_TYPE_COMPLEX) \r
         vRealResult[ix][iy] = ::sqrt (vReal[ix][iy] * vReal[ix][iy] + vImag[ix][iy] * vImag[ix][iy]);\r
       else\r
@@ -643,13 +643,13 @@ ImageFile::phase (ImageFile& result) const
   ImageFileArray vRealResult = result.getArray();\r
   if (result.dataType() == Array2dFile::DATA_TYPE_COMPLEX) {\r
     ImageFileArray vImagResult = result.getImaginaryArray();\r
-    for (int ix = 0; ix < m_nx; ix++)\r
-      for (int iy = 0; iy < m_ny; iy++)\r
+    for (unsigned int ix = 0; ix < m_nx; ix++)\r
+      for (unsigned int iy = 0; iy < m_ny; iy++)\r
         vImagResult[ix][iy] = 0;\r
   }\r
 \r
-  for (int ix = 0; ix < m_nx; ix++)\r
-    for (int iy = 0; iy < m_ny; iy++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++)\r
+    for (unsigned int iy = 0; iy < m_ny; iy++) {\r
       if (dataType() == Array2dFile::DATA_TYPE_COMPLEX) \r
         vRealResult[ix][iy] = ::atan (vImag[ix][iy] / vReal[ix][iy]);\r
       else\r
@@ -670,10 +670,10 @@ ImageFile::square (ImageFile& result) const
   ImageFileArrayConst vLHS = getArray();\r
   ImageFileArray vResult = result.getArray();\r
 \r
-  for (int ix = 0; ix < m_nx; ix++) {\r
+  for (unsigned int ix = 0; ix < m_nx; ix++) {\r
     ImageFileColumnConst in = vLHS[ix];\r
     ImageFileColumn out = vResult[ix];\r
-    for (int iy = 0; iy < m_ny; iy++) {\r
+    for (unsigned int iy = 0; iy < m_ny; iy++) {\r
         *out++ = *in * *in;\r
         in++;\r
     }\r