From c619f1f49ac210695071df1965d129bd2906110d Mon Sep 17 00:00:00 2001 From: acpaquette Date: Wed, 20 Nov 2024 11:07:02 -0700 Subject: [PATCH] Removed max again --- .../EquatorialCylindricalShape.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp index ba969599db..777c5ee2d9 100644 --- a/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp +++ b/isis/src/base/objs/EquatorialCylindricalShape/EquatorialCylindricalShape.cpp @@ -32,8 +32,6 @@ find files of those names at the top level of this repository. **/ using namespace std; -#define MAX(x,y) (((x) > (y)) ? (x) : (y)) - namespace Isis { /** * Initialize the ISIS Equatorial Cylindrical shape model. @@ -222,7 +220,7 @@ namespace Isis { // Set dalpha to be half the grid spacing for nyquist sampling //double dalpha = (PI/180.0)/(2.0*p_demScale); double cmin = cos((90.0 - 1.0 / (2.0 * demScale())) * DEG2RAD); - double dalpha = MAX(cos(g1lat * DEG2RAD), cmin) / (2.0 * demScale() * RAD2DEG); + double dalpha = std::max(cos(g1lat * DEG2RAD), cmin) / (2.0 * demScale() * RAD2DEG); // Previous Sensor version used local version of this method with lat and lon doubles. Steven said // it didn't make a significant difference in speed. @@ -390,7 +388,7 @@ namespace Isis { // put in a test (above) for dd being smaller than the pixel // convergence tolerance. If so the loop exits without an // intersection - dalpha = MAX(cos(g2lat * DEG2RAD), cmin) / (2.0 * demScale() * RAD2DEG); + dalpha = std::max(cos(g2lat * DEG2RAD), cmin) / (2.0 * demScale() * RAD2DEG); } // end while SpiceDouble intersectionPoint[3];