X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2Fjpeg%2Fljpg%2Fjpeg.h;h=fa32bc1abee2eb0405fbd6751a99158fca13080e;hb=59b7e8c61d23c966e15301514b498695f29577f7;hp=fe80d5da3ca7bd84e046ed1aead168bc25733b9b;hpb=1c730c1bfe5b15f0e82e1994971f72cfd82d42da;p=gdcm.git diff --git a/src/jpeg/ljpg/jpeg.h b/src/jpeg/ljpg/jpeg.h index fe80d5da..fa32bc1a 100644 --- a/src/jpeg/ljpg/jpeg.h +++ b/src/jpeg/ljpg/jpeg.h @@ -4,11 +4,13 @@ * Basic jpeg data structure definitions. */ /* - * $Id: jpeg.h,v 1.2 2003/10/29 18:24:40 malaterre Exp $ + * $Id: jpeg.h,v 1.3 2004/01/07 10:07:28 regrain Exp $ */ #ifndef _JPEG #define _JPEG +#include + /* a function referenced thru EXTERNs: */ #ifdef WIN32 #define GLOBAL(type) __declspec( dllexport ) type @@ -173,7 +175,7 @@ typedef struct DecompressInfo * *-------------------------------------------------------------- */ -#define swap(type,a,b) {type c; c=(a); (a)=(b); (b)=c;} +#define gdcmSWAP(type,a,b) {type c; c=(a); (a)=(b); (b)=c;} #define MEMSET(s,c,n) memset((void *)(s),(int)(c),(int)(n)) #define MEMCPY(s1,s2,n) memcpy((void *)(s1),(void *)(s2),(int)(n))