With ITK 5.0, itk::ProcessObject::VerifyInputInformation are now declared const

[clitk.git] / utilities / CxImage / ximaiter.h

diff --git a/utilities/CxImage/ximaiter.h b/utilities/CxImage/ximaiter.h
index 9788919b8f6d63ee9247fd7f1686ea250e1ca82e..cd5c26667c5944998bbb1e1d3591ff3d5ac1f131 100644 (file)
--- a/utilities/CxImage/ximaiter.h
+++ b/utilities/CxImage/ximaiter.h
@@ -140,7 +140,7 @@ inline void CImageIterator::SetY(int y)
 inline void CImageIterator::SetRow(BYTE *buf, int n)
 {
        if (n<0) n = (int)ima->GetEffWidth();
-       else n = min(n,(int)ima->GetEffWidth());
+       else n = __min(n,(int)ima->GetEffWidth());
 
        if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) memcpy(IterImage,buf,n);
 }
@@ -148,7 +148,7 @@ inline void CImageIterator::SetRow(BYTE *buf, int n)
 inline void CImageIterator::GetRow(BYTE *buf, int n)
 {
        if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0))
-               memcpy(buf,IterImage,min(n,(int)ima->GetEffWidth()));
+               memcpy(buf,IterImage,__min(n,(int)ima->GetEffWidth()));
 }
 /////////////////////////////////////////////////////////////////////
 inline BYTE* CImageIterator::GetRow()