From 85c4062656d1cbdc0ef0f120eb11b5b73c38665c Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Mon, 3 Aug 2009 09:33:02 -0600 Subject: [PATCH] fix compilation warnings --- libctsim/imagefile.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/libctsim/imagefile.cpp b/libctsim/imagefile.cpp index e0fa35f..bcc9b20 100644 --- a/libctsim/imagefile.cpp +++ b/libctsim/imagefile.cpp @@ -384,7 +384,7 @@ ImageFile::subtractImages (const ImageFile& rRHS, ImageFile& result) const return false; } - if (isComplex() || rRHS.isComplex() && ! result.isComplex()) + if (isComplex() || (rRHS.isComplex() && ! result.isComplex())) result.convertRealToComplex(); ImageFileArrayConst vLHS = getArray(); @@ -418,7 +418,7 @@ ImageFile::addImages (const ImageFile& rRHS, ImageFile& result) const return false; } - if (isComplex() || rRHS.isComplex() && ! result.isComplex()) + if (isComplex() || (rRHS.isComplex() && ! result.isComplex())) result.convertRealToComplex(); ImageFileArrayConst vLHS = getArray(); @@ -452,7 +452,7 @@ ImageFile::multiplyImages (const ImageFile& rRHS, ImageFile& result) const return false; } - if (isComplex() || rRHS.isComplex() && ! result.isComplex()) + if (isComplex() || (rRHS.isComplex() && ! result.isComplex())) result.convertRealToComplex(); ImageFileArrayConst vLHS = getArray(); @@ -493,7 +493,7 @@ ImageFile::divideImages (const ImageFile& rRHS, ImageFile& result) const return false; } - if (isComplex() || rRHS.isComplex() && ! result.isComplex()) + if (isComplex() || (rRHS.isComplex() && ! result.isComplex())) 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); - if (result.isComplex()) - if (isComplex()) + if (result.isComplex()) { + if (isComplex()) { vResultImag[ix][iy] = imagInterp.interpolate (dXPos, dYPos); - else + } else { vResultImag[ix][iy] = 0; + } + } } } -- 2.34.1