< prev index next >
src/java.desktop/share/native/liblcms/cmstypes.c
Print this page
*** 326,355 ****
_cmsFree(self ->ContextID, xyz);
return NULL;
}
*nItems = 1;
- return (void*) xyz;
cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_XYZ_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
- return _cmsWriteXYZNumber(io, (cmsCIEXYZ*) Ptr);
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_XYZ_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsCIEXYZ));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_XYZ_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
--- 326,359 ----
_cmsFree(self ->ContextID, xyz);
return NULL;
}
*nItems = 1;
cmsUNUSED_PARAMETER(SizeOfTag);
+
+ return (void*) xyz;
+
}
static
cmsBool Type_XYZ_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+
+ return _cmsWriteXYZNumber(io, (cmsCIEXYZ*) Ptr);
+
}
static
void* Type_XYZ_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
+
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsCIEXYZ));
}
static
void Type_XYZ_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
*** 358,371 ****
static
cmsTagTypeSignature DecideXYZtype(cmsFloat64Number ICCVersion, const void *Data)
{
- return cmsSigXYZType;
-
cmsUNUSED_PARAMETER(ICCVersion);
cmsUNUSED_PARAMETER(Data);
}
// ********************************************************************************
// Type chromaticity. Only one value is allowed
--- 362,376 ----
static
cmsTagTypeSignature DecideXYZtype(cmsFloat64Number ICCVersion, const void *Data)
{
cmsUNUSED_PARAMETER(ICCVersion);
cmsUNUSED_PARAMETER(Data);
+
+ return cmsSigXYZType;
+
}
// ********************************************************************************
// Type chromaticity. Only one value is allowed
*** 414,426 ****
*nItems = 1;
return (void*) chrm;
Error:
_cmsFree(self ->ContextID, (void*) chrm);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool SaveOneChromaticity(cmsFloat64Number x, cmsFloat64Number y, cmsIOHANDLER* io)
{
--- 419,432 ----
*nItems = 1;
return (void*) chrm;
Error:
_cmsFree(self ->ContextID, (void*) chrm);
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return NULL;
}
static
cmsBool SaveOneChromaticity(cmsFloat64Number x, cmsFloat64Number y, cmsIOHANDLER* io)
{
*** 440,461 ****
if (!SaveOneChromaticity(chrm -> Red.x, chrm -> Red.y, io)) return FALSE;
if (!SaveOneChromaticity(chrm -> Green.x, chrm -> Green.y, io)) return FALSE;
if (!SaveOneChromaticity(chrm -> Blue.x, chrm -> Blue.y, io)) return FALSE;
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_Chromaticity_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsCIExyYTRIPLE));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_Chromaticity_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
--- 446,469 ----
if (!SaveOneChromaticity(chrm -> Red.x, chrm -> Red.y, io)) return FALSE;
if (!SaveOneChromaticity(chrm -> Green.x, chrm -> Green.y, io)) return FALSE;
if (!SaveOneChromaticity(chrm -> Blue.x, chrm -> Blue.y, io)) return FALSE;
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+
+ return TRUE;
+
}
static
void* Type_Chromaticity_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
+
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsCIExyYTRIPLE));
}
static
void Type_Chromaticity_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
*** 496,508 ****
_cmsFree(self ->ContextID, (void*) ColorantOrder);
return NULL;
}
*nItems = 1;
return (void*) ColorantOrder;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_ColorantOrderType_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
--- 504,517 ----
_cmsFree(self ->ContextID, (void*) ColorantOrder);
return NULL;
}
*nItems = 1;
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return (void*) ColorantOrder;
}
static
cmsBool Type_ColorantOrderType_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
*** 517,538 ****
if (!_cmsWriteUInt32Number(io, Count)) return FALSE;
sz = Count * sizeof(cmsUInt8Number);
if (!io -> Write(io, sz, ColorantOrder)) return FALSE;
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_ColorantOrderType_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, cmsMAXCHANNELS * sizeof(cmsUInt8Number));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_ColorantOrderType_Free(struct _cms_typehandler_struct* self, void* Ptr)
--- 526,549 ----
if (!_cmsWriteUInt32Number(io, Count)) return FALSE;
sz = Count * sizeof(cmsUInt8Number);
if (!io -> Write(io, sz, ColorantOrder)) return FALSE;
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+
+ return TRUE;
+
}
static
void* Type_ColorantOrderType_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
+
return _cmsDupMem(self ->ContextID, Ptr, cmsMAXCHANNELS * sizeof(cmsUInt8Number));
}
static
void Type_ColorantOrderType_Free(struct _cms_typehandler_struct* self, void* Ptr)
*** 579,591 ****
for (i=0; i < nItems; i++) {
if (!_cmsWrite15Fixed16Number(io, Value[i])) return FALSE;
}
return TRUE;
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_S15Fixed16_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
--- 590,603 ----
for (i=0; i < nItems; i++) {
if (!_cmsWrite15Fixed16Number(io, Value[i])) return FALSE;
}
+ cmsUNUSED_PARAMETER(self);
+
return TRUE;
}
static
void* Type_S15Fixed16_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
*** 644,656 ****
cmsUInt32Number v = (cmsUInt32Number) floor(Value[i]*65536.0 + 0.5);
if (!_cmsWriteUInt32Number(io, v)) return FALSE;
}
return TRUE;
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_U16Fixed16_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
--- 656,669 ----
cmsUInt32Number v = (cmsUInt32Number) floor(Value[i]*65536.0 + 0.5);
if (!_cmsWriteUInt32Number(io, v)) return FALSE;
}
+ cmsUNUSED_PARAMETER(self);
+
return TRUE;
}
static
void* Type_U16Fixed16_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
*** 680,703 ****
if (SigPtr == NULL) return NULL;
if (!_cmsReadUInt32Number(io, SigPtr)) return NULL;
*nItems = 1;
return SigPtr;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_Signature_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsSignature* SigPtr = (cmsSignature*) Ptr;
- return _cmsWriteUInt32Number(io, *SigPtr);
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_Signature_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
--- 693,718 ----
if (SigPtr == NULL) return NULL;
if (!_cmsReadUInt32Number(io, SigPtr)) return NULL;
*nItems = 1;
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return SigPtr;
}
static
cmsBool Type_Signature_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsSignature* SigPtr = (cmsSignature*) Ptr;
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+
+ return _cmsWriteUInt32Number(io, *SigPtr);
+
}
static
void* Type_Signature_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
*** 779,822 ****
// Write it, including separator
rc = io ->Write(io, size, Text);
_cmsFree(self ->ContextID, Text);
return rc;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_Text_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsMLUdup((cmsMLU*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_Text_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsMLU* mlu = (cmsMLU*) Ptr;
cmsMLUfree(mlu);
return;
- cmsUNUSED_PARAMETER(self);
}
static
cmsTagTypeSignature DecideTextType(cmsFloat64Number ICCVersion, const void *Data)
{
if (ICCVersion >= 4.0)
return cmsSigMultiLocalizedUnicodeType;
return cmsSigTextType;
- cmsUNUSED_PARAMETER(Data);
}
// ********************************************************************************
// Type cmsSigDataType
--- 794,841 ----
// Write it, including separator
rc = io ->Write(io, size, Text);
_cmsFree(self ->ContextID, Text);
+ cmsUNUSED_PARAMETER(nItems);
+
return rc;
}
static
void* Type_Text_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
}
static
void Type_Text_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsMLU* mlu = (cmsMLU*) Ptr;
cmsMLUfree(mlu);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
static
cmsTagTypeSignature DecideTextType(cmsFloat64Number ICCVersion, const void *Data)
{
+ cmsUNUSED_PARAMETER(Data);
+
if (ICCVersion >= 4.0)
return cmsSigMultiLocalizedUnicodeType;
return cmsSigTextType;
}
// ********************************************************************************
// Type cmsSigDataType
*** 860,886 ****
static
cmsBool Type_Data_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsICCData* BinData = (cmsICCData*) Ptr;
if (!_cmsWriteUInt32Number(io, BinData ->flag)) return FALSE;
return io ->Write(io, BinData ->len, BinData ->data);
- cmsUNUSED_PARAMETER(nItems);
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_Data_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsICCData* BinData = (cmsICCData*) Ptr;
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsICCData) + BinData ->len - 1);
- cmsUNUSED_PARAMETER(n);
}
static
void Type_Data_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
--- 879,907 ----
static
cmsBool Type_Data_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsICCData* BinData = (cmsICCData*) Ptr;
+ cmsUNUSED_PARAMETER(nItems);
+ cmsUNUSED_PARAMETER(self);
+
if (!_cmsWriteUInt32Number(io, BinData ->flag)) return FALSE;
return io ->Write(io, BinData ->len, BinData ->data);
}
static
void* Type_Data_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsICCData* BinData = (cmsICCData*) Ptr;
+ cmsUNUSED_PARAMETER(n);
+
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsICCData) + BinData ->len - 1);
}
static
void Type_Data_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
*** 1055,1100 ****
Error:
if (Text) _cmsFree(self ->ContextID, Text);
if (Wide) _cmsFree(self ->ContextID, Wide);
return rc;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_Text_Description_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsMLUdup((cmsMLU*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_Text_Description_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsMLU* mlu = (cmsMLU*) Ptr;
cmsMLUfree(mlu);
return;
- cmsUNUSED_PARAMETER(self);
}
static
cmsTagTypeSignature DecideTextDescType(cmsFloat64Number ICCVersion, const void *Data)
{
if (ICCVersion >= 4.0)
return cmsSigMultiLocalizedUnicodeType;
return cmsSigTextDescriptionType;
- cmsUNUSED_PARAMETER(Data);
}
// ********************************************************************************
// Type cmsSigCurveType
--- 1076,1125 ----
Error:
if (Text) _cmsFree(self ->ContextID, Text);
if (Wide) _cmsFree(self ->ContextID, Wide);
+ cmsUNUSED_PARAMETER(nItems);
+
return rc;
}
static
void* Type_Text_Description_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
}
static
void Type_Text_Description_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsMLU* mlu = (cmsMLU*) Ptr;
cmsMLUfree(mlu);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
static
cmsTagTypeSignature DecideTextDescType(cmsFloat64Number ICCVersion, const void *Data)
{
+ cmsUNUSED_PARAMETER(Data);
+
if (ICCVersion >= 4.0)
return cmsSigMultiLocalizedUnicodeType;
return cmsSigTextDescriptionType;
}
// ********************************************************************************
// Type cmsSigCurveType
*** 1105,1114 ****
--- 1130,1141 ----
{
cmsUInt32Number Count;
cmsToneCurve* NewGamma;
*nItems = 0;
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
if (!_cmsReadUInt32Number(io, &Count)) return NULL;
switch (Count) {
case 0: // Linear.
*** 1145,1163 ****
*nItems = 1;
return NewGamma;
}
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_Curve_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsToneCurve* Curve = (cmsToneCurve*) Ptr;
if (Curve ->nSegments == 1 && Curve ->Segments[0].Type == 1) {
// Single gamma, preserve number
cmsUInt16Number SingleGammaFixed = _cmsDoubleTo8Fixed8(Curve ->Segments[0].Params[0]);
--- 1172,1192 ----
*nItems = 1;
return NewGamma;
}
}
static
cmsBool Type_Curve_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsToneCurve* Curve = (cmsToneCurve*) Ptr;
+ cmsUNUSED_PARAMETER(nItems);
+ cmsUNUSED_PARAMETER(self);
+
if (Curve ->nSegments == 1 && Curve ->Segments[0].Type == 1) {
// Single gamma, preserve number
cmsUInt16Number SingleGammaFixed = _cmsDoubleTo8Fixed8(Curve ->Segments[0].Params[0]);
*** 1168,1200 ****
}
if (!_cmsWriteUInt32Number(io, Curve ->nEntries)) return FALSE;
return _cmsWriteUInt16Array(io, Curve ->nEntries, Curve ->Table16);
- cmsUNUSED_PARAMETER(nItems);
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_Curve_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsDupToneCurve((cmsToneCurve*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_Curve_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsToneCurve* gamma = (cmsToneCurve*) Ptr;
cmsFreeToneCurve(gamma);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigParametricCurveType
--- 1197,1229 ----
}
if (!_cmsWriteUInt32Number(io, Curve ->nEntries)) return FALSE;
return _cmsWriteUInt16Array(io, Curve ->nEntries, Curve ->Table16);
}
static
void* Type_Curve_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDupToneCurve((cmsToneCurve*) Ptr);
+
}
static
void Type_Curve_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsToneCurve* gamma = (cmsToneCurve*) Ptr;
cmsFreeToneCurve(gamma);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigParametricCurveType
*** 1222,1231 ****
--- 1251,1262 ----
cmsFloat64Number Params[10];
cmsUInt16Number Type;
int i, n;
cmsToneCurve* NewGamma;
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
if (!_cmsReadUInt16Number(io, &Type)) return NULL;
if (!_cmsReadUInt16Number(io, NULL)) return NULL; // Reserved
if (Type > 4) {
*** 1242,1254 ****
}
NewGamma = cmsBuildParametricToneCurve(self ->ContextID, Type+1, Params);
*nItems = 1;
return NewGamma;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_ParametricCurve_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
--- 1273,1285 ----
}
NewGamma = cmsBuildParametricToneCurve(self ->ContextID, Type+1, Params);
*nItems = 1;
+
return NewGamma;
}
static
cmsBool Type_ParametricCurve_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
*** 1257,1266 ****
--- 1288,1299 ----
int i, nParams, typen;
static const int ParamsByType[] = { 0, 1, 3, 4, 5, 7 };
typen = Curve -> Segments[0].Type;
+ cmsUNUSED_PARAMETER(nItems);
+
if (Curve ->nSegments > 1 || typen < 1) {
cmsSignalError(self->ContextID, cmsERROR_UNKNOWN_EXTENSION, "Multisegment or Inverted parametric curves cannot be written");
return FALSE;
}
*** 1280,1310 ****
if (!_cmsWrite15Fixed16Number(io, Curve -> Segments[0].Params[i])) return FALSE;
}
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_ParametricCurve_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsDupToneCurve((cmsToneCurve*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_ParametricCurve_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsToneCurve* gamma = (cmsToneCurve*) Ptr;
cmsFreeToneCurve(gamma);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigDateTimeType
--- 1313,1344 ----
if (!_cmsWrite15Fixed16Number(io, Curve -> Segments[0].Params[i])) return FALSE;
}
return TRUE;
}
static
void* Type_ParametricCurve_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDupToneCurve((cmsToneCurve*) Ptr);
+
}
static
void Type_ParametricCurve_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsToneCurve* gamma = (cmsToneCurve*) Ptr;
cmsFreeToneCurve(gamma);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigDateTimeType
*** 1326,1369 ****
cmsDateTimeNumber timestamp;
struct tm * NewDateTime;
*nItems = 0;
NewDateTime = (struct tm*) _cmsMalloc(self ->ContextID, sizeof(struct tm));
if (NewDateTime == NULL) return NULL;
if (io->Read(io, ×tamp, sizeof(cmsDateTimeNumber), 1) != 1) return NULL;
_cmsDecodeDateTimeNumber(×tamp, NewDateTime);
*nItems = 1;
return NewDateTime;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_DateTime_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
struct tm * DateTime = (struct tm*) Ptr;
cmsDateTimeNumber timestamp;
_cmsEncodeDateTimeNumber(×tamp, DateTime);
if (!io ->Write(io, sizeof(cmsDateTimeNumber), ×tamp)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_DateTime_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, sizeof(struct tm));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_DateTime_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
--- 1360,1406 ----
cmsDateTimeNumber timestamp;
struct tm * NewDateTime;
*nItems = 0;
NewDateTime = (struct tm*) _cmsMalloc(self ->ContextID, sizeof(struct tm));
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
if (NewDateTime == NULL) return NULL;
if (io->Read(io, ×tamp, sizeof(cmsDateTimeNumber), 1) != 1) return NULL;
_cmsDecodeDateTimeNumber(×tamp, NewDateTime);
*nItems = 1;
return NewDateTime;
}
static
cmsBool Type_DateTime_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
struct tm * DateTime = (struct tm*) Ptr;
cmsDateTimeNumber timestamp;
_cmsEncodeDateTimeNumber(×tamp, DateTime);
+ cmsUNUSED_PARAMETER(nItems);
+ cmsUNUSED_PARAMETER(self);
+
if (!io ->Write(io, sizeof(cmsDateTimeNumber), ×tamp)) return FALSE;
return TRUE;
}
static
void* Type_DateTime_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
+
return _cmsDupMem(self ->ContextID, Ptr, sizeof(struct tm));
}
static
void Type_DateTime_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
*** 1388,1433 ****
cmsICCMeasurementConditions mc;
memset(&mc, 0, sizeof(mc));
if (!_cmsReadUInt32Number(io, &mc.Observer)) return NULL;
if (!_cmsReadXYZNumber(io, &mc.Backing)) return NULL;
if (!_cmsReadUInt32Number(io, &mc.Geometry)) return NULL;
if (!_cmsRead15Fixed16Number(io, &mc.Flare)) return NULL;
if (!_cmsReadUInt32Number(io, &mc.IlluminantType)) return NULL;
*nItems = 1;
return _cmsDupMem(self ->ContextID, &mc, sizeof(cmsICCMeasurementConditions));
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_Measurement_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsICCMeasurementConditions* mc =(cmsICCMeasurementConditions*) Ptr;
if (!_cmsWriteUInt32Number(io, mc->Observer)) return FALSE;
if (!_cmsWriteXYZNumber(io, &mc->Backing)) return FALSE;
if (!_cmsWriteUInt32Number(io, mc->Geometry)) return FALSE;
if (!_cmsWrite15Fixed16Number(io, mc->Flare)) return FALSE;
if (!_cmsWriteUInt32Number(io, mc->IlluminantType)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_Measurement_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsICCMeasurementConditions));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_Measurement_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
--- 1425,1473 ----
cmsICCMeasurementConditions mc;
memset(&mc, 0, sizeof(mc));
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
if (!_cmsReadUInt32Number(io, &mc.Observer)) return NULL;
if (!_cmsReadXYZNumber(io, &mc.Backing)) return NULL;
if (!_cmsReadUInt32Number(io, &mc.Geometry)) return NULL;
if (!_cmsRead15Fixed16Number(io, &mc.Flare)) return NULL;
if (!_cmsReadUInt32Number(io, &mc.IlluminantType)) return NULL;
*nItems = 1;
return _cmsDupMem(self ->ContextID, &mc, sizeof(cmsICCMeasurementConditions));
}
static
cmsBool Type_Measurement_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
cmsICCMeasurementConditions* mc =(cmsICCMeasurementConditions*) Ptr;
+ cmsUNUSED_PARAMETER(nItems);
+ cmsUNUSED_PARAMETER(self);
+
if (!_cmsWriteUInt32Number(io, mc->Observer)) return FALSE;
if (!_cmsWriteXYZNumber(io, &mc->Backing)) return FALSE;
if (!_cmsWriteUInt32Number(io, mc->Geometry)) return FALSE;
if (!_cmsWrite15Fixed16Number(io, mc->Flare)) return FALSE;
if (!_cmsWriteUInt32Number(io, mc->IlluminantType)) return FALSE;
return TRUE;
}
static
void* Type_Measurement_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
+
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsICCMeasurementConditions));
}
static
void Type_Measurement_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
*** 1532,1541 ****
--- 1572,1583 ----
cmsMLU* mlu =(cmsMLU*) Ptr;
cmsUInt32Number HeaderSize;
cmsUInt32Number Len, Offset;
int i;
+ cmsUNUSED_PARAMETER(nItems);
+ cmsUNUSED_PARAMETER(self);
if (Ptr == NULL) {
// Empty placeholder
if (!_cmsWriteUInt32Number(io, 0)) return FALSE;
if (!_cmsWriteUInt32Number(io, 12)) return FALSE;
*** 1563,1593 ****
if (!_cmsWriteWCharArray(io, mlu ->PoolUsed / sizeof(wchar_t), (wchar_t*) mlu ->MemPool)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_MLU_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsMLUdup((cmsMLU*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_MLU_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsMLUfree((cmsMLU*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigLut8Type
--- 1605,1635 ----
if (!_cmsWriteWCharArray(io, mlu ->PoolUsed / sizeof(wchar_t), (wchar_t*) mlu ->MemPool)) return FALSE;
return TRUE;
}
static
void* Type_MLU_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
}
static
void Type_MLU_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsMLUfree((cmsMLU*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigLut8Type
*** 1848,1860 ****
*nItems = 1;
return NewLUT;
Error:
if (NewLUT != NULL) cmsPipelineFree(NewLUT);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// We only allow a specific MPE structure: Matrix plus prelin, plus clut, plus post-lin.
static
cmsBool Type_LUT8_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
--- 1890,1903 ----
*nItems = 1;
return NewLUT;
Error:
if (NewLUT != NULL) cmsPipelineFree(NewLUT);
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return NULL;
}
// We only allow a specific MPE structure: Matrix plus prelin, plus clut, plus post-lin.
static
cmsBool Type_LUT8_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
*** 1951,1985 ****
if (!_cmsWriteUInt8Number(io, val)) return FALSE;
}
}
}
// The postlinearization table
if (!Write8bitTables(self ->ContextID, io, NewLUT ->OutputChannels, PostMPE)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_LUT8_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_LUT8_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigLut16Type
// ********************************************************************************
--- 1994,2030 ----
if (!_cmsWriteUInt8Number(io, val)) return FALSE;
}
}
}
+ cmsUNUSED_PARAMETER(nItems);
// The postlinearization table
if (!Write8bitTables(self ->ContextID, io, NewLUT ->OutputChannels, PostMPE)) return FALSE;
return TRUE;
}
static
void* Type_LUT8_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
}
static
void Type_LUT8_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigLut16Type
// ********************************************************************************
*** 2037,2057 ****
_cmsAssert(Tables != NULL);
nEntries = Tables->TheCurves[0]->nEntries;
for (i=0; i < Tables ->nCurves; i++) {
for (j=0; j < nEntries; j++) {
val = Tables->TheCurves[i]->Table16[j];
if (!_cmsWriteUInt16Number(io, val)) return FALSE;
}
}
return TRUE;
- cmsUNUSED_PARAMETER(ContextID);
}
static
void *Type_LUT16_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
{
--- 2082,2102 ----
_cmsAssert(Tables != NULL);
nEntries = Tables->TheCurves[0]->nEntries;
+ cmsUNUSED_PARAMETER(ContextID);
for (i=0; i < Tables ->nCurves; i++) {
for (j=0; j < nEntries; j++) {
val = Tables->TheCurves[i]->Table16[j];
if (!_cmsWriteUInt16Number(io, val)) return FALSE;
}
}
return TRUE;
}
static
void *Type_LUT16_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
{
*** 2135,2147 ****
*nItems = 1;
return NewLUT;
Error:
if (NewLUT != NULL) cmsPipelineFree(NewLUT);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// We only allow some specific MPE structures: Matrix plus prelin, plus clut, plus post-lin.
// Some empty defaults are created for missing parts
--- 2180,2193 ----
*nItems = 1;
return NewLUT;
Error:
if (NewLUT != NULL) cmsPipelineFree(NewLUT);
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return NULL;
}
// We only allow some specific MPE structures: Matrix plus prelin, plus clut, plus post-lin.
// Some empty defaults are created for missing parts
*** 2271,2301 ****
if (!_cmsWriteUInt16Number(io, 0)) return FALSE;
if (!_cmsWriteUInt16Number(io, 0xffff)) return FALSE;
}
}
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_LUT16_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_LUT16_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigLutAToBType
--- 2317,2349 ----
if (!_cmsWriteUInt16Number(io, 0)) return FALSE;
if (!_cmsWriteUInt16Number(io, 0xffff)) return FALSE;
}
}
+ cmsUNUSED_PARAMETER(nItems);
return TRUE;
}
static
void* Type_LUT16_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
}
static
void Type_LUT16_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigLutAToBType
*** 2537,2549 ****
*nItems = 1;
return NewLUT;
Error:
cmsPipelineFree(NewLUT);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// Write a set of curves
static
cmsBool WriteMatrix(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsStage* mpe)
--- 2585,2597 ----
*nItems = 1;
return NewLUT;
Error:
cmsPipelineFree(NewLUT);
+ cmsUNUSED_PARAMETER(SizeOfTag);
return NULL;
}
// Write a set of curves
static
cmsBool WriteMatrix(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsStage* mpe)
*** 2573,2585 ****
if (!_cmsWrite15Fixed16Number(io, 0)) return FALSE;
}
return TRUE;
- cmsUNUSED_PARAMETER(self);
}
// Write a set of curves
static
--- 2621,2633 ----
if (!_cmsWrite15Fixed16Number(io, 0)) return FALSE;
}
+ cmsUNUSED_PARAMETER(self);
return TRUE;
}
// Write a set of curves
static
*** 2766,2797 ****
if (!_cmsWriteUInt32Number(io, offsetC)) return FALSE;
if (!_cmsWriteUInt32Number(io, offsetA)) return FALSE;
if (!io ->Seek(io, CurrentPos)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_LUTA2B_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_LUTA2B_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// LutBToA type
--- 2814,2847 ----
if (!_cmsWriteUInt32Number(io, offsetC)) return FALSE;
if (!_cmsWriteUInt32Number(io, offsetA)) return FALSE;
if (!io ->Seek(io, CurrentPos)) return FALSE;
+ cmsUNUSED_PARAMETER(nItems);
return TRUE;
}
static
void* Type_LUTA2B_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
}
static
void Type_LUTA2B_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// LutBToA type
*** 2854,2866 ****
*nItems = 1;
return NewLUT;
Error:
cmsPipelineFree(NewLUT);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
/*
B
--- 2904,2917 ----
*nItems = 1;
return NewLUT;
Error:
cmsPipelineFree(NewLUT);
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return NULL;
}
/*
B
*** 2945,2977 ****
if (!_cmsWriteUInt32Number(io, offsetC)) return FALSE;
if (!_cmsWriteUInt32Number(io, offsetA)) return FALSE;
if (!io ->Seek(io, CurrentPos)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_LUTB2A_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_LUTB2A_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
--- 2996,3031 ----
if (!_cmsWriteUInt32Number(io, offsetC)) return FALSE;
if (!_cmsWriteUInt32Number(io, offsetA)) return FALSE;
if (!io ->Seek(io, CurrentPos)) return FALSE;
+ cmsUNUSED_PARAMETER(nItems);
+
return TRUE;
}
static
void* Type_LUTB2A_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
}
static
void Type_LUTB2A_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
*** 3017,3029 ****
return List;
Error:
*nItems = 0;
cmsFreeNamedColorList(List);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// Saves a colorant table. It is using the named color structure for simplicity sake
--- 3071,3084 ----
return List;
Error:
*nItems = 0;
cmsFreeNamedColorList(List);
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return NULL;
}
// Saves a colorant table. It is using the named color structure for simplicity sake
*** 3047,3081 ****
if (!io ->Write(io, 32, root)) return FALSE;
if (!_cmsWriteUInt16Array(io, 3, PCS)) return FALSE;
}
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_ColorantTable_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*) Ptr;
- return (void*) cmsDupNamedColorList(nc);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_ColorantTable_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeNamedColorList((cmsNAMEDCOLORLIST*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigNamedColor2Type
--- 3102,3138 ----
if (!io ->Write(io, 32, root)) return FALSE;
if (!_cmsWriteUInt16Array(io, 3, PCS)) return FALSE;
}
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+
+ return TRUE;
+
}
static
void* Type_ColorantTable_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*) Ptr;
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDupNamedColorList(nc);
+
}
static
void Type_ColorantTable_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeNamedColorList((cmsNAMEDCOLORLIST*) Ptr);
+ cmsUNUSED_PARAMETER(self);
return;
}
// ********************************************************************************
// Type cmsSigNamedColor2Type
*** 3142,3154 ****
*nItems = 1;
return (void*) v ;
Error:
cmsFreeNamedColorList(v);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// Saves a named color list into a named color profile
static
--- 3199,3212 ----
*nItems = 1;
return (void*) v ;
Error:
cmsFreeNamedColorList(v);
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return NULL;
}
// Saves a named color list into a named color profile
static
*** 3183,3217 ****
if (!io ->Write(io, 32 , Root)) return FALSE;
if (!_cmsWriteUInt16Array(io, 3, PCS)) return FALSE;
if (!_cmsWriteUInt16Array(io, NamedColorList ->ColorantCount, Colorant)) return FALSE;
}
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_NamedColor_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*) Ptr;
- return (void*) cmsDupNamedColorList(nc);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_NamedColor_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeNamedColorList((cmsNAMEDCOLORLIST*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigProfileSequenceDescType
--- 3241,3278 ----
if (!io ->Write(io, 32 , Root)) return FALSE;
if (!_cmsWriteUInt16Array(io, 3, PCS)) return FALSE;
if (!_cmsWriteUInt16Array(io, NamedColorList ->ColorantCount, Colorant)) return FALSE;
}
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+
+ return TRUE;
+
}
static
void* Type_NamedColor_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*) Ptr;
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDupNamedColorList(nc);
+
}
static
void Type_NamedColor_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeNamedColorList((cmsNAMEDCOLORLIST*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigProfileSequenceDescType
*** 3348,3379 ****
if (!SaveDescription(self, io, sec ->Manufacturer)) return FALSE;
if (!SaveDescription(self, io, sec ->Model)) return FALSE;
}
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_ProfileSequenceDesc_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
- return (void*) cmsDupProfileSequenceDescription((cmsSEQ*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_ProfileSequenceDesc_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeProfileSequenceDescription((cmsSEQ*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigProfileSequenceIdType
--- 3409,3443 ----
if (!SaveDescription(self, io, sec ->Manufacturer)) return FALSE;
if (!SaveDescription(self, io, sec ->Model)) return FALSE;
}
+ cmsUNUSED_PARAMETER(nItems);
+
return TRUE;
}
static
void* Type_ProfileSequenceDesc_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDupProfileSequenceDescription((cmsSEQ*) Ptr);
+
}
static
void Type_ProfileSequenceDesc_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeProfileSequenceDescription((cmsSEQ*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigProfileSequenceIdType
*** 3451,3463 ****
if (!io ->Write(io, 16, Seq ->seq[n].ProfileID.ID8)) return FALSE;
// Store here the MLU
if (!SaveDescription(self, io, Seq ->seq[n].Description)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_ProfileSequenceId_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
--- 3515,3528 ----
if (!io ->Write(io, 16, Seq ->seq[n].ProfileID.ID8)) return FALSE;
// Store here the MLU
if (!SaveDescription(self, io, Seq ->seq[n].Description)) return FALSE;
+ cmsUNUSED_PARAMETER(SizeOfTag);
+
return TRUE;
}
static
cmsBool Type_ProfileSequenceId_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
*** 3471,3501 ****
if (!_cmsWriteUInt32Number(io, Seq ->n)) return FALSE;
// This is the position table and content
if (!WritePositionTable(self, io, 0, Seq ->n, BaseOffset, Seq, WriteSeqID)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_ProfileSequenceId_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
- return (void*) cmsDupProfileSequenceDescription((cmsSEQ*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_ProfileSequenceId_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeProfileSequenceDescription((cmsSEQ*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigUcrBgType
--- 3536,3569 ----
if (!_cmsWriteUInt32Number(io, Seq ->n)) return FALSE;
// This is the position table and content
if (!WritePositionTable(self, io, 0, Seq ->n, BaseOffset, Seq, WriteSeqID)) return FALSE;
+ cmsUNUSED_PARAMETER(nItems);
+
return TRUE;
}
static
void* Type_ProfileSequenceId_Dup(struct _cms_typehandler_struct* self, const void* Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDupProfileSequenceDescription((cmsSEQ*) Ptr);
+
}
static
void Type_ProfileSequenceId_Free(struct _cms_typehandler_struct* self, void* Ptr)
{
cmsFreeProfileSequenceDescription((cmsSEQ*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigUcrBgType
*** 3575,3587 ****
if (cmsMLUgetASCII(Value ->Desc, cmsNoLanguage, cmsNoCountry, Text, TextSize) != TextSize) return FALSE;
if (!io ->Write(io, TextSize, Text)) return FALSE;
_cmsFree(self ->ContextID, Text);
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_UcrBg_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
--- 3643,3656 ----
if (cmsMLUgetASCII(Value ->Desc, cmsNoLanguage, cmsNoCountry, Text, TextSize) != TextSize) return FALSE;
if (!io ->Write(io, TextSize, Text)) return FALSE;
_cmsFree(self ->ContextID, Text);
+ cmsUNUSED_PARAMETER(nItems);
+
return TRUE;
}
static
void* Type_UcrBg_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
*** 3592,3604 ****
NewUcrBg ->Bg = cmsDupToneCurve(Src ->Bg);
NewUcrBg ->Ucr = cmsDupToneCurve(Src ->Ucr);
NewUcrBg ->Desc = cmsMLUdup(Src ->Desc);
return (void*) NewUcrBg;
- cmsUNUSED_PARAMETER(n);
}
static
void Type_UcrBg_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
--- 3661,3674 ----
NewUcrBg ->Bg = cmsDupToneCurve(Src ->Bg);
NewUcrBg ->Ucr = cmsDupToneCurve(Src ->Ucr);
NewUcrBg ->Desc = cmsMLUdup(Src ->Desc);
+ cmsUNUSED_PARAMETER(n);
+
return (void*) NewUcrBg;
}
static
void Type_UcrBg_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
*** 3714,3745 ****
if (!WriteCountAndSting(self, io, mlu, "#3")) goto Error;
return TRUE;
Error:
return FALSE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_CrdInfo_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsMLUdup((cmsMLU*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_CrdInfo_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
cmsMLUfree((cmsMLU*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigScreeningType
// ********************************************************************************
--- 3784,3817 ----
if (!WriteCountAndSting(self, io, mlu, "#3")) goto Error;
return TRUE;
Error:
+ cmsUNUSED_PARAMETER(nItems);
return FALSE;
}
static
void* Type_CrdInfo_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
}
static
void Type_CrdInfo_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
cmsMLUfree((cmsMLU*) Ptr);
+ cmsUNUSED_PARAMETER(self);
+
return;
}
// ********************************************************************************
// Type cmsSigScreeningType
// ********************************************************************************
*** 3778,3790 ****
Error:
if (sc != NULL)
_cmsFree(self ->ContextID, sc);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_Screening_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
--- 3850,3862 ----
Error:
if (sc != NULL)
_cmsFree(self ->ContextID, sc);
+ cmsUNUSED_PARAMETER(SizeOfTag);
return NULL;
}
static
cmsBool Type_Screening_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
*** 3800,3822 ****
if (!_cmsWrite15Fixed16Number(io, sc ->Channels[i].Frequency)) return FALSE;
if (!_cmsWrite15Fixed16Number(io, sc ->Channels[i].ScreenAngle)) return FALSE;
if (!_cmsWriteUInt32Number(io, sc ->Channels[i].SpotShape)) return FALSE;
}
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
- cmsUNUSED_PARAMETER(self);
}
static
void* Type_Screening_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsScreening));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_Screening_Free(struct _cms_typehandler_struct* self, void* Ptr)
--- 3872,3893 ----
if (!_cmsWrite15Fixed16Number(io, sc ->Channels[i].Frequency)) return FALSE;
if (!_cmsWrite15Fixed16Number(io, sc ->Channels[i].ScreenAngle)) return FALSE;
if (!_cmsWriteUInt32Number(io, sc ->Channels[i].SpotShape)) return FALSE;
}
+ cmsUNUSED_PARAMETER(nItems);
return TRUE;
}
static
void* Type_Screening_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsScreening));
}
static
void Type_Screening_Free(struct _cms_typehandler_struct* self, void* Ptr)
*** 3852,3864 ****
Error:
if (vc != NULL)
_cmsFree(self ->ContextID, vc);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_ViewingConditions_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
--- 3923,3935 ----
Error:
if (vc != NULL)
_cmsFree(self ->ContextID, vc);
+ cmsUNUSED_PARAMETER(SizeOfTag);
return NULL;
}
static
cmsBool Type_ViewingConditions_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
*** 3867,3889 ****
if (!_cmsWriteXYZNumber(io, &sc ->IlluminantXYZ)) return FALSE;
if (!_cmsWriteXYZNumber(io, &sc ->SurroundXYZ)) return FALSE;
if (!_cmsWriteUInt32Number(io, sc ->IlluminantType)) return FALSE;
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
void* Type_ViewingConditions_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsScreening));
- cmsUNUSED_PARAMETER(n);
}
static
void Type_ViewingConditions_Free(struct _cms_typehandler_struct* self, void* Ptr)
--- 3938,3960 ----
if (!_cmsWriteXYZNumber(io, &sc ->IlluminantXYZ)) return FALSE;
if (!_cmsWriteXYZNumber(io, &sc ->SurroundXYZ)) return FALSE;
if (!_cmsWriteUInt32Number(io, sc ->IlluminantType)) return FALSE;
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+ return TRUE;
+
}
static
void* Type_ViewingConditions_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
+ cmsUNUSED_PARAMETER(n);
return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsScreening));
}
static
void Type_ViewingConditions_Free(struct _cms_typehandler_struct* self, void* Ptr)
*** 3898,3920 ****
static
void* GenericMPEdup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsStageDup((cmsStage*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void GenericMPEfree(struct _cms_typehandler_struct* self, void *Ptr)
{
cmsStageFree((cmsStage*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// Each curve is stored in one or more curve segments, with break-points specified between curve segments.
// The first curve segment always starts at –Infinity, and the last curve segment always ends at +Infinity. The
// first and last curve segments shall be specified in terms of a formula, whereas the other segments shall be
--- 3969,3991 ----
static
void* GenericMPEdup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+ return (void*) cmsStageDup((cmsStage*) Ptr);
+
}
static
void GenericMPEfree(struct _cms_typehandler_struct* self, void *Ptr)
{
cmsStageFree((cmsStage*) Ptr);
+ cmsUNUSED_PARAMETER(self);
return;
}
// Each curve is stored in one or more curve segments, with break-points specified between curve segments.
// The first curve segment always starts at –Infinity, and the last curve segment always ends at +Infinity. The
// first and last curve segments shall be specified in terms of a formula, whereas the other segments shall be
*** 4035,4047 ****
cmsUInt32Number SizeOfTag)
{
cmsToneCurve** GammaTables = ( cmsToneCurve**) Cargo;
GammaTables[n] = ReadSegmentedCurve(self, io);
return (GammaTables[n] != NULL);
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
void *Type_MPEcurve_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
{
--- 4106,4118 ----
cmsUInt32Number SizeOfTag)
{
cmsToneCurve** GammaTables = ( cmsToneCurve**) Cargo;
GammaTables[n] = ReadSegmentedCurve(self, io);
+ cmsUNUSED_PARAMETER(SizeOfTag);
return (GammaTables[n] != NULL);
}
static
void *Type_MPEcurve_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsUInt32Number* nItems, cmsUInt32Number SizeOfTag)
{
*** 4075,4087 ****
if (GammaTables[i]) cmsFreeToneCurve(GammaTables[i]);
}
_cmsFree(self ->ContextID, GammaTables);
*nItems = (mpe != NULL) ? 1 : 0;
return mpe;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// Write a single segmented curve. NO CHECK IS PERFORMED ON VALIDITY
static
--- 4146,4158 ----
if (GammaTables[i]) cmsFreeToneCurve(GammaTables[i]);
}
_cmsFree(self ->ContextID, GammaTables);
*nItems = (mpe != NULL) ? 1 : 0;
+ cmsUNUSED_PARAMETER(SizeOfTag);
return mpe;
}
// Write a single segmented curve. NO CHECK IS PERFORMED ON VALIDITY
static
*** 4156,4169 ****
cmsUInt32Number n,
cmsUInt32Number SizeOfTag)
{
_cmsStageToneCurvesData* Curves = (_cmsStageToneCurvesData*) Cargo;
- return WriteSegmentedCurve(io, Curves ->TheCurves[n]);
-
cmsUNUSED_PARAMETER(SizeOfTag);
cmsUNUSED_PARAMETER(self);
}
// Write a curve, checking first for validity
static
cmsBool Type_MPEcurve_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
--- 4227,4240 ----
cmsUInt32Number n,
cmsUInt32Number SizeOfTag)
{
_cmsStageToneCurvesData* Curves = (_cmsStageToneCurvesData*) Cargo;
cmsUNUSED_PARAMETER(SizeOfTag);
cmsUNUSED_PARAMETER(self);
+ return WriteSegmentedCurve(io, Curves ->TheCurves[n]);
+
}
// Write a curve, checking first for validity
static
cmsBool Type_MPEcurve_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
*** 4180,4192 ****
if (!WritePositionTable(self, io, 0,
mpe ->InputChannels, BaseOffset, Curves, WriteMPECurve)) return FALSE;
return TRUE;
- cmsUNUSED_PARAMETER(nItems);
}
// The matrix is organized as an array of PxQ+Q elements, where P is the number of input channels to the
--- 4251,4263 ----
if (!WritePositionTable(self, io, 0,
mpe ->InputChannels, BaseOffset, Curves, WriteMPECurve)) return FALSE;
+ cmsUNUSED_PARAMETER(nItems);
return TRUE;
}
// The matrix is organized as an array of PxQ+Q elements, where P is the number of input channels to the
*** 4242,4254 ****
_cmsFree(self ->ContextID, Matrix);
_cmsFree(self ->ContextID, Offsets);
*nItems = 1;
return mpe;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
static
cmsBool Type_MPEmatrix_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
--- 4313,4325 ----
_cmsFree(self ->ContextID, Matrix);
_cmsFree(self ->ContextID, Offsets);
*nItems = 1;
+ cmsUNUSED_PARAMETER(SizeOfTag);
return mpe;
}
static
cmsBool Type_MPEmatrix_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
{
*** 4275,4288 ****
else {
if (!_cmsWriteFloat32Number(io, (cmsFloat32Number) Matrix->Offset[i])) return FALSE;
}
}
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
static
--- 4346,4359 ----
else {
if (!_cmsWriteFloat32Number(io, (cmsFloat32Number) Matrix->Offset[i])) return FALSE;
}
}
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+ return TRUE;
+
}
static
*** 4322,4334 ****
return mpe;
Error:
*nItems = 0;
if (mpe != NULL) cmsStageFree(mpe);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// Write a CLUT in floating point
static
cmsBool Type_MPEclut_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
--- 4393,4405 ----
return mpe;
Error:
*nItems = 0;
if (mpe != NULL) cmsStageFree(mpe);
+ cmsUNUSED_PARAMETER(SizeOfTag);
return NULL;
}
// Write a CLUT in floating point
static
cmsBool Type_MPEclut_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems)
*** 4357,4370 ****
for (i=0; i < clut ->nEntries; i++) {
if (!_cmsWriteFloat32Number(io, clut ->Tab.TFloat[i])) return FALSE;
}
- return TRUE;
-
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
}
// This is the list of built-in MPE types
--- 4428,4441 ----
for (i=0; i < clut ->nEntries; i++) {
if (!_cmsWriteFloat32Number(io, clut ->Tab.TFloat[i])) return FALSE;
}
cmsUNUSED_PARAMETER(nItems);
cmsUNUSED_PARAMETER(self);
+ return TRUE;
+
}
// This is the list of built-in MPE types
*** 4420,4433 ****
// This is a real element which should be read and processed
if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, (cmsStage*) TypeHandler ->ReadPtr(self, io, &nItems, SizeOfTag)))
return FALSE;
}
- return TRUE;
-
cmsUNUSED_PARAMETER(SizeOfTag);
cmsUNUSED_PARAMETER(n);
}
// This is the main dispatcher for MPE
static
--- 4491,4504 ----
// This is a real element which should be read and processed
if (!cmsPipelineInsertStage(NewLUT, cmsAT_END, (cmsStage*) TypeHandler ->ReadPtr(self, io, &nItems, SizeOfTag)))
return FALSE;
}
cmsUNUSED_PARAMETER(SizeOfTag);
cmsUNUSED_PARAMETER(n);
+ return TRUE;
+
}
// This is the main dispatcher for MPE
static
*** 4457,4469 ****
return NULL;
}
// Success
*nItems = 1;
return NewLUT;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// This one is a liitle bit more complex, so we don't use position tables this time.
--- 4528,4540 ----
return NULL;
}
// Success
*nItems = 1;
+ cmsUNUSED_PARAMETER(SizeOfTag);
return NewLUT;
}
// This one is a liitle bit more complex, so we don't use position tables this time.
*** 4552,4583 ****
return TRUE;
Error:
if (ElementOffsets != NULL) _cmsFree(self ->ContextID, ElementOffsets);
if (ElementSizes != NULL) _cmsFree(self ->ContextID, ElementSizes);
return FALSE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_MPE_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_MPE_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
return;
- cmsUNUSED_PARAMETER(self);
}
// ********************************************************************************
// Type cmsSigVcgtType
--- 4623,4655 ----
return TRUE;
Error:
if (ElementOffsets != NULL) _cmsFree(self ->ContextID, ElementOffsets);
if (ElementSizes != NULL) _cmsFree(self ->ContextID, ElementSizes);
+ cmsUNUSED_PARAMETER(nItems);
return FALSE;
}
static
void* Type_MPE_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
}
static
void Type_MPE_Free(struct _cms_typehandler_struct* self, void *Ptr)
{
cmsPipelineFree((cmsPipeline*) Ptr);
+ cmsUNUSED_PARAMETER(self);
return;
}
// ********************************************************************************
// Type cmsSigVcgtType
*** 4724,4736 ****
// Regret, free all resources
Error:
cmsFreeToneCurveTriple(Curves);
_cmsFree(self ->ContextID, Curves);
return NULL;
- cmsUNUSED_PARAMETER(SizeOfTag);
}
// We don't support all flavors, only 16bits tables and formula
static
--- 4796,4808 ----
// Regret, free all resources
Error:
cmsFreeToneCurveTriple(Curves);
_cmsFree(self ->ContextID, Curves);
+ cmsUNUSED_PARAMETER(SizeOfTag);
return NULL;
}
// We don't support all flavors, only 16bits tables and formula
static
*** 4777,4790 ****
if (!_cmsWriteUInt16Number(io, n)) return FALSE;
}
}
}
- return TRUE;
-
cmsUNUSED_PARAMETER(self);
cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_vcgt_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
--- 4849,4862 ----
if (!_cmsWriteUInt16Number(io, n)) return FALSE;
}
}
}
cmsUNUSED_PARAMETER(self);
cmsUNUSED_PARAMETER(nItems);
+ return TRUE;
+
}
static
void* Type_vcgt_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
*** 4796,4808 ****
NewCurves[0] = cmsDupToneCurve(OldCurves[0]);
NewCurves[1] = cmsDupToneCurve(OldCurves[1]);
NewCurves[2] = cmsDupToneCurve(OldCurves[2]);
return (void*) NewCurves;
- cmsUNUSED_PARAMETER(n);
}
static
void Type_vcgt_Free(struct _cms_typehandler_struct* self, void* Ptr)
--- 4868,4880 ----
NewCurves[0] = cmsDupToneCurve(OldCurves[0]);
NewCurves[1] = cmsDupToneCurve(OldCurves[1]);
NewCurves[2] = cmsDupToneCurve(OldCurves[2]);
+ cmsUNUSED_PARAMETER(n);
return (void*) NewCurves;
}
static
void Type_vcgt_Free(struct _cms_typehandler_struct* self, void* Ptr)
*** 5222,5244 ****
FreeArray(&a);
return TRUE;
Error:
FreeArray(&a);
return FALSE;
- cmsUNUSED_PARAMETER(nItems);
}
static
void* Type_Dictionary_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
- return (void*) cmsDictDup((cmsHANDLE) Ptr);
-
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
}
static
void Type_Dictionary_Free(struct _cms_typehandler_struct* self, void* Ptr)
--- 5294,5317 ----
FreeArray(&a);
return TRUE;
Error:
FreeArray(&a);
+ cmsUNUSED_PARAMETER(nItems);
return FALSE;
}
static
void* Type_Dictionary_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
{
cmsUNUSED_PARAMETER(n);
cmsUNUSED_PARAMETER(self);
+
+ return (void*) cmsDictDup((cmsHANDLE) Ptr);
+
}
static
void Type_Dictionary_Free(struct _cms_typehandler_struct* self, void* Ptr)
< prev index next >