r318: *** empty log message ***

[ctsim.git] / include / imagefile.h

diff --git a/include/imagefile.h b/include/imagefile.h
index 5f8c3248e2f7e7709adce82672aad04a85115524..7c7daba56eae43d69172b47763cbb2dd69fa7a28 100644 (file)
--- 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.17 2000/07/11 10:32:44 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
@@ -28,17 +28,17 @@
 #ifndef IMAGEFILE_H
 #define IMAGEFILE_H
 
+#ifndef MSVC\r
+#include <unistd.h>\r
+#endif\r
 #include <string>
 #include <sys/types.h>
-#include <unistd.h>
 #include <fstream>
 #include <iostream>
 #include "ctsupport.h"
 #include "fnetorderstream.h"
 #include "array2dfile.h"
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include <mpi++.h>
 #endif
@@ -46,23 +46,14 @@ 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);\r
 
   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
@@ -79,23 +70,14 @@ 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); }
 
-  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
@@ -112,13 +94,15 @@ typedef F64Image   ImageFileBase;
 typedef kfloat64   ImageFileValue;
 typedef kfloat64*  ImageFileColumn;
 typedef kfloat64** ImageFileArray;
-typedef const kfloat64* const * ImageFileArrayConst;
+typedef kfloat64** const ImageFileArrayConst;\r
+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;\r
 #endif
 
 
@@ -136,16 +120,26 @@ 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 printStatistics (ostream& os) const;
-
+  void getMinMax (double& min, double& max) 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;
-
-  int display (void);
-
-  int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax);
+  bool printComparativeStatistics (const ImageFile& imComp, std::ostream& os) const;
+\r
+  bool subtractImages (const ImageFile& rRHS, ImageFile& result) const;
+  bool addImages (const ImageFile& rRHS, ImageFile& result) const;\r
+  bool multiplyImages (const ImageFile& rRHS, ImageFile& result) const;\r
+  bool divideImages (const ImageFile& rRHS, ImageFile& result) const;\r
+\r
+  bool invertPixelValues (ImageFile& result) const;\r
+  bool sqrt (ImageFile& result) const;\r
+  bool square (ImageFile& result) const;\r
+  bool log (ImageFile& result) const;\r
+  bool exp (ImageFile& result) const;\r
+  bool FFTMagnitude (ImageFile& result) const;\r
+  bool FFTPhase (ImageFile& result) const;\r
+\r
+  int display (void) const;
+  int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax) const;
 
 #if HAVE_PNG
   void writeImagePNG (const char *outfile, int bitdepth, int nxcell, int nycell, double densmin, double densmax);