X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximath.cpp;h=8d8cf13d0da839ed8498cc2eaaefd7fbc0335546;hb=b07ea516b22fea80f721f2f984c4ae9e3c33ef0a;hp=37533e2280c0e6c0f4227d4a9ee467e0179b6ee2;hpb=2b4f24763b17fe431e37952269c8efb83b9fb06b;p=clitk.git diff --git a/utilities/CxImage/ximath.cpp b/utilities/CxImage/ximath.cpp index 37533e2..8d8cf13 100644 --- a/utilities/CxImage/ximath.cpp +++ b/utilities/CxImage/ximath.cpp @@ -64,10 +64,10 @@ CxRect2 CxRect2::CrossSection(CxRect2 const &r2) const */ { CxRect2 cs; - cs.botLeft.x=max(botLeft.x, r2.botLeft.x); - cs.botLeft.y=max(botLeft.y, r2.botLeft.y); - cs.topRight.x=min(topRight.x, r2.topRight.x); - cs.topRight.y=min(topRight.y, r2.topRight.y); + cs.botLeft.x=__max(botLeft.x, r2.botLeft.x); + cs.botLeft.y=__max(botLeft.y, r2.botLeft.y); + cs.topRight.x=__min(topRight.x, r2.topRight.x); + cs.topRight.y=__min(topRight.y, r2.topRight.y); if (cs.botLeft.x<=cs.topRight.x && cs.botLeft.y<=cs.topRight.y) { return cs; } else {