COMP: renamed min max macros which are no longer allowed

[clitk.git] / utilities / CxImage / ximaint.cpp

diff --git a/utilities/CxImage/ximaint.cpp b/utilities/CxImage/ximaint.cpp
index 989d76cf71e3d1014cb7b95d2e46706a2995c0dd..96b445aa0bd87351cf5ff10daa425a6061b1fc02 100644 (file)
--- a/utilities/CxImage/ximaint.cpp
+++ b/utilities/CxImage/ximaint.cpp
@@ -26,8 +26,8 @@ void CxImage::OverflowCoordinates(long &x, long &y, OverflowMethod const ofMetho
   switch (ofMethod) {
     case OM_REPEAT:
       //clip coordinates
-      x=max(x,0); x=min(x, head.biWidth-1);
-      y=max(y,0); y=min(y, head.biHeight-1);
+      x=__max(x,0); x=__min(x, head.biWidth-1);
+      y=__max(y,0); y=__min(y, head.biHeight-1);
       break;
     case OM_WRAP:
       //wrap coordinates
@@ -59,8 +59,8 @@ void CxImage::OverflowCoordinates(float &x, float &y, OverflowMethod const ofMet
   switch (ofMethod) {
     case OM_REPEAT:
       //clip coordinates
-      x=max(x,0); x=min(x, head.biWidth-1);
-      y=max(y,0); y=min(y, head.biHeight-1);
+      x=__max(x,0); x=__min(x, head.biWidth-1);
+      y=__max(y,0); y=__min(y, head.biHeight-1);
       break;
     case OM_WRAP:
       //wrap coordinates
@@ -853,7 +853,7 @@ float CxImage::KernelBessel_J1(const float x)
 {
        double p, q;
        
-       register long i;
+       long i;
        
        static const double
        Pone[] =
@@ -895,7 +895,7 @@ float CxImage::KernelBessel_P1(const float x)
 {
        double p, q;
        
-       register long i;
+       long i;
        
        static const double
        Pone[] =
@@ -931,7 +931,7 @@ float CxImage::KernelBessel_Q1(const float x)
 {
        double p, q;
        
-       register long i;
+       long i;
        
        static const double
        Pone[] =