--- old/src/java.desktop/share/native/liblcms/cmstypes.c	2016-04-01 15:58:32.542008646 +0530
+++ new/src/java.desktop/share/native/liblcms/cmstypes.c	2016-04-01 15:58:32.306008648 +0530
@@ -328,26 +328,30 @@
     }
 
     *nItems = 1;
-    return (void*) xyz;
 
     cmsUNUSED_PARAMETER(SizeOfTag);
+
+    return (void*) xyz;
+
 }
 
 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);
+
+    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));
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 static
@@ -360,10 +364,11 @@
 static
 cmsTagTypeSignature DecideXYZtype(cmsFloat64Number ICCVersion, const void *Data)
 {
-    return cmsSigXYZType;
-
     cmsUNUSED_PARAMETER(ICCVersion);
     cmsUNUSED_PARAMETER(Data);
+
+    return cmsSigXYZType;
+
 }
 
 
@@ -416,9 +421,10 @@
 
 Error:
     _cmsFree(self ->ContextID, (void*) chrm);
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 static
@@ -442,18 +448,20 @@
     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);
+
+    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));
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 static
@@ -498,9 +506,10 @@
     }
 
     *nItems = 1;
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return (void*) ColorantOrder;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 static
@@ -519,18 +528,20 @@
     sz = Count * sizeof(cmsUInt8Number);
     if (!io -> Write(io, sz, ColorantOrder)) return FALSE;
 
-    return TRUE;
-
     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));
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 
@@ -581,9 +592,10 @@
         if (!_cmsWrite15Fixed16Number(io, Value[i])) return FALSE;
     }
 
+    cmsUNUSED_PARAMETER(self);
+
     return TRUE;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 static
@@ -646,9 +658,10 @@
         if (!_cmsWriteUInt32Number(io, v)) return FALSE;
     }
 
+    cmsUNUSED_PARAMETER(self);
+
     return TRUE;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -682,9 +695,10 @@
      if (!_cmsReadUInt32Number(io, SigPtr)) return NULL;
      *nItems = 1;
 
+     cmsUNUSED_PARAMETER(SizeOfTag);
+
      return SigPtr;
 
-     cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 static
@@ -692,10 +706,11 @@
 {
     cmsSignature* SigPtr = (cmsSignature*) Ptr;
 
-    return _cmsWriteUInt32Number(io, *SigPtr);
-
     cmsUNUSED_PARAMETER(nItems);
     cmsUNUSED_PARAMETER(self);
+
+    return _cmsWriteUInt32Number(io, *SigPtr);
+
 }
 
 static
@@ -781,18 +796,20 @@
     rc = io ->Write(io, size, Text);
 
     _cmsFree(self ->ContextID, Text);
+    cmsUNUSED_PARAMETER(nItems);
+
     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);
+
+    return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
 }
 
 
@@ -801,20 +818,22 @@
 {
     cmsMLU* mlu = (cmsMLU*) Ptr;
     cmsMLUfree(mlu);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 static
 cmsTagTypeSignature DecideTextType(cmsFloat64Number ICCVersion, const void *Data)
 {
+    cmsUNUSED_PARAMETER(Data);
+
     if (ICCVersion >= 4.0)
         return cmsSigMultiLocalizedUnicodeType;
 
     return cmsSigTextType;
 
-    cmsUNUSED_PARAMETER(Data);
 }
 
 
@@ -862,12 +881,13 @@
 {
    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);
 
-   cmsUNUSED_PARAMETER(nItems);
-   cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -876,9 +896,10 @@
 {
     cmsICCData* BinData = (cmsICCData*) Ptr;
 
+    cmsUNUSED_PARAMETER(n);
+
     return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsICCData) + BinData ->len - 1);
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 static
@@ -1057,19 +1078,21 @@
     if (Text) _cmsFree(self ->ContextID, Text);
     if (Wide) _cmsFree(self ->ContextID, Wide);
 
+    cmsUNUSED_PARAMETER(nItems);
+
     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);
+
+    return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
 }
 
 static
