X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fimagefile.h;h=7c7daba56eae43d69172b47763cbb2dd69fa7a28;hp=ae090e78e713eff199121e4f77c0dc09278bf74c;hb=5c6b29ab4885308cc3381af6e0a68f4804956d2e;hpb=01ee1e0085970643368d65c38b09008927e24cd5

diff --git a/include/imagefile.h b/include/imagefile.h
index ae090e7..7c7daba 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.20 2000/12/04 05:36:57 kevin Exp $
+**  $Id: imagefile.h,v 1.24 2000/12/29 15:45:06 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
@@ -39,8 +39,6 @@
 #include "fnetorderstream.h"
 #include "array2dfile.h"
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include <mpi++.h>
 #endif
@@ -54,8 +52,8 @@ public:
   kfloat32** getArray (void)
       { return (kfloat32**) (m_arrayData); }
 
-  const kfloat32* const * getArray (void) const
-       { return (const kfloat32**) (m_arrayData); }
+  kfloat32** const getArray (void) const
+       { return (kfloat32** const) (m_arrayData); }
 
 #ifdef HAVE_MPI
   MPI::Datatype getMPIDataType (void) const
@@ -78,8 +76,8 @@ class F64Image : public Array2dFile
   kfloat64** getArray (void)
       { return (kfloat64**) (m_arrayData); }
 
-  const kfloat64* const * getArray (void) const
-      { return (const kfloat64**) (m_arrayData); }
+  kfloat64** const getArray (void) const
+      { return (kfloat64** const) (m_arrayData); }
 
 #ifdef HAVE_MPI
   MPI::Datatype getMPIDataType (void) const
@@ -96,13 +94,15 @@ typedef F64Image   ImageFileBase;
 typedef kfloat64   ImageFileValue;
 typedef kfloat64*  ImageFileColumn;
 typedef kfloat64** ImageFileArray;
-typedef const kfloat64* const * ImageFileArrayConst;
+typedef kfloat64** const ImageFileArrayConst;
+typedef const kfloat64* ImageFileColumnConst;
 #else
 typedef F32Image   ImageFileBase;
 typedef kfloat32   ImageFileValue;
 typedef kfloat32*  ImageFileColumn;
 typedef kfloat32** ImageFileArray;
-typedef const kfloat32* const * ImageFileArrayConst;
+typedef kfloat32** const ImageFileArrayConst;
+typedef const kfloat32* ImageFileColumnConst;
 #endif
 
 
@@ -120,17 +120,25 @@ class ImageFile : public ImageFileBase
   void filterResponse (const char* const domainName, double bw, const char* const filterName, double filt_param);
 
   void statistics (double& min, double& max, double& mean, double& mode, double& median, double& stddev) const;
-
   void getMinMax (double& min, double& max) const;
-
-  void printStatistics (ostream& os) const;
-
+  void printStatistics (std::ostream& os) const;
   bool comparativeStatistics (const ImageFile& imComp, double& d, double& r, double& e) const;
-
-  bool printComparativeStatistics (const ImageFile& imComp, ostream& os) const;
-
+  bool printComparativeStatistics (const ImageFile& imComp, std::ostream& os) const;
+
+  bool subtractImages (const ImageFile& rRHS, ImageFile& result) const;
+  bool addImages (const ImageFile& rRHS, ImageFile& result) const;
+  bool multiplyImages (const ImageFile& rRHS, ImageFile& result) const;
+  bool divideImages (const ImageFile& rRHS, ImageFile& result) const;
+
+  bool invertPixelValues (ImageFile& result) const;
+  bool sqrt (ImageFile& result) const;
+  bool square (ImageFile& result) const;
+  bool log (ImageFile& result) const;
+  bool exp (ImageFile& result) const;
+  bool FFTMagnitude (ImageFile& result) const;
+  bool FFTPhase (ImageFile& result) const;
+
   int display (void) const;
-
   int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax) const;
 
 #if HAVE_PNG