X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximage.cpp;h=1b94d3b6e13586abcf688402e6f24f31c3e7b230;hb=b07ea516b22fea80f721f2f984c4ae9e3c33ef0a;hp=e81d3c6c8e2487d85c9a310c10aec0dfc2927339;hpb=df724140fd47a31aaa0feaba5938a1eecb263741;p=clitk.git

diff --git a/utilities/CxImage/ximage.cpp b/utilities/CxImage/ximage.cpp
index e81d3c6..1b94d3b 100644
--- a/utilities/CxImage/ximage.cpp
+++ b/utilities/CxImage/ximage.cpp
@@ -460,7 +460,7 @@ bool CxImage::CreateFromArray(BYTE* pArray,DWORD dwWidth,DWORD dwHeight,DWORD dw
 				src+=4;
 			}
 		} else {
-			memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
+			memcpy(dst,src,__min(info.dwEffWidth,dwBytesperline));
 		}
 	}
 	return true;
@@ -500,7 +500,7 @@ bool CxImage::CreateFromMatrix(BYTE** ppMatrix,DWORD dwWidth,DWORD dwHeight,DWOR
 					src+=4;
 				}
 			} else {
-				memcpy(dst,src,min(info.dwEffWidth,dwBytesperline));
+				memcpy(dst,src,__min(info.dwEffWidth,dwBytesperline));
 			}
 		}
 	}