@@ -1078,21 +1101,23 @@
     cmsMLU* mlu = (cmsMLU*) Ptr;
 
     cmsMLUfree(mlu);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
 static
 cmsTagTypeSignature DecideTextDescType(cmsFloat64Number ICCVersion, const void *Data)
 {
+    cmsUNUSED_PARAMETER(Data);
+
     if (ICCVersion >= 4.0)
         return cmsSigMultiLocalizedUnicodeType;
 
     return cmsSigTextDescriptionType;
 
-    cmsUNUSED_PARAMETER(Data);
 }
 
 
@@ -1107,6 +1132,8 @@
     cmsToneCurve* NewGamma;
 
     *nItems = 0;
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     if (!_cmsReadUInt32Number(io, &Count)) return NULL;
 
     switch (Count) {
@@ -1147,7 +1174,6 @@
                return NewGamma;
     }
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -1156,6 +1182,9 @@
 {
     cmsToneCurve* Curve = (cmsToneCurve*) Ptr;
 
+    cmsUNUSED_PARAMETER(nItems);
+    cmsUNUSED_PARAMETER(self);
+
     if (Curve ->nSegments == 1 && Curve ->Segments[0].Type == 1) {
 
             // Single gamma, preserve number
@@ -1170,18 +1199,17 @@
     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);
+
+    return (void*) cmsDupToneCurve((cmsToneCurve*) Ptr);
+
 }
 
 static
@@ -1190,9 +1218,10 @@
     cmsToneCurve* gamma = (cmsToneCurve*) Ptr;
 
     cmsFreeToneCurve(gamma);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -1224,6 +1253,8 @@
     int i, n;
     cmsToneCurve* NewGamma;
 
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     if (!_cmsReadUInt16Number(io, &Type)) return NULL;
     if (!_cmsReadUInt16Number(io, NULL)) return NULL;   // Reserved
 
@@ -1244,9 +1275,9 @@
     NewGamma = cmsBuildParametricToneCurve(self ->ContextID, Type+1, Params);
 
     *nItems = 1;
+
     return NewGamma;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -1259,6 +1290,8 @@
 
     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");
@@ -1282,16 +1315,16 @@
 
     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);
+
+    return (void*) cmsDupToneCurve((cmsToneCurve*) Ptr);
+
 }
 
 static
@@ -1300,9 +1333,10 @@
     cmsToneCurve* gamma = (cmsToneCurve*) Ptr;
 
     cmsFreeToneCurve(gamma);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -1328,6 +1362,8 @@
 
     *nItems = 0;
     NewDateTime = (struct tm*) _cmsMalloc(self ->ContextID, sizeof(struct tm));
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     if (NewDateTime == NULL) return NULL;
 
     if (io->Read(io, &timestamp, sizeof(cmsDateTimeNumber), 1) != 1) return NULL;
@@ -1337,7 +1373,6 @@
      *nItems = 1;
      return NewDateTime;
 
-     cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -1348,20 +1383,22 @@
     cmsDateTimeNumber timestamp;
 
     _cmsEncodeDateTimeNumber(&timestamp, DateTime);
+    cmsUNUSED_PARAMETER(nItems);
+    cmsUNUSED_PARAMETER(self);
+
     if (!io ->Write(io, sizeof(cmsDateTimeNumber), &timestamp)) 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)
 {
+    cmsUNUSED_PARAMETER(n);
+
     return _cmsDupMem(self ->ContextID, Ptr, sizeof(struct tm));
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 static
@@ -1390,6 +1427,8 @@
 
     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;
@@ -1399,7 +1438,6 @@
     *nItems = 1;
     return _cmsDupMem(self ->ContextID, &mc, sizeof(cmsICCMeasurementConditions));
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -1408,6 +1446,9 @@
 {
     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;
@@ -1416,16 +1457,15 @@
 
     return TRUE;
 
-    cmsUNUSED_PARAMETER(nItems);
-    cmsUNUSED_PARAMETER(self);
 }
 
 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));
 
-     cmsUNUSED_PARAMETER(n);
 }
 
 static
@@ -1534,6 +1574,8 @@
     cmsUInt32Number  Len, Offset;
     int i;
 
+    cmsUNUSED_PARAMETER(nItems);
+    cmsUNUSED_PARAMETER(self);
     if (Ptr == NULL) {
 
           // Empty placeholder
@@ -1565,27 +1607,27 @@
 
     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);
