projects
/
ctsim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c2aaf11
)
fix compilation warnings
author
Kevin Rosenberg
<kevin@rosenberg.net>
Mon, 3 Aug 2009 15:33:02 +0000
(09:33 -0600)
committer
Kevin Rosenberg
<kevin@rosenberg.net>
Mon, 3 Aug 2009 15:33:02 +0000
(09:33 -0600)
libctsim/imagefile.cpp
patch
|
blob
|
history
diff --git
a/libctsim/imagefile.cpp
b/libctsim/imagefile.cpp
index e0fa35f2ae1e5b166995b50b83e0cba29651bec8..bcc9b20fc09c9ecf92b2a6aa46dec8f5b1f0cfd9 100644
(file)
--- a/
libctsim/imagefile.cpp
+++ b/
libctsim/imagefile.cpp
@@
-384,7
+384,7
@@
ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const
return false;
}
return false;
}
- if (isComplex() ||
rRHS.isComplex() && ! result.isComplex(
))
+ if (isComplex() ||
(rRHS.isComplex() && ! result.isComplex()
))
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
@@
-418,7
+418,7
@@
ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const
return false;
}
return false;
}
- if (isComplex() ||
rRHS.isComplex() && ! result.isComplex(
))
+ if (isComplex() ||
(rRHS.isComplex() && ! result.isComplex()
))
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
@@
-452,7
+452,7
@@
ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const
return false;
}
return false;
}
- if (isComplex() ||
rRHS.isComplex() && ! result.isComplex(
))
+ if (isComplex() ||
(rRHS.isComplex() && ! result.isComplex()
))
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
@@
-493,7
+493,7
@@
ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const
return false;
}
return false;
}
- if (isComplex() ||
rRHS.isComplex() && ! result.isComplex(
))
+ if (isComplex() ||
(rRHS.isComplex() && ! result.isComplex()
))
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
result.convertRealToComplex();
ImageFileArrayConst vLHS = getArray();
@@
-700,11
+700,13
@@
ImageFile::scaleImage (ImageFile& result) const
double dXPos = ix / dXScale;
double dYPos = iy / dYScale;
vResult[ix][iy] = realInterp.interpolate (dXPos, dYPos);
double dXPos = ix / dXScale;
double dYPos = iy / dYScale;
vResult[ix][iy] = realInterp.interpolate (dXPos, dYPos);
- if (result.isComplex())
- if (isComplex())
+ if (result.isComplex())
{
+ if (isComplex())
{
vResultImag[ix][iy] = imagInterp.interpolate (dXPos, dYPos);
vResultImag[ix][iy] = imagInterp.interpolate (dXPos, dYPos);
- else
+ } else {
vResultImag[ix][iy] = 0;
vResultImag[ix][iy] = 0;
+ }
+ }
}
}
}
}