Index: modules/awt/src/main/native/lcmm/shared/NativeCMM.c =================================================================== --- modules/awt/src/main/native/lcmm/shared/NativeCMM.c (revision 596455) +++ modules/awt/src/main/native/lcmm/shared/NativeCMM.c (working copy) @@ -22,7 +22,7 @@ #include "NativeCMM.h" -static BOOL cmsInitialized = FALSE; +static LCMSBOOL cmsInitialized = FALSE; static char *errMsg = NULL; int gl_cmsErrorHandler(int errorCode, const char *msg) { @@ -356,8 +356,8 @@ int srcPixelStride, dstPixelStride; BYTE *srcPtr, *dstPtr; int i; - BOOL copyAlpha = FALSE; - BOOL fillAlpha = FALSE; + LCMSBOOL copyAlpha = FALSE; + LCMSBOOL fillAlpha = FALSE; cmsHTRANSFORM xform = (cmsHTRANSFORM) ((IDATA)transformHandle); Index: modules/awt/src/main/native/lcmm/shared/cmmio.c =================================================================== --- modules/awt/src/main/native/lcmm/shared/cmmio.c (revision 596455) +++ modules/awt/src/main/native/lcmm/shared/cmmio.c (working copy) @@ -52,8 +52,8 @@ typedef struct { LPBYTE Base; // Base pointer LPBYTE CurrPtr; // Moving pointer - BOOL needsUpdate; // Tag sizes changed or tags added/removed - BOOL needsUpdateCriticalTags; // Critical tags changed + LCMSBOOL needsUpdate; // Tag sizes changed or tags added/removed + LCMSBOOL needsUpdateCriticalTags; // Critical tags changed size_t size; } MemBuffer; @@ -72,7 +72,7 @@ return buffer; } -static BOOL allocMemBuffer(LPVOID f, size_t size) { +static LCMSBOOL allocMemBuffer(LPVOID f, size_t size) { MemBuffer* memBuffer = (MemBuffer*) f; memBuffer->CurrPtr = malloc(size); @@ -88,7 +88,7 @@ return TRUE; } -static BOOL closeMemBuffer(MemBuffer **buffer) { +static LCMSBOOL closeMemBuffer(MemBuffer **buffer) { if(*buffer) free(*buffer); *buffer = NULL; @@ -105,7 +105,7 @@ return count; } -static BOOL seekMemBuffer(LPVOID f, size_t offset) { +static LCMSBOOL seekMemBuffer(LPVOID f, size_t offset) { MemBuffer* memBuffer = (MemBuffer*) f; memBuffer->CurrPtr = memBuffer->Base + offset; @@ -117,7 +117,7 @@ return memBuffer->CurrPtr - memBuffer->Base; } -static BOOL writeMemBuffer(LPVOID f, size_t size, LPBYTE Data) { +static LCMSBOOL writeMemBuffer(LPVOID f, size_t size, LPBYTE Data) { MemBuffer* memBuffer = (MemBuffer*) f; if (size == 0) return TRUE; @@ -145,7 +145,7 @@ } -static BOOL updateHeader(LPLCMSICCPROFILE Icc) { +static LCMSBOOL updateHeader(LPLCMSICCPROFILE Icc) { icHeader head; readMemBuffer(&head, sizeof(icHeader), 1, Icc -> stream); @@ -479,7 +479,7 @@ -BOOL cmmCloseProfile(LPLCMSICCPROFILE hProfile) { +LCMSBOOL cmmCloseProfile(LPLCMSICCPROFILE hProfile) { return cmsCloseProfile(hProfile); @@ -509,7 +509,7 @@ -BOOL cmmGetProfileElement( +LCMSBOOL cmmGetProfileElement( LPLCMSICCPROFILE hProfile, @@ -572,7 +572,7 @@ -BOOL cmmGetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data, size_t size) { +LCMSBOOL cmmGetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data, size_t size) { size_t bytesToRead = MIN(size, sizeof(icHeader)); @@ -586,7 +586,7 @@ -BOOL cmmSetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data) { +LCMSBOOL cmmSetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data) { seekMemBuffer(hProfile->stream, 0); @@ -606,7 +606,7 @@ -BOOL cmmSetProfileElement(LPLCMSICCPROFILE hProfile, icTagSignature sig, LPVOID data, size_t size) { +LCMSBOOL cmmSetProfileElement(LPLCMSICCPROFILE hProfile, icTagSignature sig, LPVOID data, size_t size) { MemBuffer *memBuffer; Index: modules/awt/src/main/native/lcmm/shared/cmmapi.h =================================================================== --- modules/awt/src/main/native/lcmm/shared/cmmapi.h (revision 596455) +++ modules/awt/src/main/native/lcmm/shared/cmmapi.h (working copy) @@ -26,16 +26,18 @@ #define cmsFLAGS_NOTCACHE (0) #endif +#if (LCMS_VERSION < 117) +#define LCMSBOOL BOOL +#endif // Just a useful macro #undef MIN - #define MIN(a,b) ((a) < (b) ? (a) : (b)) LPLCMSICCPROFILE cmmOpenProfile(LPBYTE dataPtr, DWORD dwSize); -BOOL cmmCloseProfile(LPLCMSICCPROFILE hProfile); +LCMSBOOL cmmCloseProfile(LPLCMSICCPROFILE hProfile); @@ -45,17 +47,17 @@ -BOOL cmmGetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data, size_t dwLen); +LCMSBOOL cmmGetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data, size_t dwLen); -BOOL cmmSetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data); +LCMSBOOL cmmSetProfileHeader(LPLCMSICCPROFILE hProfile, LPBYTE data); -BOOL cmmGetProfileElement(LPLCMSICCPROFILE hProfile, icTagSignature sig, LPBYTE data, size_t *dataSize); +LCMSBOOL cmmGetProfileElement(LPLCMSICCPROFILE hProfile, icTagSignature sig, LPBYTE data, size_t *dataSize); long cmmGetProfileElementSize(LPLCMSICCPROFILE hProfile, icTagSignature sig); -BOOL cmmSetProfileElement(LPLCMSICCPROFILE hProfile, icTagSignature sig, LPVOID data, size_t size); +LCMSBOOL cmmSetProfileElement(LPLCMSICCPROFILE hProfile, icTagSignature sig, LPVOID data, size_t size); cmsHTRANSFORM cmmCreateTransform(cmsHPROFILE Input, Index: modules/awt/src/main/native/lcmm/shared/cmmxforms.c =================================================================== --- modules/awt/src/main/native/lcmm/shared/cmmxforms.c (revision 596455) +++ modules/awt/src/main/native/lcmm/shared/cmmxforms.c (working copy) @@ -27,7 +27,7 @@ int count; // Number of transforms } MultiprofileXform; -BOOL doMultiprofileTransform(MultiprofileXform *xform, LPVOID in, LPVOID out, unsigned int size) { +LCMSBOOL doMultiprofileTransform(MultiprofileXform *xform, LPVOID in, LPVOID out, unsigned int size) { cmsHTRANSFORM* Transforms = xform->xforms; int i, bpp; DWORD outFmt;