+
+    return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
 }
 
 static
 void Type_MLU_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsMLUfree((cmsMLU*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -1850,9 +1892,10 @@
 
 Error:
     if (NewLUT != NULL) cmsPipelineFree(NewLUT);
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 // We only allow a specific MPE structure: Matrix plus prelin, plus clut, plus post-lin.
@@ -1953,31 +1996,33 @@
         }
     }
 
+    cmsUNUSED_PARAMETER(nItems);
     // 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);
+
+    return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
 }
 
 static
 void Type_LUT8_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsPipelineFree((cmsPipeline*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 // ********************************************************************************
@@ -2039,6 +2084,7 @@
 
     nEntries = Tables->TheCurves[0]->nEntries;
 
+    cmsUNUSED_PARAMETER(ContextID);
     for (i=0; i < Tables ->nCurves; i++) {
 
         for (j=0; j < nEntries; j++) {
@@ -2049,7 +2095,6 @@
     }
     return TRUE;
 
-    cmsUNUSED_PARAMETER(ContextID);
 }
 
 static
@@ -2137,9 +2182,10 @@
 
 Error:
     if (NewLUT != NULL) cmsPipelineFree(NewLUT);
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 // We only allow some specific MPE structures: Matrix plus prelin, plus clut, plus post-lin.
@@ -2273,27 +2319,29 @@
         }
     }
 
+    cmsUNUSED_PARAMETER(nItems);
     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);
+
+    return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
 }
 
 static
 void Type_LUT16_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsPipelineFree((cmsPipeline*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -2539,9 +2587,9 @@
     return NewLUT;
 Error:
     cmsPipelineFree(NewLUT);
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 // Write a set of curves
@@ -2575,9 +2623,9 @@
     }
 
 
+    cmsUNUSED_PARAMETER(self);
     return TRUE;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -2768,28 +2816,30 @@
 
     if (!io ->Seek(io, CurrentPos)) return FALSE;
 
+    cmsUNUSED_PARAMETER(nItems);
     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);
+
+    return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
 }
 
 static
 void Type_LUTA2B_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsPipelineFree((cmsPipeline*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -2856,9 +2906,10 @@
     return NewLUT;
 Error:
     cmsPipelineFree(NewLUT);
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -2947,9 +2998,10 @@
 
     if (!io ->Seek(io, CurrentPos)) return FALSE;
 
+    cmsUNUSED_PARAMETER(nItems);
+
     return TRUE;
 
-    cmsUNUSED_PARAMETER(nItems);
 }
 
 
@@ -2957,19 +3009,21 @@
 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);
+
+    return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
 }
 
 static
 void Type_LUTB2A_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsPipelineFree((cmsPipeline*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -3019,9 +3073,10 @@
 Error:
     *nItems = 0;
     cmsFreeNamedColorList(List);
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -3049,10 +3104,11 @@
         if (!_cmsWriteUInt16Array(io, 3, PCS)) return FALSE;
     }
 
-    return TRUE;
-
     cmsUNUSED_PARAMETER(nItems);
     cmsUNUSED_PARAMETER(self);
+
+    return TRUE;
+
 }
 
 
@@ -3060,10 +3116,11 @@
 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);
+
+    return (void*) cmsDupNamedColorList(nc);
+
 }
 
 
@@ -3071,9 +3128,9 @@
 void Type_ColorantTable_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsFreeNamedColorList((cmsNAMEDCOLORLIST*) Ptr);
+    cmsUNUSED_PARAMETER(self);
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -3144,9 +3201,10 @@
 
 Error:
     cmsFreeNamedColorList(v);
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -3185,10 +3243,11 @@
         if (!_cmsWriteUInt16Array(io, NamedColorList ->ColorantCount, Colorant)) return FALSE;
     }
 
-    return TRUE;
-
     cmsUNUSED_PARAMETER(nItems);
     cmsUNUSED_PARAMETER(self);
+
+    return TRUE;
+
 }
 
 static
@@ -3196,10 +3255,11 @@
 {
     cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*) Ptr;
 
-    return (void*) cmsDupNamedColorList(nc);
-
     cmsUNUSED_PARAMETER(n);
     cmsUNUSED_PARAMETER(self);
+
+    return (void*) cmsDupNamedColorList(nc);
+
 }
 
 
