X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=utilities%2FCxImage%2Fximagif.cpp;h=16fd3a51b718cd7c3e51edf91411a1ae91c17477;hb=HEAD;hp=740717c730107874c3cbdebaca305a358e185bb0;hpb=2b4f24763b17fe431e37952269c8efb83b9fb06b;p=clitk.git

diff --git a/utilities/CxImage/ximagif.cpp b/utilities/CxImage/ximagif.cpp
index 740717c..16fd3a5 100644
--- 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);
 	}
 
@@ -718,8 +718,8 @@ void CxImageGIF::Putword(int w, CxFile *fp )
 ////////////////////////////////////////////////////////////////////////////////
 void CxImageGIF::compressNONE( int init_bits, CxFile* outfile)
 {
-	register long c;
-	register long ent;
+	long c;
+	long ent;
 
 	// g_init_bits - initial number of bits
 	// g_outfile   - pointer to output file
@@ -766,12 +766,12 @@ void CxImageGIF::compressNONE( int init_bits, CxFile* outfile)
 
 void CxImageGIF::compressLZW( int init_bits, CxFile* outfile)
 {
-	register long fcode;
-	register long c;
-	register long ent;
-	register long hshift;
-	register long disp;
-	register long i;
+	long fcode;
+	long c;
+	long ent;
+	long hshift;
+	long disp;
+	long i;
 
 	// g_init_bits - initial number of bits
 	// g_outfile   - pointer to output file
@@ -891,10 +891,10 @@ void CxImageGIF::output( code_int  code)
 void CxImageGIF::cl_hash(long hsize)
 
 {
-	register long *htab_p = htab+hsize;
+	long *htab_p = htab+hsize;
 
-	register long i;
-	register long m1 = -1L;
+	long i;
+	long m1 = -1L;
 
 	i = hsize - 16;
 
@@ -1061,9 +1061,9 @@ short CxImageGIF::get_next_code(CxFile* file)
  */
 short CxImageGIF::decoder(CxFile* file, CImageIterator* iter, short linewidth, int &bad_code_count)
 {
-	register BYTE *sp, *bufptr;
+	BYTE *sp, *bufptr;
 	BYTE *buf;
-	register short code, fc, oc, bufcnt;
+	short code, fc, oc, bufcnt;
 	short c, size, ret;
 
 	/* Initialize for decoding a new image... */
@@ -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;