X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fimagefile.h;h=5f8c3248e2f7e7709adce82672aad04a85115524;hb=30e455abcd8cac05ce7afe43216ec9e26342e1cf;hp=c5a68e726b3073a950c3006d68e8e0b8a4666968;hpb=2f3d6e2580db607105bb072b13e4aff453ae4495;p=ctsim.git diff --git a/include/imagefile.h b/include/imagefile.h index c5a68e7..5f8c324 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.17 2000/07/11 10:32:44 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 @@ -61,7 +61,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 +94,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 +112,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 @@ -145,6 +147,14 @@ class ImageFile : public ImageFileBase int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax); +#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); };