X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fimagefile.cpp;h=a5e9bec75e34ea2442152be631e318c1a93b897f;hb=fd726516dd11fd37a675a94c1e7165c47d793b34;hp=d4c973cc3a4a1aeeb1f7be4054c9f9ade7f581ff;hpb=fd1d136a94a6d20013f38d6a997bdfefad0f5e98;p=ctsim.git

diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp
index d4c973c..a5e9bec 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.22 2000/12/20 20:08:48 kevin Exp $
+**  $Id: imagefile.cpp,v 1.24 2000/12/22 04:18:00 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
@@ -233,13 +233,15 @@ ImageFile::statistics (double& min, double& max, double& mean, double& mode, dou
     if (v == NULL || nx == 0 || ny == 0)
 		return;
 
-	std::vector<double> vecImage (nx * ny);
+	std::vector<double> vecImage;
+	int iVec = 0;
+	vecImage.resize (nx * ny);
     for (int ix = 0; ix < nx; ix++) {
 		for (int iy = 0; iy < ny; iy++)
-			vecImage.push_back (v[ix][iy]);
+			vecImage[iVec++] = v[ix][iy];
 	}
 
-	vectorNumericStatistics (vecImage, min, max, mean, mode, median, stddev);
+	vectorNumericStatistics (vecImage, nx * ny, min, max, mean, mode, median, stddev);
 }
 
 
@@ -264,7 +266,104 @@ ImageFile::getMinMax (double& min, double& max) const
 		}
     }
 }
+
+bool
+ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArray vResult = result.getArray();
+
+  for (int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumnConst in1 = vLHS[ix];
+    ImageFileColumnConst in2 = vRHS[ix];
+    ImageFileColumn out = vResult[ix];
+    for (int iy = 0; iy < m_ny; iy++)
+        *out++ = *in1++ - *in2++;
+  }
+
+    return true;
+}
 
+bool
+ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArray vResult = result.getArray();
+
+  for (int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumnConst in1 = vLHS[ix];
+    ImageFileColumnConst in2 = vRHS[ix];
+    ImageFileColumn out = vResult[ix];
+    for (int iy = 0; iy < m_ny; iy++)
+        *out++ = *in1++ + *in2++;
+  }
+
+    return true;
+}
+
+bool
+ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArray vResult = result.getArray();
+
+  for (int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumnConst in1 = vLHS[ix];
+    ImageFileColumnConst in2 = vRHS[ix];
+    ImageFileColumn out = vResult[ix];
+    for (int iy = 0; iy < m_ny; iy++)
+        *out++ = *in1++ * *in2++;
+  }
+
+    return true;
+}
+
+bool
+ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const
+{
+  if (m_nx != rRHS.nx() || m_ny != rRHS.ny() || m_nx != result.nx() || m_ny != result.ny()) {
+    sys_error (ERR_WARNING, "Difference sizes of images [ImageFile::subtractImage]");
+    return false;
+  }
+
+  ImageFileArrayConst vLHS = getArray();
+  ImageFileArrayConst vRHS = rRHS.getArray();
+  ImageFileArray vResult = result.getArray();
+
+  for (int ix = 0; ix < m_nx; ix++) {
+    ImageFileColumnConst in1 = vLHS[ix];
+    ImageFileColumnConst in2 = vRHS[ix];
+    ImageFileColumn out = vResult[ix];
+    for (int iy = 0; iy < m_ny; iy++) {
+      if (*in2 != 0.)
+        *out++ = *in1++ / *in2++;
+      else
+        *out++ = 0;
+    }
+  }
+
+    return true;
+}
+
+
 void 
 ImageFile::writeImagePGM (const char *outfile, int nxcell, int nycell, double densmin, double densmax)
 {