projects
/
ctsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r314: ezplot fixes
[ctsim.git]
/
include
/
imagefile.h
diff --git
a/include/imagefile.h
b/include/imagefile.h
index ae090e78e713eff199121e4f77c0dc09278bf74c..a7e69d75f54dba97efacc239d0de3ec7b57cfbb7 100644
(file)
--- 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
**
** This is part of the CTSim program
** Copyright (C) 1983-2000 Kevin Rosenberg
**
-** $Id: imagefile.h,v 1.2
0 2000/12/04 05:36:57
kevin Exp $
+** $Id: imagefile.h,v 1.2
3 2000/12/22 04:18:00
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
**
** 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"
#include "fnetorderstream.h"
#include "array2dfile.h"
-using namespace std;
-
#ifdef HAVE_MPI
#include <mpi++.h>
#endif
#ifdef HAVE_MPI
#include <mpi++.h>
#endif
@@
-54,8
+52,8
@@
public:
kfloat32** getArray (void)
{ return (kfloat32**) (m_arrayData); }
kfloat32** getArray (void)
{ return (kfloat32**) (m_arrayData); }
-
const kfloat32* const *
getArray (void) const
- { return (
const kfloat32**
) (m_arrayData); }
+
kfloat32** const
getArray (void) const
+ { return (
kfloat32** const
) (m_arrayData); }
#ifdef HAVE_MPI
MPI::Datatype getMPIDataType (void) const
#ifdef HAVE_MPI
MPI::Datatype getMPIDataType (void) const
@@
-78,8
+76,8
@@
class F64Image : public Array2dFile
kfloat64** getArray (void)
{ return (kfloat64**) (m_arrayData); }
kfloat64** getArray (void)
{ return (kfloat64**) (m_arrayData); }
-
const kfloat64* const *
getArray (void) const
- { return (
const kfloat64**
) (m_arrayData); }
+
kfloat64** const
getArray (void) const
+ { return (
kfloat64** const
) (m_arrayData); }
#ifdef HAVE_MPI
MPI::Datatype getMPIDataType (void) const
#ifdef HAVE_MPI
MPI::Datatype getMPIDataType (void) const
@@
-96,13
+94,15
@@
typedef F64Image ImageFileBase;
typedef kfloat64 ImageFileValue;
typedef kfloat64* ImageFileColumn;
typedef kfloat64** ImageFileArray;
typedef kfloat64 ImageFileValue;
typedef kfloat64* ImageFileColumn;
typedef kfloat64** ImageFileArray;
-typedef const kfloat64* const * ImageFileArrayConst;
+typedef kfloat64** const ImageFileArrayConst;
\r
+typedef const kfloat64* ImageFileColumnConst;
#else
typedef F32Image ImageFileBase;
typedef kfloat32 ImageFileValue;
typedef kfloat32* ImageFileColumn;
typedef kfloat32** ImageFileArray;
#else
typedef F32Image ImageFileBase;
typedef kfloat32 ImageFileValue;
typedef kfloat32* ImageFileColumn;
typedef kfloat32** ImageFileArray;
-typedef const kfloat32* const * ImageFileArrayConst;
+typedef kfloat32** const ImageFileArrayConst;
+typedef const kfloat32* ImageFileColumnConst;
\r
#endif
#endif
@@
-123,12
+123,20
@@
class ImageFile : public ImageFileBase
void getMinMax (double& min, double& max) const;
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 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;
+
\r
+ bool subtractImages (const ImageFile& rRHS, ImageFile& result) const;
\r
+ bool addImages (const ImageFile& rRHS, ImageFile& result) const;
\r
+
\r
+ bool multiplyImages (const ImageFile& rRHS, ImageFile& result) const;
\r
+
\r
+ bool divideImages (const ImageFile& rRHS, ImageFile& result) const;
\r
+
\r
int display (void) const;
int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax) const;
int display (void) const;
int displayScaling (const int scaleFactor, ImageFileValue pmin, ImageFileValue pmax) const;