X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximaiter.h;h=cd5c26667c5944998bbb1e1d3591ff3d5ac1f131;hb=b07ea516b22fea80f721f2f984c4ae9e3c33ef0a;hp=9788919b8f6d63ee9247fd7f1686ea250e1ca82e;hpb=d268b74408bad9a7388c864e01627d8217549bd6;p=clitk.git

diff --git a/utilities/CxImage/ximaiter.h b/utilities/CxImage/ximaiter.h
index 9788919..cd5c266 100644
--- 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()