< prev index next >

src/java.desktop/share/native/liblcms/cmspack.c

Print this page

        

*** 157,171 **** memmove(&wIn[0], &wIn[1], (nChan-1) * sizeof(cmsUInt16Number)); wIn[nChan-1] = tmp; } - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // Extra channels are just ignored because come in the next planes static cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info, --- 157,172 ---- memmove(&wIn[0], &wIn[1], (nChan-1) * sizeof(cmsUInt16Number)); wIn[nChan-1] = tmp; } cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + return accum; + + } // Extra channels are just ignored because come in the next planes static cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info,
*** 206,219 **** wIn[0] = FROM_8_TO_16(*accum); accum++; // C wIn[1] = FROM_8_TO_16(*accum); accum++; // M 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); } static cmsUInt8Number* Unroll4BytesReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 207,221 ---- wIn[0] = FROM_8_TO_16(*accum); accum++; // C wIn[1] = FROM_8_TO_16(*accum); accum++; // M wIn[2] = FROM_8_TO_16(*accum); accum++; // Y wIn[3] = FROM_8_TO_16(*accum); accum++; // K cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll4BytesReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 223,236 **** wIn[0] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // C wIn[1] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // M 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); } static cmsUInt8Number* Unroll4BytesSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 225,239 ---- wIn[0] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // C wIn[1] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // M wIn[2] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // Y wIn[3] = FROM_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // K cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll4BytesSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 240,253 **** wIn[3] = FROM_8_TO_16(*accum); accum++; // K wIn[0] = FROM_8_TO_16(*accum); accum++; // C 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); } // KYMC static cmsUInt8Number* Unroll4BytesSwap(register _cmsTRANSFORM* info, --- 243,257 ---- wIn[3] = FROM_8_TO_16(*accum); accum++; // K wIn[0] = FROM_8_TO_16(*accum); accum++; // C wIn[1] = FROM_8_TO_16(*accum); accum++; // M wIn[2] = FROM_8_TO_16(*accum); accum++; // Y cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // KYMC static cmsUInt8Number* Unroll4BytesSwap(register _cmsTRANSFORM* info,
*** 258,271 **** wIn[3] = FROM_8_TO_16(*accum); accum++; // K wIn[2] = FROM_8_TO_16(*accum); accum++; // Y 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); } static cmsUInt8Number* Unroll4BytesSwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 262,276 ---- wIn[3] = FROM_8_TO_16(*accum); accum++; // K wIn[2] = FROM_8_TO_16(*accum); accum++; // Y wIn[1] = FROM_8_TO_16(*accum); accum++; // M wIn[0] = FROM_8_TO_16(*accum); accum++; // C cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll4BytesSwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 275,288 **** wIn[2] = FROM_8_TO_16(*accum); accum++; // K wIn[1] = FROM_8_TO_16(*accum); accum++; // Y 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); } static cmsUInt8Number* Unroll3Bytes(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 280,294 ---- wIn[2] = FROM_8_TO_16(*accum); accum++; // K wIn[1] = FROM_8_TO_16(*accum); accum++; // Y wIn[0] = FROM_8_TO_16(*accum); accum++; // M wIn[3] = FROM_8_TO_16(*accum); accum++; // C cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3Bytes(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 291,304 **** { wIn[0] = FROM_8_TO_16(*accum); accum++; // R 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); } static cmsUInt8Number* Unroll3BytesSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 297,311 ---- { wIn[0] = FROM_8_TO_16(*accum); accum++; // R wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[2] = FROM_8_TO_16(*accum); accum++; // B cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3BytesSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 308,321 **** accum++; // A wIn[2] = FROM_8_TO_16(*accum); accum++; // B 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); } static cmsUInt8Number* Unroll3BytesSkip1SwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 315,329 ---- accum++; // A wIn[2] = FROM_8_TO_16(*accum); accum++; // B wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[0] = FROM_8_TO_16(*accum); accum++; // R cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3BytesSkip1SwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 325,338 **** wIn[2] = FROM_8_TO_16(*accum); accum++; // B wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[0] = FROM_8_TO_16(*accum); accum++; // R accum++; // A - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 333,347 ---- wIn[2] = FROM_8_TO_16(*accum); accum++; // B wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[0] = FROM_8_TO_16(*accum); accum++; // R accum++; // A cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 342,355 **** accum++; // A wIn[0] = FROM_8_TO_16(*accum); accum++; // R 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); } // BRG static --- 351,365 ---- accum++; // A wIn[0] = FROM_8_TO_16(*accum); accum++; // R wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[2] = FROM_8_TO_16(*accum); accum++; // B cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // BRG static
*** 360,373 **** { wIn[2] = FROM_8_TO_16(*accum); accum++; // B 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); } static cmsUInt8Number* UnrollLabV2_8(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 370,384 ---- { wIn[2] = FROM_8_TO_16(*accum); accum++; // B wIn[1] = FROM_8_TO_16(*accum); accum++; // G wIn[0] = FROM_8_TO_16(*accum); accum++; // R cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* UnrollLabV2_8(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 376,389 **** { wIn[0] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // L 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); } static cmsUInt8Number* UnrollALabV2_8(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 387,401 ---- { wIn[0] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // L wIn[1] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // a wIn[2] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // b cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* UnrollALabV2_8(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 393,406 **** accum++; // A wIn[0] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // L 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); } static cmsUInt8Number* UnrollLabV2_16(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 405,419 ---- accum++; // A wIn[0] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // L wIn[1] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // a wIn[2] = FomLabV2ToLabV4(FROM_8_TO_16(*accum)); accum++; // b cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* UnrollLabV2_16(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 409,422 **** { wIn[0] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // L wIn[1] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // a wIn[2] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // b - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // for duplex static cmsUInt8Number* Unroll2Bytes(register _cmsTRANSFORM* info, --- 422,436 ---- { wIn[0] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // L wIn[1] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // a wIn[2] = FomLabV2ToLabV4(*(cmsUInt16Number*) accum); accum += 2; // b cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // for duplex static cmsUInt8Number* Unroll2Bytes(register _cmsTRANSFORM* info,
*** 425,438 **** register cmsUInt32Number Stride) { 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); } --- 439,453 ---- register cmsUInt32Number Stride) { wIn[0] = FROM_8_TO_16(*accum); accum++; // ch1 wIn[1] = FROM_8_TO_16(*accum); accum++; // ch2 cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + }
*** 443,456 **** register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll1ByteSkip1(register _cmsTRANSFORM* info, --- 458,472 ---- register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll1ByteSkip1(register _cmsTRANSFORM* info,
*** 459,472 **** register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L accum += 1; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll1ByteSkip2(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 475,489 ---- register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L accum += 1; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll1ByteSkip2(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 474,501 **** register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L accum += 2; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll1ByteReversed(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(FROM_8_TO_16(*accum)); accum++; // L - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info, --- 491,520 ---- register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = FROM_8_TO_16(*accum); accum++; // L accum += 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll1ByteReversed(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(FROM_8_TO_16(*accum)); accum++; // L cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info,
*** 539,551 **** memmove(&wIn[0], &wIn[1], (nChan-1) * sizeof(cmsUInt16Number)); wIn[nChan-1] = tmp; } return accum; - cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 558,571 ---- memmove(&wIn[0], &wIn[1], (nChan-1) * sizeof(cmsUInt16Number)); wIn[nChan-1] = tmp; } + cmsUNUSED_PARAMETER(Stride); + return accum; } static cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 589,602 **** wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll4WordsReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 609,623 ---- wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll4WordsReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 606,619 **** wIn[0] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // C wIn[1] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // M 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); } static cmsUInt8Number* Unroll4WordsSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 627,641 ---- wIn[0] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // C wIn[1] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // M wIn[2] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // Y wIn[3] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; // K cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll4WordsSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 623,636 **** wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // KYMC static cmsUInt8Number* Unroll4WordsSwap(register _cmsTRANSFORM* info, --- 645,659 ---- wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // KYMC static cmsUInt8Number* Unroll4WordsSwap(register _cmsTRANSFORM* info,
*** 641,654 **** wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll4WordsSwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 664,678 ---- wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // K wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll4WordsSwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 658,671 **** wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // K wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // C - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll3Words(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 682,696 ---- wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // K wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // Y wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // M wIn[3] = *(cmsUInt16Number*) accum; accum+= 2; // C cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3Words(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 674,687 **** { wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C R wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M G wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll3WordsSwap(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 699,713 ---- { wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // C R wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M G wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // Y B cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3WordsSwap(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 690,703 **** { wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // C R wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M G wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // Y B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll3WordsSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 716,730 ---- { wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // C R wIn[1] = *(cmsUInt16Number*) accum; accum+= 2; // M G wIn[0] = *(cmsUInt16Number*) accum; accum+= 2; // Y B cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3WordsSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 707,720 **** accum += 2; // A wIn[2] = *(cmsUInt16Number*) accum; accum += 2; // R wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // G wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll3WordsSkip1SwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 734,748 ---- accum += 2; // A wIn[2] = *(cmsUInt16Number*) accum; accum += 2; // R wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // G wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // B cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll3WordsSkip1SwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 724,765 **** accum += 2; // A wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // R wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // G wIn[2] = *(cmsUInt16Number*) accum; accum += 2; // B - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll1Word(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // L - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll1WordReversed(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll1WordSkip3(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 752,796 ---- accum += 2; // A wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // R wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // G wIn[2] = *(cmsUInt16Number*) accum; accum += 2; // B cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll1Word(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; accum+= 2; // L cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll1WordReversed(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(*(cmsUInt16Number*) accum); accum+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll1WordSkip3(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 768,781 **** { wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; accum += 8; - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Unroll2Words(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[], --- 799,813 ---- { wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; accum += 8; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } static cmsUInt8Number* Unroll2Words(register _cmsTRANSFORM* info, register cmsUInt16Number wIn[],
*** 783,796 **** register cmsUInt32Number Stride) { wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // ch1 wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // ch2 - return accum; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // This is a conversion of Lab double to 16 bits static --- 815,829 ---- register cmsUInt32Number Stride) { wIn[0] = *(cmsUInt16Number*) accum; accum += 2; // ch1 wIn[1] = *(cmsUInt16Number*) accum; accum += 2; // ch2 cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum; + } // This is a conversion of Lab double to 16 bits static
*** 1065,1078 **** { cmsFloat64Number* Inks = (cmsFloat64Number*) accum; wIn[0] = wIn[1] = wIn[2] = _cmsQuickSaturateWord(Inks[0] * 65535.0); - return accum + sizeof(cmsFloat64Number); - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } //------------------------------------------------------------------------------------------------------------------- // For anything going from cmsFloat32Number --- 1098,1112 ---- { cmsFloat64Number* Inks = (cmsFloat64Number*) accum; wIn[0] = wIn[1] = wIn[2] = _cmsQuickSaturateWord(Inks[0] * 65535.0); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return accum + sizeof(cmsFloat64Number); + } //------------------------------------------------------------------------------------------------------------------- // For anything going from cmsFloat32Number
*** 1342,1355 **** memmove(swap1 + 1, swap1, nChan-1); *swap1 = v; } return output; - cmsUNUSED_PARAMETER(Stride); } static --- 1376,1389 ---- memmove(swap1 + 1, swap1, nChan-1); *swap1 = v; } + cmsUNUSED_PARAMETER(Stride); return output; } static
*** 1400,1413 **** memmove(swap1 + 1, swap1, (nChan-1)* sizeof(cmsUInt16Number)); *swap1 = v; } return output; - cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info, --- 1434,1447 ---- memmove(swap1 + 1, swap1, (nChan-1)* sizeof(cmsUInt16Number)); *swap1 = v; } + cmsUNUSED_PARAMETER(Stride); return output; } static cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info,
*** 1435,1447 **** *(cmsUInt8Number*) output = (cmsUInt8Number) (Reverse ? REVERSE_FLAVOR_8(v) : v); output += Stride; } return (Init + 1); - cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info, --- 1469,1482 ---- *(cmsUInt8Number*) output = (cmsUInt8Number) (Reverse ? REVERSE_FLAVOR_8(v) : v); output += Stride; } + cmsUNUSED_PARAMETER(Stride); + return (Init + 1); } static cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info,
*** 1493,1506 **** *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[4]); *output++ = FROM_16_TO_8(wOut[5]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // KCMYcm static --- 1528,1542 ---- *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[4]); *output++ = FROM_16_TO_8(wOut[5]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // KCMYcm static
*** 1514,1527 **** *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // CMYKcm static cmsUInt8Number* Pack6Words(register _cmsTRANSFORM* info, --- 1550,1564 ---- *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // CMYKcm static cmsUInt8Number* Pack6Words(register _cmsTRANSFORM* info,
*** 1540,1553 **** *(cmsUInt16Number*) output = wOut[4]; output+= 2; *(cmsUInt16Number*) output = wOut[5]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // KCMYcm static cmsUInt8Number* Pack6WordsSwap(register _cmsTRANSFORM* info, --- 1577,1591 ---- *(cmsUInt16Number*) output = wOut[4]; output+= 2; *(cmsUInt16Number*) output = wOut[5]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // KCMYcm static cmsUInt8Number* Pack6WordsSwap(register _cmsTRANSFORM* info,
*** 1566,1579 **** *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack4Bytes(register _cmsTRANSFORM* info, --- 1604,1618 ---- *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack4Bytes(register _cmsTRANSFORM* info,
*** 1584,1597 **** *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[3]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack4BytesReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1623,1637 ---- *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[3]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack4BytesReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1601,1614 **** *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[0])); *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[1])); *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); } static cmsUInt8Number* Pack4BytesSwapFirst(register _cmsTRANSFORM* info, --- 1641,1655 ---- *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[0])); *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[1])); *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[2])); *output++ = REVERSE_FLAVOR_8(FROM_16_TO_8(wOut[3])); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack4BytesSwapFirst(register _cmsTRANSFORM* info,
*** 1619,1632 **** *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // ABGR static cmsUInt8Number* Pack4BytesSwap(register _cmsTRANSFORM* info, --- 1660,1674 ---- *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // ABGR static cmsUInt8Number* Pack4BytesSwap(register _cmsTRANSFORM* info,
*** 1637,1650 **** *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack4BytesSwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1679,1693 ---- *output++ = FROM_16_TO_8(wOut[3]); *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack4BytesSwapSwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1654,1667 **** *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[3]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack4Words(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1697,1711 ---- *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[3]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack4Words(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1675,1688 **** *(cmsUInt16Number*) output = wOut[2]; output+= 2; *(cmsUInt16Number*) output = wOut[3]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack4WordsReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1719,1733 ---- *(cmsUInt16Number*) output = wOut[2]; output+= 2; *(cmsUInt16Number*) output = wOut[3]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack4WordsReverse(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1696,1709 **** *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[2]); output+= 2; *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[3]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // ABGR static cmsUInt8Number* Pack4WordsSwap(register _cmsTRANSFORM* info, --- 1741,1755 ---- *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[2]); output+= 2; *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[3]); output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // ABGR static cmsUInt8Number* Pack4WordsSwap(register _cmsTRANSFORM* info,
*** 1718,1731 **** *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // CMYK static cmsUInt8Number* Pack4WordsBigEndian(register _cmsTRANSFORM* info, --- 1764,1778 ---- *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // CMYK static cmsUInt8Number* Pack4WordsBigEndian(register _cmsTRANSFORM* info,
*** 1740,1753 **** *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[2]); output+= 2; *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[3]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* PackLabV2_8(register _cmsTRANSFORM* info, --- 1787,1801 ---- *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[2]); output+= 2; *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[3]); output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* PackLabV2_8(register _cmsTRANSFORM* info,
*** 1757,1770 **** { *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[0])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[1])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[2])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* PackALabV2_8(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1805,1819 ---- { *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[0])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[1])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[2])); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* PackALabV2_8(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1774,1787 **** output++; *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[0])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[1])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[2])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* PackLabV2_16(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1823,1837 ---- output++; *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[0])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[1])); *output++ = FROM_16_TO_8(FomLabV4ToLabV2(wOut[2])); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* PackLabV2_16(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1793,1806 **** *(cmsUInt16Number*) output = FomLabV4ToLabV2(wOut[1]); output += 2; *(cmsUInt16Number*) output = FomLabV4ToLabV2(wOut[2]); output += 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3Bytes(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1843,1857 ---- *(cmsUInt16Number*) output = FomLabV4ToLabV2(wOut[1]); output += 2; *(cmsUInt16Number*) output = FomLabV4ToLabV2(wOut[2]); output += 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3Bytes(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1809,1822 **** { *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1860,1874 ---- { *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1825,1838 **** { *output++ = (wOut[0] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesSwap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1877,1891 ---- { *output++ = (wOut[0] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesSwap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1841,1854 **** { *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesSwapOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1894,1908 ---- { *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesSwapOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1857,1870 **** { *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3Words(register _cmsTRANSFORM* info, --- 1911,1925 ---- { *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3Words(register _cmsTRANSFORM* info,
*** 1877,1890 **** *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[2]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3WordsSwap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1932,1946 ---- *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[2]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3WordsSwap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1896,1909 **** *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3WordsBigEndian(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1952,1966 ---- *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3WordsBigEndian(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1915,1928 **** *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[1]); output+= 2; *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[2]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1972,1986 ---- *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[1]); output+= 2; *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[2]); output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1932,1945 **** *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1Optimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 1990,2004 ---- *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); output++; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1Optimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1949,1962 **** *output++ = (wOut[0] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1SwapFirst(register _cmsTRANSFORM* info, --- 2008,2022 ---- *output++ = (wOut[0] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); output++; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1SwapFirst(register _cmsTRANSFORM* info,
*** 1967,1980 **** output++; *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1SwapFirstOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2027,2041 ---- output++; *output++ = FROM_16_TO_8(wOut[0]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[2]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1SwapFirstOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 1984,1997 **** output++; *output++ = (wOut[0] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2045,2059 ---- output++; *output++ = (wOut[0] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[2] & 0xFF); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2001,2014 **** output++; *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1SwapOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2063,2077 ---- output++; *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1SwapOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2018,2031 **** output++; *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, --- 2081,2095 ---- output++; *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info,
*** 2036,2049 **** *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirstOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2100,2114 ---- *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); output++; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirstOptimized(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2053,2066 **** *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3WordsAndSkip1(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2118,2132 ---- *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); output++; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3WordsAndSkip1(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2073,2086 **** output+= 2; *(cmsUInt16Number*) output = wOut[2]; output+= 2; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3WordsAndSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2139,2153 ---- output+= 2; *(cmsUInt16Number*) output = wOut[2]; output+= 2; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3WordsAndSkip1Swap(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2093,2106 **** *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3WordsAndSkip1SwapFirst(register _cmsTRANSFORM* info, --- 2160,2174 ---- *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3WordsAndSkip1SwapFirst(register _cmsTRANSFORM* info,
*** 2114,2127 **** *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[2]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack3WordsAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, --- 2182,2196 ---- *(cmsUInt16Number*) output = wOut[1]; output+= 2; *(cmsUInt16Number*) output = wOut[2]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack3WordsAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info,
*** 2135,2148 **** output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static --- 2204,2218 ---- output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static
*** 2151,2164 **** register cmsUInt8Number* output, register cmsUInt32Number Stride) { *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1ByteReversed(register _cmsTRANSFORM* info, --- 2221,2235 ---- register cmsUInt8Number* output, register cmsUInt32Number Stride) { *output++ = FROM_16_TO_8(wOut[0]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1ByteReversed(register _cmsTRANSFORM* info,
*** 2166,2179 **** register cmsUInt8Number* output, register cmsUInt32Number Stride) { *output++ = FROM_16_TO_8(REVERSE_FLAVOR_16(wOut[0])); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1ByteSkip1(register _cmsTRANSFORM* info, --- 2237,2251 ---- register cmsUInt8Number* output, register cmsUInt32Number Stride) { *output++ = FROM_16_TO_8(REVERSE_FLAVOR_16(wOut[0])); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1ByteSkip1(register _cmsTRANSFORM* info,
*** 2182,2195 **** register cmsUInt32Number Stride) { *output++ = FROM_16_TO_8(wOut[0]); output++; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1ByteSkip1SwapFirst(register _cmsTRANSFORM* info, --- 2254,2268 ---- register cmsUInt32Number Stride) { *output++ = FROM_16_TO_8(wOut[0]); output++; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1ByteSkip1SwapFirst(register _cmsTRANSFORM* info,
*** 2198,2211 **** register cmsUInt32Number Stride) { output++; *output++ = FROM_16_TO_8(wOut[0]); - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1Word(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2271,2285 ---- register cmsUInt32Number Stride) { output++; *output++ = FROM_16_TO_8(wOut[0]); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1Word(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2213,2226 **** register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1WordReversed(register _cmsTRANSFORM* info, --- 2287,2301 ---- register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = wOut[0]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1WordReversed(register _cmsTRANSFORM* info,
*** 2229,2242 **** register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[0]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1WordBigEndian(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2304,2318 ---- register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = REVERSE_FLAVOR_16(wOut[0]); output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1WordBigEndian(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2244,2257 **** register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[0]); output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1WordSkip1(register _cmsTRANSFORM* info, --- 2320,2334 ---- register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = CHANGE_ENDIAN(wOut[0]); output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1WordSkip1(register _cmsTRANSFORM* info,
*** 2260,2273 **** register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = wOut[0]; output+= 4; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } static cmsUInt8Number* Pack1WordSkip1SwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[], --- 2337,2351 ---- register cmsUInt32Number Stride) { *(cmsUInt16Number*) output = wOut[0]; output+= 4; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } static cmsUInt8Number* Pack1WordSkip1SwapFirst(register _cmsTRANSFORM* info, register cmsUInt16Number wOut[],
*** 2276,2289 **** { output += 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; - return output; - cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); } // Unencoded Float values -- don't try optimize speed static --- 2354,2368 ---- { output += 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); + + return output; + } // Unencoded Float values -- don't try optimize speed static
< prev index next >