Debug RTStruct conversion with empty struc

[clitk.git] / utilities / CxImage / ximagif.cpp

diff --git a/utilities/CxImage/ximagif.cpp b/utilities/CxImage/ximagif.cpp
index 0c89759749f6d88f9a7eda18b989a76fcbf69d7c..16fd3a51b718cd7c3e51edf91411a1ae91c17477 100644 (file)
--- a/utilities/CxImage/ximagif.cpp
+++ b/utilities/CxImage/ximagif.cpp
@@ -478,7 +478,7 @@ bool CxImageGIF::Encode(CxFile * fp, CxImage ** pImages, int pagecount, bool bLo
        ghost.EncodeHeader(fp);
 
        if (m_loops!=1){
-               ghost.SetLoops(max(0,m_loops-1));
+               ghost.SetLoops(__max(0,m_loops-1));
                ghost.EncodeLoopExtension(fp);
        }
 
@@ -1340,10 +1340,10 @@ void CxImageGIF::GetComment(char* sz_comment_out)
 ////////////////////////////////////////////////////////////////////////////////
 void CxImageGIF::GifMix(CxImage & imgsrc2, struct_image & imgdesc)
 {
-       long ymin = max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
+       long ymin = __max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h));
        long ymax = GetHeight()-imgdesc.t;
        long xmin = imgdesc.l;
-       long xmax = min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
+       long xmax = __min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w));
 
        long ibg2= imgsrc2.GetTransIndex();
     BYTE i2;