@@ -3207,9 +3267,10 @@
 void Type_NamedColor_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsFreeNamedColorList((cmsNAMEDCOLORLIST*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -3350,28 +3411,31 @@
         if (!SaveDescription(self, io, sec ->Model)) return FALSE;
     }
 
+     cmsUNUSED_PARAMETER(nItems);
+
      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);
+
+    return (void*) cmsDupProfileSequenceDescription((cmsSEQ*) Ptr);
+
 }
 
 static
 void Type_ProfileSequenceDesc_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsFreeProfileSequenceDescription((cmsSEQ*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -3453,9 +3517,10 @@
     // Store here the MLU
     if (!SaveDescription(self, io, Seq ->seq[n].Description)) return FALSE;
 
+    cmsUNUSED_PARAMETER(SizeOfTag);
+
     return TRUE;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 static
@@ -3473,27 +3538,30 @@
     // This is the position table and content
     if (!WritePositionTable(self, io, 0, Seq ->n, BaseOffset, Seq, WriteSeqID)) return FALSE;
 
+    cmsUNUSED_PARAMETER(nItems);
+
     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);
+
+    return (void*) cmsDupProfileSequenceDescription((cmsSEQ*) Ptr);
+
 }
 
 static
 void Type_ProfileSequenceId_Free(struct _cms_typehandler_struct* self, void* Ptr)
 {
     cmsFreeProfileSequenceDescription((cmsSEQ*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -3577,9 +3645,10 @@
     if (!io ->Write(io, TextSize, Text)) return FALSE;
     _cmsFree(self ->ContextID, Text);
 
+    cmsUNUSED_PARAMETER(nItems);
+
     return TRUE;
 
-    cmsUNUSED_PARAMETER(nItems);
 }
 
 static
@@ -3594,9 +3663,10 @@
     NewUcrBg ->Ucr  = cmsDupToneCurve(Src ->Ucr);
     NewUcrBg ->Desc = cmsMLUdup(Src ->Desc);
 
+    cmsUNUSED_PARAMETER(n);
+
     return (void*) NewUcrBg;
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 static
@@ -3716,28 +3786,30 @@
     return TRUE;
 
 Error:
+    cmsUNUSED_PARAMETER(nItems);
     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);
+
+    return (void*) cmsMLUdup((cmsMLU*) Ptr);
+
 }
 
 static
 void Type_CrdInfo_Free(struct _cms_typehandler_struct* self, void *Ptr)
 {
     cmsMLUfree((cmsMLU*) Ptr);
+    cmsUNUSED_PARAMETER(self);
+
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 // ********************************************************************************
@@ -3780,9 +3852,9 @@
     if (sc != NULL)
         _cmsFree(self ->ContextID, sc);
 
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -3802,19 +3874,18 @@
         if (!_cmsWriteUInt32Number(io, sc ->Channels[i].SpotShape)) return FALSE;
     }
 
+    cmsUNUSED_PARAMETER(nItems);
     return TRUE;
 
-    cmsUNUSED_PARAMETER(nItems);
-    cmsUNUSED_PARAMETER(self);
 }
 
 
 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));
 
-   cmsUNUSED_PARAMETER(n);
 }
 
 
@@ -3854,9 +3925,9 @@
     if (vc != NULL)
         _cmsFree(self ->ContextID, vc);
 
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -3869,19 +3940,19 @@
     if (!_cmsWriteXYZNumber(io, &sc ->SurroundXYZ)) return FALSE;
     if (!_cmsWriteUInt32Number(io, sc ->IlluminantType)) return FALSE;
 
-    return TRUE;
-
     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));
 
-   cmsUNUSED_PARAMETER(n);
 }
 
 
