X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fimagefile.h;h=443bf33a78547703a8a4edcbe7b118dc464fb3dc;hb=fd1d136a94a6d20013f38d6a997bdfefad0f5e98;hp=6b6b4d530fac706ddf664dedb534ee74dc13df68;hpb=baba40afccf75bd75d612980fee023ff22c40952;p=ctsim.git

diff --git a/include/imagefile.h b/include/imagefile.h
index 6b6b4d5..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.19 2000/12/04 04:15:48 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
@@ -39,8 +39,6 @@
 #include "fnetorderstream.h"
 #include "array2dfile.h"
 
-using namespace std;
-
 #ifdef HAVE_MPI
 #include <mpi++.h>
 #endif
@@ -48,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); }
@@ -81,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); }
@@ -141,11 +121,11 @@ class ImageFile : public ImageFileBase
 
   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;
 
   int display (void) const;