--- old/src/java.desktop/share/native/liblcms/cmspack.c 2016-04-01 15:58:30.182008666 +0530 +++ new/src/java.desktop/share/native/liblcms/cmspack.c 2016-04-01 15:58:29.954008668 +0530 @@ -159,11 +159,12 @@ wIn[nChan-1] = tmp; } - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + return accum; + + } // Extra channels are just ignored because come in the next planes @@ -208,10 +209,11 @@ wIn[2] = FROM_8_TO_16(*accum); accum++; // Y wIn[3] = FROM_8_TO_16(*accum); accum++; // K - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -225,10 +227,11 @@ wIn[2] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // Y wIn[3] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // K - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -242,10 +245,11 @@ wIn[1] = FROM_8_TO_16(*accum); accum++; // M wIn[2] = FROM_8_TO_16(*accum); accum++; // Y - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // KYMC @@ -260,10 +264,11 @@ wIn[1] = FROM_8_TO_16(*accum); accum++; // M wIn[0] = FROM_8_TO_16(*accum); accum++; // C - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -277,10 +282,11 @@ wIn[0] = FROM_8_TO_16(*accum); accum++; // M wIn[3] = FROM_8_TO_16(*accum); accum++; // C - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -293,10 +299,11 @@ wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[2] = FROM_8_TO_16(*accum); accum++; // B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -310,10 +317,11 @@ wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[0] = FROM_8_TO_16(*accum); accum++; // R - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -327,10 +335,11 @@ wIn[0] = FROM_8_TO_16(*accum); accum++; // R accum++; // A - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -344,10 +353,11 @@ wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[2] = FROM_8_TO_16(*accum); accum++; // B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } @@ -362,10 +372,11 @@ wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[0] = FROM_8_TO_16(*accum); accum++; // R - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -378,10 +389,11 @@ wIn[1] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // a wIn[2] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // b - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -395,10 +407,11 @@ wIn[1] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // a wIn[2] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // b - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -411,10 +424,11 @@ wIn[1] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // a wIn[2] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // b - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // for duplex @@ -427,10 +441,11 @@ wIn[0] = FROM_8_TO_16(*accum); accum++; // ch1 wIn[1] = FROM_8_TO_16(*accum); accum++; // ch2 - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } @@ -445,10 +460,11 @@ { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } @@ -461,10 +477,11 @@ wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L accum += 1; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -476,10 +493,11 @@ wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L accum += 2; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -490,10 +508,11 @@ { wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(FROM_8_TO_16(*accum)); accum++; // L - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } @@ -541,9 +560,10 @@ wIn[nChan-1] = tmp; } + cmsUNUSED_PARAMETER(Stride); + return accum; - cmsUNUSED_PARAMETER(Stride); } static @@ -591,10 +611,11 @@ wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -608,10 +629,11 @@ wIn[2] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // Y wIn[3] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // K - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -625,10 +647,11 @@ wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // KYMC @@ -643,10 +666,11 @@ wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -660,10 +684,11 @@ wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // C - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -676,10 +701,11 @@ wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M G wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -692,10 +718,11 @@ wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M G wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // Y B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -709,10 +736,11 @@ wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // G wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -726,10 +754,11 @@ wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // G wIn[2] = *(cmsUInt16Number*) accum; accum += 2; // B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -740,10 +769,11 @@ { wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // L - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -754,10 +784,11 @@ { wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -770,10 +801,11 @@ accum += 8; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static @@ -785,10 +817,11 @@ wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // ch1 wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // ch2 - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } @@ -1067,10 +1100,11 @@ wIn[0] = wIn[1] = wIn[2] = _cmsQuickSaturateWord(Inks[0] * 65535.0); - return accum + sizeof(cmsFloat64Number); - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum + sizeof(cmsFloat64Number); + } //------------------------------------------------------------------------------------------------------------------- @@ -1344,10 +1378,10 @@ *swap1 = v; } + cmsUNUSED_PARAMETER(Stride); return output; - cmsUNUSED_PARAMETER(Stride); } @@ -1402,10 +1436,10 @@ *swap1 = v; } + cmsUNUSED_PARAMETER(Stride); return output; - cmsUNUSED_PARAMETER(Stride); } @@ -1437,9 +1471,10 @@ output += Stride; } + cmsUNUSED_PARAMETER(Stride); + return (Init + 1); - cmsUNUSED_PARAMETER(Stride); } @@ -1495,10 +1530,11 @@ *output++ = FROM_16_TO_8(wOut[4]); *output++ = FROM_16_TO_8(wOut[5]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // KCMYcm @@ -1516,10 +1552,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // CMYKcm @@ -1542,10 +1579,11 @@ *(cmsUInt16Number*) output = wOut[5]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // KCMYcm @@ -1568,10 +1606,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -1586,10 +1625,11 @@ *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[3]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1603,10 +1643,11 @@ *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[2])); *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[3])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -1621,10 +1662,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // ABGR @@ -1639,10 +1681,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1656,10 +1699,11 @@ *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[3]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1677,10 +1721,11 @@ *(cmsUInt16Number*) output = wOut[3]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1698,10 +1743,11 @@ *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[3]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // ABGR @@ -1720,10 +1766,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // CMYK @@ -1742,10 +1789,11 @@ *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[3]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -1759,10 +1807,11 @@ *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[1])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[2])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1776,10 +1825,11 @@ *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[1])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[2])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1795,10 +1845,11 @@ *(cmsUInt16Number*) output = FomLabV4ToLabV2(wOut[2]); output += 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1811,10 +1862,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1827,10 +1879,11 @@ *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1843,10 +1896,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1859,10 +1913,11 @@ *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -1879,10 +1934,11 @@ *(cmsUInt16Number*) output = wOut[2]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1898,10 +1954,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1917,10 +1974,11 @@ *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[2]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1934,10 +1992,11 @@ *output++ = FROM_16_TO_8(wOut[2]); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1951,10 +2010,11 @@ *output++ = (wOut[2] & 0xFF); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -1969,10 +2029,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -1986,10 +2047,11 @@ *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2003,10 +2065,11 @@ *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2020,10 +2083,11 @@ *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2038,10 +2102,11 @@ *output++ = FROM_16_TO_8(wOut[0]); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2055,10 +2120,11 @@ *output++ = (wOut[0] & 0xFF); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2075,10 +2141,11 @@ output+= 2; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2095,10 +2162,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2116,10 +2184,11 @@ *(cmsUInt16Number*) output = wOut[2]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2137,10 +2206,11 @@ output+= 2; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2153,10 +2223,11 @@ { *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2168,10 +2239,11 @@ { *output++ = FROM_16_TO_8(REVERSE_FLAVOR_16(wOut[0])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2184,10 +2256,11 @@ *output++ = FROM_16_TO_8(wOut[0]); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2200,10 +2273,11 @@ output++; *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2215,10 +2289,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2231,10 +2306,11 @@ *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[0]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2246,10 +2322,11 @@ *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[0]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } @@ -2262,10 +2339,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 4; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static @@ -2278,10 +2356,11 @@ *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + }