From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Mon, 3 Aug 2009 15:33:02 +0000 (-0600)
Subject: fix compilation warnings
X-Git-Tag: v5.0.6~9
X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=commitdiff_plain;h=85c4062656d1cbdc0ef0f120eb11b5b73c38665c

fix compilation warnings
---

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;
+        }
+      }
     }
   }