]> Creatis software - clitk.git/blobdiff - utilities/CxImage/ximage.cpp
With ITK 5.0, itk::ProcessObject::VerifyInputInformation are now declared const
[clitk.git] / utilities / CxImage / ximage.cpp
index e81d3c6c8e2487d85c9a310c10aec0dfc2927339..1b94d3b6e13586abcf688402e6f24f31c3e7b230 100644 (file)
@@ -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));
                        }
                }
        }