X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fimagefile.h;h=a5dfd3af54a9225bb0c205a59988c03f52bd0e32;hp=6dd8fe7cb84527168f2910ec7b5d419a8dcaf803;hb=f13a8c004b8f182b42d9e4df2bcd7c7f030bf1ad;hpb=bd1d464294e037da19ccc80d8cc60475768eb2ca diff --git a/include/imagefile.h b/include/imagefile.h index 6dd8fe7..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: imagefile.h,v 1.36 2001/09/24 09:40:42 kevin Exp $ +** 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; } };