@@ -3900,19 +3971,19 @@
 static
 void* GenericMPEdup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n)
 {
-    return (void*) cmsStageDup((cmsStage*) Ptr);
-
     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;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 // Each curve is stored in one or more curve segments, with break-points specified between curve segments.
@@ -4037,9 +4108,9 @@
       cmsToneCurve** GammaTables = ( cmsToneCurve**) Cargo;
 
       GammaTables[n] = ReadSegmentedCurve(self, io);
+      cmsUNUSED_PARAMETER(SizeOfTag);
       return (GammaTables[n] != NULL);
 
-      cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 static
@@ -4077,9 +4148,9 @@
 
     _cmsFree(self ->ContextID, GammaTables);
     *nItems = (mpe != NULL) ? 1 : 0;
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return mpe;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -4158,10 +4229,10 @@
 {
     _cmsStageToneCurvesData* Curves  = (_cmsStageToneCurvesData*) Cargo;
 
-    return WriteSegmentedCurve(io, Curves ->TheCurves[n]);
-
     cmsUNUSED_PARAMETER(SizeOfTag);
     cmsUNUSED_PARAMETER(self);
+    return WriteSegmentedCurve(io, Curves ->TheCurves[n]);
+
 }
 
 // Write a curve, checking first for validity
@@ -4182,9 +4253,9 @@
                                 mpe ->InputChannels, BaseOffset, Curves, WriteMPECurve)) return FALSE;
 
 
+    cmsUNUSED_PARAMETER(nItems);
     return TRUE;
 
-    cmsUNUSED_PARAMETER(nItems);
 }
 
 
@@ -4244,9 +4315,9 @@
 
     *nItems = 1;
 
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return mpe;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 static
@@ -4277,10 +4348,10 @@
         }
     }
 
-    return TRUE;
-
     cmsUNUSED_PARAMETER(nItems);
     cmsUNUSED_PARAMETER(self);
+    return TRUE;
+
 }
 
 
@@ -4324,9 +4395,9 @@
 Error:
     *nItems = 0;
     if (mpe != NULL) cmsStageFree(mpe);
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return NULL;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 // Write a CLUT in floating point
@@ -4359,10 +4430,10 @@
         if (!_cmsWriteFloat32Number(io, clut ->Tab.TFloat[i])) return FALSE;
     }
 
-    return TRUE;
-
     cmsUNUSED_PARAMETER(nItems);
     cmsUNUSED_PARAMETER(self);
+    return TRUE;
+
 }
 
 
@@ -4422,10 +4493,10 @@
             return FALSE;
     }
 
-    return TRUE;
-
     cmsUNUSED_PARAMETER(SizeOfTag);
     cmsUNUSED_PARAMETER(n);
+    return TRUE;
+
 }
 
 
@@ -4459,9 +4530,9 @@
 
     // Success
     *nItems = 1;
+    cmsUNUSED_PARAMETER(SizeOfTag);
     return NewLUT;
 
-    cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -4554,28 +4625,29 @@
 Error:
     if (ElementOffsets != NULL) _cmsFree(self ->ContextID, ElementOffsets);
     if (ElementSizes != NULL) _cmsFree(self ->ContextID, ElementSizes);
+    cmsUNUSED_PARAMETER(nItems);
     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);
+
+    return (void*) cmsPipelineDup((cmsPipeline*) Ptr);
+
 }
 
 static
 void Type_MPE_Free(struct _cms_typehandler_struct* self, void *Ptr)
 {
     cmsPipelineFree((cmsPipeline*) Ptr);
+    cmsUNUSED_PARAMETER(self);
     return;
 
-    cmsUNUSED_PARAMETER(self);
 }
 
 
@@ -4726,9 +4798,9 @@
 
     cmsFreeToneCurveTriple(Curves);
     _cmsFree(self ->ContextID, Curves);
+     cmsUNUSED_PARAMETER(SizeOfTag);
     return NULL;
 
-     cmsUNUSED_PARAMETER(SizeOfTag);
 }
 
 
@@ -4779,10 +4851,10 @@
         }
     }
 
-    return TRUE;
-
     cmsUNUSED_PARAMETER(self);
     cmsUNUSED_PARAMETER(nItems);
+    return TRUE;
+
 }
 
 static
@@ -4798,9 +4870,9 @@
     NewCurves[1] = cmsDupToneCurve(OldCurves[1]);
     NewCurves[2] = cmsDupToneCurve(OldCurves[2]);
 
+    cmsUNUSED_PARAMETER(n);
     return (void*) NewCurves;
 
-    cmsUNUSED_PARAMETER(n);
 }
 
 
@@ -5224,19 +5296,20 @@
 
 Error:
     FreeArray(&a);
+    cmsUNUSED_PARAMETER(nItems);
     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);
+
+    return (void*)  cmsDictDup((cmsHANDLE) Ptr);
+
 }