diff options
author | Marti Maria <info@littlecms.com> | 2012-07-02 17:58:16 +0200 |
---|---|---|
committer | Marti Maria <info@littlecms.com> | 2012-07-02 17:58:16 +0200 |
commit | dfd9a95708640ad1033e2ae3422e8412728d8223 (patch) | |
tree | e781584b89db636af293991d4148296415da3141 /include | |
parent | 88af283a5fe8051c7a6ae5328a80b15cb78cda41 (diff) | |
download | lcms2-dfd9a95708640ad1033e2ae3422e8412728d8223.tar.gz |
Trimmed files
Diffstat (limited to 'include')
-rw-r--r-- | include/lcms2.h | 22 | ||||
-rw-r--r-- | include/lcms2_plugin.h | 14 |
2 files changed, 18 insertions, 18 deletions
diff --git a/include/lcms2.h b/include/lcms2.h index f5976bd..b753405 100644 --- a/include/lcms2.h +++ b/include/lcms2.h @@ -78,9 +78,9 @@ extern "C" { typedef unsigned char cmsUInt8Number; // That is guaranteed by the C99 spec typedef signed char cmsInt8Number; // That is guaranteed by the C99 spec -#if CHAR_BIT != 8 +#if CHAR_BIT != 8 # error "Unable to find 8 bit type, unsupported compiler" -#endif +#endif // IEEE float storage numbers typedef float cmsFloat32Number; @@ -276,11 +276,11 @@ typedef enum { cmsSigUInt16ArrayType = 0x75693136, // 'ui16' cmsSigUInt32ArrayType = 0x75693332, // 'ui32' cmsSigUInt64ArrayType = 0x75693634, // 'ui64' - cmsSigUInt8ArrayType = 0x75693038, // 'ui08' + cmsSigUInt8ArrayType = 0x75693038, // 'ui08' cmsSigVcgtType = 0x76636774, // 'vcgt' cmsSigViewingConditionsType = 0x76696577, // 'view' cmsSigXYZType = 0x58595A20 // 'XYZ ' - + } cmsTagTypeSignature; @@ -613,7 +613,7 @@ typedef void* cmsHTRANSFORM; // Format of pixel is defined by one cmsUInt32Number, using bit fields as follows // // 2 1 0 -// 3 2 10987 6 5 4 3 2 1 098 7654 321 +// 3 2 10987 6 5 4 3 2 1 098 7654 321 // A O TTTTT U Y F P X S EEE CCCC BBB // // A: Floating point -- With this flag we can differentiate 16 bits as float and as int @@ -863,7 +863,7 @@ typedef void* cmsHTRANSFORM; #define TYPE_RGBA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)) #define TYPE_CMYK_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_CMYK)|CHANNELS_SH(4)|BYTES_SH(4)) -// Floating point formatters. +// Floating point formatters. // NOTE THAT 'BYTES' FIELD IS SET TO ZERO ON DLB because 8 bytes overflows the bitfield #define TYPE_XYZ_DBL (FLOAT_SH(1)|COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(0)) #define TYPE_Lab_DBL (FLOAT_SH(1)|COLORSPACE_SH(PT_Lab)|CHANNELS_SH(3)|BYTES_SH(0)) @@ -1360,9 +1360,9 @@ CMSAPI cmsInt32Number CMSEXPORT cmsReadRawTag(cmsHPROFILE hProfile, cmsTagSig CMSAPI cmsBool CMSEXPORT cmsWriteRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, const void* data, cmsUInt32Number Size); // Access header data -#define cmsEmbeddedProfileFalse 0x00000000 -#define cmsEmbeddedProfileTrue 0x00000001 -#define cmsUseAnywhere 0x00000000 +#define cmsEmbeddedProfileFalse 0x00000000 +#define cmsEmbeddedProfileTrue 0x00000001 +#define cmsUseAnywhere 0x00000000 #define cmsUseWithEmbeddedDataOnly 0x00000002 CMSAPI cmsUInt32Number CMSEXPORT cmsGetHeaderFlags(cmsHPROFILE hProfile); @@ -1669,8 +1669,8 @@ CMSAPI cmsUInt32Number CMSEXPORT cmsGetTransformInputFormat(cmsHTRANSFORM hTrans CMSAPI cmsUInt32Number CMSEXPORT cmsGetTransformOutputFormat(cmsHTRANSFORM hTransform); // For backwards compatibility -CMSAPI cmsBool CMSEXPORT cmsChangeBuffersFormat(cmsHTRANSFORM hTransform, - cmsUInt32Number InputFormat, +CMSAPI cmsBool CMSEXPORT cmsChangeBuffersFormat(cmsHTRANSFORM hTransform, + cmsUInt32Number InputFormat, cmsUInt32Number OutputFormat); diff --git a/include/lcms2_plugin.h b/include/lcms2_plugin.h index e54bccf..7c014bf 100644 --- a/include/lcms2_plugin.h +++ b/include/lcms2_plugin.h @@ -387,7 +387,7 @@ typedef struct _cms_typehandler_struct { void *Ptr); // Additional parameters used by the calling thread - cmsContext ContextID; + cmsContext ContextID; cmsUInt32Number ICCVersion; } cmsTagTypeHandler; @@ -490,22 +490,22 @@ typedef struct { // Data kept in "Element" member of cmsStage // Curves -typedef struct { +typedef struct { cmsUInt32Number nCurves; cmsToneCurve** TheCurves; } _cmsStageToneCurvesData; // Matrix -typedef struct { +typedef struct { cmsFloat64Number* Double; // floating point for the matrix cmsFloat64Number* Offset; // The offset } _cmsStageMatrixData; // CLUT -typedef struct { - +typedef struct { + union { // Can have only one of both representations at same time cmsUInt16Number* T; // Points to the table 16 bits table cmsFloat32Number* TFloat; // Points to the cmsFloat32Number table @@ -560,7 +560,7 @@ typedef struct { // Full xform typedef void (* _cmsTransformFn)(struct _cmstransform_struct *CMMcargo, const void* InputBuffer, - void* OutputBuffer, + void* OutputBuffer, cmsUInt32Number Size, cmsUInt32Number Stride); @@ -573,7 +573,7 @@ typedef cmsBool (* _cmsTranformFactory)(_cmsTransformFn* xform, cmsUInt32Number* dwFlags); -// Retrieve user data as specified by the factory +// Retrieve user data as specified by the factory CMSAPI void * CMSEXPORT _cmsGetTransformUserData(struct _cmstransform_struct *CMMcargo); typedef struct { |