X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximaint.cpp;h=b09d54968138d9e747e68e47a95ae67d7ed9ec93;hb=2f5757446082e4aaa115fecb700c544c0a8946dd;hp=989d76cf71e3d1014cb7b95d2e46706a2995c0dd;hpb=441099a730f593b2226f400afef8c756b05efc69;p=clitk.git diff --git a/utilities/CxImage/ximaint.cpp b/utilities/CxImage/ximaint.cpp index 989d76c..b09d549 100644 --- a/utilities/CxImage/ximaint.cpp +++ b/utilities/CxImage/ximaint.cpp @@ -26,8 +26,8 @@ void CxImage::OverflowCoordinates(long &x, long &y, OverflowMethod const ofMetho switch (ofMethod) { case OM_REPEAT: //clip coordinates - x=max(x,0); x=min(x, head.biWidth-1); - y=max(y,0); y=min(y, head.biHeight-1); + x=__max(x,0); x=__min(x, head.biWidth-1); + y=__max(y,0); y=__min(y, head.biHeight-1); break; case OM_WRAP: //wrap coordinates @@ -59,8 +59,8 @@ void CxImage::OverflowCoordinates(float &x, float &y, OverflowMethod const ofMet switch (ofMethod) { case OM_REPEAT: //clip coordinates - x=max(x,0); x=min(x, head.biWidth-1); - y=max(y,0); y=min(y, head.biHeight-1); + x=__max(x,0); x=__min(x, head.biWidth-1); + y=__max(y,0); y=__min(y, head.biHeight-1); break; case OM_WRAP: //wrap coordinates @@ -397,6 +397,8 @@ RGBQUAD CxImage::GetPixelColorInterpolated( kernely[i]=KernelPower((float)(yi+i-1-y)); }//for i break; + default: + i=0; }//switch rr=gg=bb=aa=0; if (((xi+2)