X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=include%2Fimagefile.h;h=a5dfd3af54a9225bb0c205a59988c03f52bd0e32;hb=dca8d386ab6a4e33050b456cff4547d6adfdf249;hp=f300cdba9bc8d43990a88b495edf1652cef4d0b4;hpb=8a7697ce57b56cdc43698cd1241ad98d49f9b5ac;p=ctsim.git diff --git a/include/imagefile.h b/include/imagefile.h index f300cdb..a5dfd3a 100644 --- a/include/imagefile.h +++ b/include/imagefile.h @@ -1,15 +1,13 @@ /***************************************************************************** ** FILE IDENTIFICATION ** -** Name: imagefile.h +** Name: imagefile.h ** Purpose: imagefile class header -** Programmer: Kevin Rosenberg -** Date Started: June 2000 +** Programmer: Kevin Rosenberg +** Date Started: June 2000 ** ** This is part of the CTSim program -** Copyright (c) 1983-2001 Kevin Rosenberg -** -** $Id$ +** Copyright (c) 1983-2009 Kevin Rosenberg ** ** 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 @@ -46,7 +44,7 @@ class F32Image : public Array2dFile { public: - F32Image (int nx, int ny, int dataType = Array2dFile::DATA_TYPE_REAL); + F32Image (int nx, int ny, int dataType = Array2dFile::DATA_TYPE_REAL); F32Image (void); kfloat32** getArray (void) @@ -238,7 +236,7 @@ public: static double redGrayscaleFactor() {return s_dRedGrayscaleFactor;} static double greenGrayscaleFactor() {return s_dGreenGrayscaleFactor;} static double blueGrayscaleFactor() {return s_dBlueGrayscaleFactor;} - static double colorToGrayscale (double r, double g, double b) + static double colorToGrayscale (double r, double g, double b) { return r * s_dRedGrayscaleFactor + g * s_dGreenGrayscaleFactor + b * s_dBlueGrayscaleFactor; } };