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

diff --git a/include/imagefile.h b/include/imagefile.h
index c5a68e7..6b6b4d5 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.15 2000/06/26 21:15:24 kevin Exp $
+**  $Id: imagefile.h,v 1.19 2000/12/04 04:15:48 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,9 +28,11 @@
 #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"
@@ -61,7 +63,7 @@ public:
   kfloat32** getArray (void)
       { return (kfloat32**) (m_arrayData); }
 
-  const kfloat32** getArray (void) const
+  const kfloat32* const * getArray (void) const
        { return (const kfloat32**) (m_arrayData); }
 
 #ifdef HAVE_MPI
@@ -94,7 +96,7 @@ class F64Image : public Array2dFile
   kfloat64** getArray (void)
       { return (kfloat64**) (m_arrayData); }
 
-  const kfloat64** getArray (void) const
+  const kfloat64* const * getArray (void) const
       { return (const kfloat64**) (m_arrayData); }
 
 #ifdef HAVE_MPI
@@ -112,11 +114,13 @@ typedef F64Image   ImageFileBase;
 typedef kfloat64   ImageFileValue;
 typedef kfloat64*  ImageFileColumn;
 typedef kfloat64** ImageFileArray;
+typedef const kfloat64* const * ImageFileArrayConst;
 #else
 typedef F32Image   ImageFileBase;
 typedef kfloat32   ImageFileValue;
 typedef kfloat32*  ImageFileColumn;
 typedef kfloat32** ImageFileArray;
+typedef const kfloat32* const * ImageFileArrayConst;
 #endif
 
 
@@ -135,16 +139,26 @@ class ImageFile : public ImageFileBase
 
   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;
 
   bool comparativeStatistics (const ImageFile& imComp, double& d, double& r, double& e) const;
 
   bool printComparativeStatistics (const ImageFile& imComp, 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);
+#endif
+#if HAVE_GD
+  void writeImageGIF (const char *outfile, int nxcell, int nycell, double densmin, double densmax);
+#endif
+  void writeImagePGM (const char *outfile, int nxcell, int nycell, double densmin, double densmax);
+  void writeImagePGMASCII (const char *outfile, int nxcell, int nycell, double densmin, double densmax);
 };