X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fimagefile.h;h=443bf33a78547703a8a4edcbe7b118dc464fb3dc;hp=5f8c3248e2f7e7709adce82672aad04a85115524;hb=dc034c9d0b7d9c3874a324a4c2c189a02945adc8;hpb=30e455abcd8cac05ce7afe43216ec9e26342e1cf

diff --git a/include/imagefile.h b/include/imagefile.h
index 5f8c324..443bf33 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.17 2000/07/11 10:32:44 kevin Exp $
+**  $Id: imagefile.h,v 1.22 2000/12/16 06:12:47 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
+#include <unistd.h>
+#endif
 #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,17 +46,8 @@ 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);
 
   kfloat32** getArray (void)
       { return (kfloat32**) (m_arrayData); }
@@ -79,17 +70,8 @@ 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); }
@@ -137,15 +119,17 @@ class ImageFile : public ImageFileBase
 
   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;
+  bool printComparativeStatistics (const ImageFile& imComp, std::ostream& os) const;
 
-  int display (void);
+  int display (void) const;
 
-  int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax);
+  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);