diff options
Diffstat (limited to 'src/cmspack.c')
| -rw-r--r-- | src/cmspack.c | 696 |
1 files changed, 348 insertions, 348 deletions
diff --git a/src/cmspack.c b/src/cmspack.c index 2f73d38..f72c472 100644 --- a/src/cmspack.c +++ b/src/cmspack.c @@ -3,22 +3,22 @@ // Little Color Management System // Copyright (c) 1998-2010 Marti Maria Saguer // -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the "Software"), -// to deal in the Software without restriction, including without limitation -// the rights to use, copy, modify, merge, publish, distribute, sublicense, -// and/or sell copies of the Software, and to permit persons to whom the Software +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the Software // is furnished to do so, subject to the following conditions: // -// The above copyright notice and this permission notice shall be included in +// The above copyright notice and this permission notice shall be included in // all copies or substantial portions of the Software. // -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO -// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // //--------------------------------------------------------------------------------- @@ -26,9 +26,9 @@ #include "lcms2_internal.h" -// This module handles all formats supported by lcms. There are two flavors, 16 bits and +// This module handles all formats supported by lcms. There are two flavors, 16 bits and // floating point. Floating point is supported only in a subset, those formats holding -// cmsFloat32Number (4 bytes per component) and double (marked as 0 bytes per component +// cmsFloat32Number (4 bytes per component) and double (marked as 0 bytes per component // as special case) // --------------------------------------------------------------------------- @@ -42,7 +42,7 @@ #define REVERSE_FLAVOR_16(x) ((cmsUInt16Number)(0xffff-(x))) // * 0xffff / 0xff00 = (255 * 257) / (255 * 256) = 257 / 256 -cmsINLINE cmsUInt16Number FomLabV2ToLabV4(cmsUInt16Number x) +cmsINLINE cmsUInt16Number FomLabV2ToLabV4(cmsUInt16Number x) { int a = (x << 8 | x) >> 8; // * 257 / 256 if ( a > 0xffff) return 0xffff; @@ -50,7 +50,7 @@ cmsINLINE cmsUInt16Number FomLabV2ToLabV4(cmsUInt16Number x) } // * 0xf00 / 0xffff = * 256 / 257 -cmsINLINE cmsUInt16Number FomLabV4ToLabV2(cmsUInt16Number x) +cmsINLINE cmsUInt16Number FomLabV4ToLabV2(cmsUInt16Number x) { return (cmsUInt16Number) (((x << 8) + 0x80) / 257); } @@ -77,7 +77,7 @@ typedef struct { #define ANYPLANAR PLANAR_SH(1) #define ANYENDIAN ENDIAN16_SH(1) #define ANYSWAP DOSWAP_SH(1) -#define ANYSWAPFIRST SWAPFIRST_SH(1) +#define ANYSWAPFIRST SWAPFIRST_SH(1) #define ANYFLAVOR FLAVOR_SH(1) @@ -87,12 +87,12 @@ typedef struct { #pragma warning(disable : 4100) #endif -// Unpacking routines (16 bits) ---------------------------------------------------------------------------------------- +// Unpacking routines (16 bits) ---------------------------------------------------------------------------------------- // Does almost everything but is slow static -cmsUInt8Number* UnrollChunkyBytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollChunkyBytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -112,10 +112,10 @@ cmsUInt8Number* UnrollChunkyBytes(register _cmsTRANSFORM* info, for (i=0; i < nChan; i++) { int index = DoSwap ? (nChan - i - 1) : i; - v = FROM_8_TO_16(*accum); + v = FROM_8_TO_16(*accum); v = Reverse ? REVERSE_FLAVOR_16(v) : v; wIn[index] = v; - accum++; + accum++; } if (!ExtraFirst) { @@ -138,8 +138,8 @@ cmsUInt8Number* UnrollChunkyBytes(register _cmsTRANSFORM* info, // Extra channels are just ignored because come in the next planes static -cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -157,7 +157,7 @@ cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info, for (i=0; i < nChan; i++) { int index = DoSwap ? (nChan - i - 1) : i; - cmsUInt16Number v = FROM_8_TO_16(*accum); + cmsUInt16Number v = FROM_8_TO_16(*accum); wIn[index] = Reverse ? REVERSE_FLAVOR_16(v) : v; accum += Stride; @@ -168,8 +168,8 @@ cmsUInt8Number* UnrollPlanarBytes(register _cmsTRANSFORM* info, // Special cases, provided for performance static -cmsUInt8Number* Unroll4Bytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4Bytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -185,8 +185,8 @@ cmsUInt8Number* Unroll4Bytes(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll4BytesReverse(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4BytesReverse(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -202,8 +202,8 @@ cmsUInt8Number* Unroll4BytesReverse(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll4BytesSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4BytesSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -220,8 +220,8 @@ cmsUInt8Number* Unroll4BytesSwapFirst(register _cmsTRANSFORM* info, // KYMC static -cmsUInt8Number* Unroll4BytesSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4BytesSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -237,8 +237,8 @@ cmsUInt8Number* Unroll4BytesSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll4BytesSwapSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4BytesSwapSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -254,8 +254,8 @@ cmsUInt8Number* Unroll4BytesSwapSwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3Bytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3Bytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -270,8 +270,8 @@ cmsUInt8Number* Unroll3Bytes(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3BytesSkip1Swap(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3BytesSkip1Swap(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -287,8 +287,8 @@ cmsUInt8Number* Unroll3BytesSkip1Swap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -306,8 +306,8 @@ cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info, // BRG static -cmsUInt8Number* Unroll3BytesSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3BytesSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -322,8 +322,8 @@ cmsUInt8Number* Unroll3BytesSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* UnrollLabV2_8(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollLabV2_8(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -338,8 +338,8 @@ cmsUInt8Number* UnrollLabV2_8(register _cmsTRANSFORM* info, } static -cmsUInt8Number* UnrollALabV2_8(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollALabV2_8(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -355,8 +355,8 @@ cmsUInt8Number* UnrollALabV2_8(register _cmsTRANSFORM* info, } static -cmsUInt8Number* UnrollLabV2_16(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollLabV2_16(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -372,8 +372,8 @@ cmsUInt8Number* UnrollLabV2_16(register _cmsTRANSFORM* info, // for duplex static -cmsUInt8Number* Unroll2Bytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll2Bytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -391,8 +391,8 @@ cmsUInt8Number* Unroll2Bytes(register _cmsTRANSFORM* info, // Monochrome duplicates L into RGB for null-transforms static -cmsUInt8Number* Unroll1Byte(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1Byte(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -406,8 +406,8 @@ cmsUInt8Number* Unroll1Byte(register _cmsTRANSFORM* info, static -cmsUInt8Number* Unroll1ByteSkip1(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1ByteSkip1(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -421,8 +421,8 @@ cmsUInt8Number* Unroll1ByteSkip1(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll1ByteSkip2(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1ByteSkip2(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -436,8 +436,8 @@ cmsUInt8Number* Unroll1ByteSkip2(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll1ByteReversed(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1ByteReversed(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -451,8 +451,8 @@ cmsUInt8Number* Unroll1ByteReversed(register _cmsTRANSFORM* info, static -cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -472,14 +472,14 @@ cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info, for (i=0; i < nChan; i++) { int index = DoSwap ? (nChan - i - 1) : i; - cmsUInt16Number v = *(cmsUInt16Number*) accum; + cmsUInt16Number v = *(cmsUInt16Number*) accum; if (SwapEndian) v = CHANGE_ENDIAN(v); wIn[index] = Reverse ? REVERSE_FLAVOR_16(v) : v; - accum += sizeof(cmsUInt16Number); + accum += sizeof(cmsUInt16Number); } if (!ExtraFirst) { @@ -500,8 +500,8 @@ cmsUInt8Number* UnrollAnyWords(register _cmsTRANSFORM* info, } static -cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -519,14 +519,14 @@ cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info, for (i=0; i < nChan; i++) { int index = DoSwap ? (nChan - i - 1) : i; - cmsUInt16Number v = *(cmsUInt16Number*) accum; + cmsUInt16Number v = *(cmsUInt16Number*) accum; if (SwapEndian) v = CHANGE_ENDIAN(v); wIn[index] = Reverse ? REVERSE_FLAVOR_16(v) : v; - accum += Stride * sizeof(cmsUInt16Number); + accum += Stride * sizeof(cmsUInt16Number); } return (Init + sizeof(cmsUInt16Number)); @@ -534,8 +534,8 @@ cmsUInt8Number* UnrollPlanarWords(register _cmsTRANSFORM* info, static -cmsUInt8Number* Unroll4Words(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4Words(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -551,8 +551,8 @@ cmsUInt8Number* Unroll4Words(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll4WordsReverse(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4WordsReverse(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -568,8 +568,8 @@ cmsUInt8Number* Unroll4WordsReverse(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll4WordsSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4WordsSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -586,8 +586,8 @@ cmsUInt8Number* Unroll4WordsSwapFirst(register _cmsTRANSFORM* info, // KYMC static -cmsUInt8Number* Unroll4WordsSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4WordsSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -603,8 +603,8 @@ cmsUInt8Number* Unroll4WordsSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll4WordsSwapSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll4WordsSwapSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -620,8 +620,8 @@ cmsUInt8Number* Unroll4WordsSwapSwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3Words(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3Words(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -636,8 +636,8 @@ cmsUInt8Number* Unroll3Words(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3WordsSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3WordsSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -652,8 +652,8 @@ cmsUInt8Number* Unroll3WordsSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3WordsSkip1Swap(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3WordsSkip1Swap(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -669,8 +669,8 @@ cmsUInt8Number* Unroll3WordsSkip1Swap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll3WordsSkip1SwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll3WordsSkip1SwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -686,8 +686,8 @@ cmsUInt8Number* Unroll3WordsSkip1SwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll1Word(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1Word(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -700,8 +700,8 @@ cmsUInt8Number* Unroll1Word(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll1WordReversed(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1WordReversed(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -714,12 +714,12 @@ cmsUInt8Number* Unroll1WordReversed(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll1WordSkip3(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll1WordSkip3(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { - wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; + wIn[0] = wIn[1] = wIn[2] = *(cmsUInt16Number*) accum; accum += 8; @@ -730,8 +730,8 @@ cmsUInt8Number* Unroll1WordSkip3(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Unroll2Words(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* Unroll2Words(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -747,11 +747,11 @@ cmsUInt8Number* Unroll2Words(register _cmsTRANSFORM* info, // This is a conversion of Lab double to 16 bits static -cmsUInt8Number* UnrollLabDoubleTo16(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollLabDoubleTo16(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) -{ +{ if (T_PLANAR(info -> InputFormat)) { cmsFloat64Number* Pt = (cmsFloat64Number*) accum; @@ -775,11 +775,11 @@ cmsUInt8Number* UnrollLabDoubleTo16(register _cmsTRANSFORM* info, // This is a conversion of XYZ double to 16 bits static -cmsUInt8Number* UnrollXYZDoubleTo16(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollXYZDoubleTo16(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) -{ +{ if (T_PLANAR(info -> InputFormat)) { cmsFloat64Number* Pt = (cmsFloat64Number*) accum; @@ -807,18 +807,18 @@ cmsINLINE cmsBool IsInkSpace(cmsUInt32Number Type) { switch (T_COLORSPACE(Type)) { - case PT_CMY: - case PT_CMYK: - case PT_MCH5: + case PT_CMY: + case PT_CMYK: + case PT_MCH5: case PT_MCH6: - case PT_MCH7: - case PT_MCH8: - case PT_MCH9: - case PT_MCH10: - case PT_MCH11: - case PT_MCH12: - case PT_MCH13: - case PT_MCH14: + case PT_MCH7: + case PT_MCH8: + case PT_MCH9: + case PT_MCH10: + case PT_MCH11: + case PT_MCH12: + case PT_MCH13: + case PT_MCH14: case PT_MCH15: return TRUE; default: return FALSE; @@ -827,8 +827,8 @@ cmsINLINE cmsBool IsInkSpace(cmsUInt32Number Type) // Inks does come in percentage, remaining cases are between 0..1.0, again to 16 bits static -cmsUInt8Number* UnrollDoubleTo16(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollDoubleTo16(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -857,8 +857,8 @@ cmsUInt8Number* UnrollDoubleTo16(register _cmsTRANSFORM* info, } static -cmsUInt8Number* UnrollFloatTo16(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollFloatTo16(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -889,8 +889,8 @@ cmsUInt8Number* UnrollFloatTo16(register _cmsTRANSFORM* info, // For 1 channel, we need to duplicate data (it comes in 0..1.0 range) static -cmsUInt8Number* UnrollDouble1Chan(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollDouble1Chan(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) { @@ -898,7 +898,7 @@ cmsUInt8Number* UnrollDouble1Chan(register _cmsTRANSFORM* info, wIn[0] = wIn[1] = wIn[2] = _cmsQuickSaturateWord(Inks[0] * 65535.0); - return accum + sizeof(cmsFloat64Number); + return accum + sizeof(cmsFloat64Number); cmsUNUSED_PARAMETER(info); cmsUNUSED_PARAMETER(Stride); @@ -906,12 +906,12 @@ cmsUInt8Number* UnrollDouble1Chan(register _cmsTRANSFORM* info, //------------------------------------------------------------------------------------------------------------------- -// True float transformation. +// True float transformation. -// For anything going from cmsFloat32Number +// For anything going from cmsFloat32Number static -cmsUInt8Number* UnrollFloatsToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollFloatsToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) { @@ -927,7 +927,7 @@ cmsUInt8Number* UnrollFloatsToFloat(_cmsTRANSFORM* info, if (Planar) wIn[i] = (cmsFloat32Number) (Inks[i * Stride] / maximum); else - wIn[i] = (cmsFloat32Number) (Inks[i] / maximum); + wIn[i] = (cmsFloat32Number) (Inks[i] / maximum); } if (T_PLANAR(info -> InputFormat)) @@ -938,8 +938,8 @@ cmsUInt8Number* UnrollFloatsToFloat(_cmsTRANSFORM* info, // For anything going from double static -cmsUInt8Number* UnrollDoublesToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollDoublesToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) { @@ -954,7 +954,7 @@ cmsUInt8Number* UnrollDoublesToFloat(_cmsTRANSFORM* info, if (Planar) wIn[i] = (cmsFloat32Number) (Inks[i * Stride] / maximum); else - wIn[i] = (cmsFloat32Number) (Inks[i] / maximum); + wIn[i] = (cmsFloat32Number) (Inks[i] / maximum); } if (T_PLANAR(info -> InputFormat)) @@ -968,16 +968,16 @@ cmsUInt8Number* UnrollDoublesToFloat(_cmsTRANSFORM* info, // From Lab double to cmsFloat32Number static -cmsUInt8Number* UnrollLabDoubleToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollLabDoubleToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) -{ +{ cmsFloat64Number* Pt = (cmsFloat64Number*) accum; if (T_PLANAR(info -> InputFormat)) { - wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 + wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 wIn[1] = (cmsFloat32Number) ((Pt[Stride] + 128) / 255.0); // form -128..+127 to 0..1 wIn[2] = (cmsFloat32Number) ((Pt[Stride*2] + 128) / 255.0); @@ -985,7 +985,7 @@ cmsUInt8Number* UnrollLabDoubleToFloat(_cmsTRANSFORM* info, } else { - wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 + wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 wIn[1] = (cmsFloat32Number) ((Pt[1] + 128) / 255.0); // form -128..+127 to 0..1 wIn[2] = (cmsFloat32Number) ((Pt[2] + 128) / 255.0); @@ -996,16 +996,16 @@ cmsUInt8Number* UnrollLabDoubleToFloat(_cmsTRANSFORM* info, // From Lab double to cmsFloat32Number static -cmsUInt8Number* UnrollLabFloatToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollLabFloatToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) -{ +{ cmsFloat32Number* Pt = (cmsFloat32Number*) accum; if (T_PLANAR(info -> InputFormat)) { - wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 + wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 wIn[1] = (cmsFloat32Number) ((Pt[Stride] + 128) / 255.0); // form -128..+127 to 0..1 wIn[2] = (cmsFloat32Number) ((Pt[Stride*2] + 128) / 255.0); @@ -1013,7 +1013,7 @@ cmsUInt8Number* UnrollLabFloatToFloat(_cmsTRANSFORM* info, } else { - wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 + wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1 wIn[1] = (cmsFloat32Number) ((Pt[1] + 128) / 255.0); // form -128..+127 to 0..1 wIn[2] = (cmsFloat32Number) ((Pt[2] + 128) / 255.0); @@ -1026,25 +1026,25 @@ cmsUInt8Number* UnrollLabFloatToFloat(_cmsTRANSFORM* info, // 1.15 fixed point, that means maximum value is MAX_ENCODEABLE_XYZ (0xFFFF) static -cmsUInt8Number* UnrollXYZDoubleToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollXYZDoubleToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) -{ +{ cmsFloat64Number* Pt = (cmsFloat64Number*) accum; if (T_PLANAR(info -> InputFormat)) { - wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); - wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ); + wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); + wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ); wIn[2] = (cmsFloat32Number) (Pt[Stride*2] / MAX_ENCODEABLE_XYZ); return accum + sizeof(cmsFloat64Number); } else { - wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); - wIn[1] = (cmsFloat32Number) (Pt[1] / MAX_ENCODEABLE_XYZ); + wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); + wIn[1] = (cmsFloat32Number) (Pt[1] / MAX_ENCODEABLE_XYZ); wIn[2] = (cmsFloat32Number) (Pt[2] / MAX_ENCODEABLE_XYZ); accum += sizeof(cmsFloat64Number)*(3 + T_EXTRA(info ->InputFormat)); @@ -1053,25 +1053,25 @@ cmsUInt8Number* UnrollXYZDoubleToFloat(_cmsTRANSFORM* info, } static -cmsUInt8Number* UnrollXYZFloatToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollXYZFloatToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) -{ +{ cmsFloat32Number* Pt = (cmsFloat32Number*) accum; if (T_PLANAR(info -> InputFormat)) { - wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); - wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ); + wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); + wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ); wIn[2] = (cmsFloat32Number) (Pt[Stride*2] / MAX_ENCODEABLE_XYZ); return accum + sizeof(cmsFloat32Number); } else { - wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); - wIn[1] = (cmsFloat32Number) (Pt[1] / MAX_ENCODEABLE_XYZ); + wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ); + wIn[1] = (cmsFloat32Number) (Pt[1] / MAX_ENCODEABLE_XYZ); wIn[2] = (cmsFloat32Number) (Pt[2] / MAX_ENCODEABLE_XYZ); accum += sizeof(cmsFloat32Number)*(3 + T_EXTRA(info ->InputFormat)); @@ -1087,8 +1087,8 @@ cmsUInt8Number* UnrollXYZFloatToFloat(_cmsTRANSFORM* info, // Generic chunky for byte static -cmsUInt8Number* PackAnyBytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackAnyBytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1139,8 +1139,8 @@ cmsUInt8Number* PackAnyBytes(register _cmsTRANSFORM* info, static -cmsUInt8Number* PackAnyWords(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackAnyWords(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1196,8 +1196,8 @@ cmsUInt8Number* PackAnyWords(register _cmsTRANSFORM* info, static -cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1230,8 +1230,8 @@ cmsUInt8Number* PackPlanarBytes(register _cmsTRANSFORM* info, static -cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1256,7 +1256,7 @@ cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info, if (SwapEndian) v = CHANGE_ENDIAN(v); - if (Reverse) + if (Reverse) v = REVERSE_FLAVOR_16(v); *(cmsUInt16Number*) output = v; @@ -1269,8 +1269,8 @@ cmsUInt8Number* PackPlanarWords(register _cmsTRANSFORM* info, // CMYKcm (unrolled for speed) static -cmsUInt8Number* Pack6Bytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack6Bytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1290,8 +1290,8 @@ cmsUInt8Number* Pack6Bytes(register _cmsTRANSFORM* info, // KCMYcm static -cmsUInt8Number* Pack6BytesSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack6BytesSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1310,8 +1310,8 @@ cmsUInt8Number* Pack6BytesSwap(register _cmsTRANSFORM* info, // CMYKcm static -cmsUInt8Number* Pack6Words(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack6Words(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1336,8 +1336,8 @@ cmsUInt8Number* Pack6Words(register _cmsTRANSFORM* info, // KCMYcm static -cmsUInt8Number* Pack6WordsSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack6WordsSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1362,8 +1362,8 @@ cmsUInt8Number* Pack6WordsSwap(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack4Bytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4Bytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1379,8 +1379,8 @@ cmsUInt8Number* Pack4Bytes(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack4BytesReverse(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4BytesReverse(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1397,8 +1397,8 @@ cmsUInt8Number* Pack4BytesReverse(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack4BytesSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4BytesSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1415,8 +1415,8 @@ cmsUInt8Number* Pack4BytesSwapFirst(register _cmsTRANSFORM* info, // ABGR static -cmsUInt8Number* Pack4BytesSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4BytesSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1432,8 +1432,8 @@ cmsUInt8Number* Pack4BytesSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack4BytesSwapSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4BytesSwapSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1449,8 +1449,8 @@ cmsUInt8Number* Pack4BytesSwapSwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack4Words(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4Words(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1470,8 +1470,8 @@ cmsUInt8Number* Pack4Words(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack4WordsReverse(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4WordsReverse(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1492,8 +1492,8 @@ cmsUInt8Number* Pack4WordsReverse(register _cmsTRANSFORM* info, // ABGR static -cmsUInt8Number* Pack4WordsSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4WordsSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1514,8 +1514,8 @@ cmsUInt8Number* Pack4WordsSwap(register _cmsTRANSFORM* info, // CMYK static -cmsUInt8Number* Pack4WordsBigEndian(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack4WordsBigEndian(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1536,8 +1536,8 @@ cmsUInt8Number* Pack4WordsBigEndian(register _cmsTRANSFORM* info, static -cmsUInt8Number* PackLabV2_8(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackLabV2_8(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1552,8 +1552,8 @@ cmsUInt8Number* PackLabV2_8(register _cmsTRANSFORM* info, } static -cmsUInt8Number* PackALabV2_8(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackALabV2_8(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1569,8 +1569,8 @@ cmsUInt8Number* PackALabV2_8(register _cmsTRANSFORM* info, } static -cmsUInt8Number* PackLabV2_16(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackLabV2_16(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1588,8 +1588,8 @@ cmsUInt8Number* PackLabV2_16(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3Bytes(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3Bytes(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1604,8 +1604,8 @@ cmsUInt8Number* Pack3Bytes(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesOptimized(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesOptimized(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1620,8 +1620,8 @@ cmsUInt8Number* Pack3BytesOptimized(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1636,8 +1636,8 @@ cmsUInt8Number* Pack3BytesSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesSwapOptimized(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesSwapOptimized(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1653,8 +1653,8 @@ cmsUInt8Number* Pack3BytesSwapOptimized(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack3Words(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3Words(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1672,8 +1672,8 @@ cmsUInt8Number* Pack3Words(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3WordsSwap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3WordsSwap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1691,8 +1691,8 @@ cmsUInt8Number* Pack3WordsSwap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3WordsBigEndian(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3WordsBigEndian(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1710,8 +1710,8 @@ cmsUInt8Number* Pack3WordsBigEndian(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesAndSkip1(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1727,8 +1727,8 @@ cmsUInt8Number* Pack3BytesAndSkip1(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesAndSkip1Optimized(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1Optimized(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1745,8 +1745,8 @@ cmsUInt8Number* Pack3BytesAndSkip1Optimized(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack3BytesAndSkip1SwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1SwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1762,8 +1762,8 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesAndSkip1SwapFirstOptimized(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1SwapFirstOptimized(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1779,8 +1779,8 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapFirstOptimized(register _cmsTRANSFORM* inf } static -cmsUInt8Number* Pack3BytesAndSkip1Swap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1Swap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1796,8 +1796,8 @@ cmsUInt8Number* Pack3BytesAndSkip1Swap(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesAndSkip1SwapOptimized(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1SwapOptimized(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1814,11 +1814,11 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapOptimized(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) -{ +{ *output++ = FROM_16_TO_8(wOut[2]); *output++ = FROM_16_TO_8(wOut[1]); *output++ = FROM_16_TO_8(wOut[0]); @@ -1831,11 +1831,11 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirstOptimized(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirstOptimized(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) -{ +{ *output++ = (wOut[2] & 0xFF); *output++ = (wOut[1] & 0xFF); *output++ = (wOut[0] & 0xFF); @@ -1848,8 +1848,8 @@ cmsUInt8Number* Pack3BytesAndSkip1SwapSwapFirstOptimized(register _cmsTRANSFORM* } static -cmsUInt8Number* Pack3WordsAndSkip1(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3WordsAndSkip1(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1868,8 +1868,8 @@ cmsUInt8Number* Pack3WordsAndSkip1(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack3WordsAndSkip1Swap(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3WordsAndSkip1Swap(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1889,11 +1889,11 @@ cmsUInt8Number* Pack3WordsAndSkip1Swap(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack3WordsAndSkip1SwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3WordsAndSkip1SwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) -{ +{ output+= 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; @@ -1910,11 +1910,11 @@ cmsUInt8Number* Pack3WordsAndSkip1SwapFirst(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack3WordsAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack3WordsAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) -{ +{ *(cmsUInt16Number*) output = wOut[2]; output+= 2; *(cmsUInt16Number*) output = wOut[1]; @@ -1932,8 +1932,8 @@ cmsUInt8Number* Pack3WordsAndSkip1SwapSwapFirst(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack1Byte(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1Byte(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1947,8 +1947,8 @@ cmsUInt8Number* Pack1Byte(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack1ByteReversed(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1ByteReversed(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1962,8 +1962,8 @@ cmsUInt8Number* Pack1ByteReversed(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack1ByteSkip1(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1ByteSkip1(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1978,8 +1978,8 @@ cmsUInt8Number* Pack1ByteSkip1(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack1ByteSkip1SwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1ByteSkip1SwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -1993,8 +1993,8 @@ cmsUInt8Number* Pack1ByteSkip1SwapFirst(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack1Word(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1Word(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2009,8 +2009,8 @@ cmsUInt8Number* Pack1Word(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack1WordReversed(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1WordReversed(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2024,8 +2024,8 @@ cmsUInt8Number* Pack1WordReversed(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack1WordBigEndian(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1WordBigEndian(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2040,8 +2040,8 @@ cmsUInt8Number* Pack1WordBigEndian(register _cmsTRANSFORM* info, static -cmsUInt8Number* Pack1WordSkip1(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1WordSkip1(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2055,12 +2055,12 @@ cmsUInt8Number* Pack1WordSkip1(register _cmsTRANSFORM* info, } static -cmsUInt8Number* Pack1WordSkip1SwapFirst(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], +cmsUInt8Number* Pack1WordSkip1SwapFirst(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { - output += 2; + output += 2; *(cmsUInt16Number*) output = wOut[0]; output+= 2; @@ -2073,9 +2073,9 @@ cmsUInt8Number* Pack1WordSkip1SwapFirst(register _cmsTRANSFORM* info, // Unencoded Float values -- don't try optimize speed static -cmsUInt8Number* PackLabDoubleFrom16(register _cmsTRANSFORM* info, - register cmsUInt16Number wOut[], - register cmsUInt8Number* output, +cmsUInt8Number* PackLabDoubleFrom16(register _cmsTRANSFORM* info, + register cmsUInt16Number wOut[], + register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2094,14 +2094,14 @@ cmsUInt8Number* PackLabDoubleFrom16(register _cmsTRANSFORM* info, else { cmsLabEncoded2Float((cmsCIELab*) output, wOut); - return output + (sizeof(cmsCIELab) + T_EXTRA(info ->OutputFormat) * sizeof(cmsFloat64Number)); + return output + (sizeof(cmsCIELab) + T_EXTRA(info ->OutputFormat) * sizeof(cmsFloat64Number)); } } static -cmsUInt8Number* PackXYZDoubleFrom16(register _cmsTRANSFORM* Info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackXYZDoubleFrom16(register _cmsTRANSFORM* Info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2127,8 +2127,8 @@ cmsUInt8Number* PackXYZDoubleFrom16(register _cmsTRANSFORM* Info, } static -cmsUInt8Number* PackDoubleFrom16(register _cmsTRANSFORM* Info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackDoubleFrom16(register _cmsTRANSFORM* Info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2145,7 +2145,7 @@ cmsUInt8Number* PackDoubleFrom16(register _cmsTRANSFORM* Info, } return output + sizeof(cmsFloat64Number); - } + } else { for (i=0; i < nChan; i++) { @@ -2160,8 +2160,8 @@ cmsUInt8Number* PackDoubleFrom16(register _cmsTRANSFORM* Info, } static -cmsUInt8Number* PackFloatFrom16(register _cmsTRANSFORM* Info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackFloatFrom16(register _cmsTRANSFORM* Info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2178,7 +2178,7 @@ cmsUInt8Number* PackFloatFrom16(register _cmsTRANSFORM* Info, } return output + sizeof(cmsFloat32Number); - } + } else { for (i=0; i < nChan; i++) { @@ -2196,8 +2196,8 @@ cmsUInt8Number* PackFloatFrom16(register _cmsTRANSFORM* Info, // -------------------------------------------------------------------------------------------------------- static -cmsUInt8Number* PackChunkyFloatsFromFloat(_cmsTRANSFORM* info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackChunkyFloatsFromFloat(_cmsTRANSFORM* info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) { @@ -2250,8 +2250,8 @@ cmsUInt8Number* PackChunkyFloatsFromFloat(_cmsTRANSFORM* info, static -cmsUInt8Number* PackPlanarFloatsFromFloat(_cmsTRANSFORM* info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackPlanarFloatsFromFloat(_cmsTRANSFORM* info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) { @@ -2273,7 +2273,7 @@ cmsUInt8Number* PackPlanarFloatsFromFloat(_cmsTRANSFORM* info, v = wOut[index] * maximum; - if (Reverse) + if (Reverse) v = maximum - v; *(cmsFloat32Number*) output = (cmsFloat32Number) v; @@ -2286,8 +2286,8 @@ cmsUInt8Number* PackPlanarFloatsFromFloat(_cmsTRANSFORM* info, static -cmsUInt8Number* PackChunkyDoublesFromFloat(_cmsTRANSFORM* info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackChunkyDoublesFromFloat(_cmsTRANSFORM* info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) { @@ -2339,8 +2339,8 @@ cmsUInt8Number* PackChunkyDoublesFromFloat(_cmsTRANSFORM* info, } static -cmsUInt8Number* PackPlanarDoublesFromFloat(_cmsTRANSFORM* info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackPlanarDoublesFromFloat(_cmsTRANSFORM* info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) { @@ -2362,7 +2362,7 @@ cmsUInt8Number* PackPlanarDoublesFromFloat(_cmsTRANSFORM* info, v = (cmsFloat64Number) wOut[index] * maximum; - if (Reverse) + if (Reverse) v = maximum - v; *(cmsFloat64Number*) output = v; @@ -2376,11 +2376,11 @@ cmsUInt8Number* PackPlanarDoublesFromFloat(_cmsTRANSFORM* info, static -cmsUInt8Number* PackLabFloatFromFloat(_cmsTRANSFORM* Info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackLabFloatFromFloat(_cmsTRANSFORM* Info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) -{ +{ cmsFloat32Number* Out = (cmsFloat32Number*) output; if (T_PLANAR(Info -> OutputFormat)) { @@ -2397,18 +2397,18 @@ cmsUInt8Number* PackLabFloatFromFloat(_cmsTRANSFORM* Info, Out[1] = (cmsFloat32Number) (wOut[1] * 255.0 - 128.0); Out[2] = (cmsFloat32Number) (wOut[2] * 255.0 - 128.0); - return output + (sizeof(cmsFloat32Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat32Number)); + return output + (sizeof(cmsFloat32Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat32Number)); } } static -cmsUInt8Number* PackLabDoubleFromFloat(_cmsTRANSFORM* Info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackLabDoubleFromFloat(_cmsTRANSFORM* Info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) -{ +{ cmsFloat64Number* Out = (cmsFloat64Number*) output; if (T_PLANAR(Info -> OutputFormat)) { @@ -2425,7 +2425,7 @@ cmsUInt8Number* PackLabDoubleFromFloat(_cmsTRANSFORM* Info, Out[1] = (cmsFloat64Number) (wOut[1] * 255.0 - 128.0); Out[2] = (cmsFloat64Number) (wOut[2] * 255.0 - 128.0); - return output + (sizeof(cmsFloat64Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat64Number)); + return output + (sizeof(cmsFloat64Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat64Number)); } } @@ -2433,11 +2433,11 @@ cmsUInt8Number* PackLabDoubleFromFloat(_cmsTRANSFORM* Info, // From 0..1 range to 0..MAX_ENCODEABLE_XYZ static -cmsUInt8Number* PackXYZFloatFromFloat(_cmsTRANSFORM* Info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackXYZFloatFromFloat(_cmsTRANSFORM* Info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) -{ +{ cmsFloat32Number* Out = (cmsFloat32Number*) output; if (T_PLANAR(Info -> OutputFormat)) { @@ -2454,18 +2454,18 @@ cmsUInt8Number* PackXYZFloatFromFloat(_cmsTRANSFORM* Info, Out[1] = (cmsFloat32Number) (wOut[1] * MAX_ENCODEABLE_XYZ); Out[2] = (cmsFloat32Number) (wOut[2] * MAX_ENCODEABLE_XYZ); - return output + (sizeof(cmsFloat32Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat32Number)); + return output + (sizeof(cmsFloat32Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat32Number)); } } // Same, but convert to double static -cmsUInt8Number* PackXYZDoubleFromFloat(_cmsTRANSFORM* Info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackXYZDoubleFromFloat(_cmsTRANSFORM* Info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) -{ +{ cmsFloat64Number* Out = (cmsFloat64Number*) output; if (T_PLANAR(Info -> OutputFormat)) { @@ -2482,7 +2482,7 @@ cmsUInt8Number* PackXYZDoubleFromFloat(_cmsTRANSFORM* Info, Out[1] = (cmsFloat64Number) (wOut[1] * MAX_ENCODEABLE_XYZ); Out[2] = (cmsFloat64Number) (wOut[2] * MAX_ENCODEABLE_XYZ); - return output + (sizeof(cmsFloat64Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat64Number)); + return output + (sizeof(cmsFloat64Number)*3 + T_EXTRA(Info ->OutputFormat) * sizeof(cmsFloat64Number)); } } @@ -2493,11 +2493,11 @@ cmsUInt8Number* PackXYZDoubleFromFloat(_cmsTRANSFORM* Info, // Decodes an stream of half floats to wIn[] described by input format static -cmsUInt8Number* UnrollHalfTo16(register _cmsTRANSFORM* info, - register cmsUInt16Number wIn[], +cmsUInt8Number* UnrollHalfTo16(register _cmsTRANSFORM* info, + register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride) -{ +{ cmsUInt16Number* Inks = (cmsUInt16Number*) accum; int nChan = T_CHANNELS(info -> InputFormat); int Planar = T_PLANAR(info -> InputFormat); @@ -2527,14 +2527,14 @@ cmsUInt8Number* UnrollHalfTo16(register _cmsTRANSFORM* info, // Decodes an stream of half floats to wIn[] described by input format static -cmsUInt8Number* UnrollHalfToFloat(_cmsTRANSFORM* info, - cmsFloat32Number wIn[], +cmsUInt8Number* UnrollHalfToFloat(_cmsTRANSFORM* info, + cmsFloat32Number wIn[], cmsUInt8Number* accum, cmsUInt32Number Stride) { cmsUInt16Number* Inks = (cmsUInt16Number*) accum; int nChan = T_CHANNELS(info -> InputFormat); - int Reverse = T_FLAVOR(info -> InputFormat); + int Reverse = T_FLAVOR(info -> InputFormat); cmsFloat32Number v; int Planar = T_PLANAR(info -> InputFormat); int i; @@ -2545,7 +2545,7 @@ cmsUInt8Number* UnrollHalfToFloat(_cmsTRANSFORM* info, if (Planar) v = (cmsFloat32Number) (_cmsHalf2Float(Inks[i * Stride]) / maximum); else - v = (cmsFloat32Number) (_cmsHalf2Float(Inks[i]) / maximum); + v = (cmsFloat32Number) (_cmsHalf2Float(Inks[i]) / maximum); if (Reverse) v = maximum - v; @@ -2560,8 +2560,8 @@ cmsUInt8Number* UnrollHalfToFloat(_cmsTRANSFORM* info, } static -cmsUInt8Number* PackHalfFrom16(register _cmsTRANSFORM* Info, - register cmsUInt16Number wOut[], +cmsUInt8Number* PackHalfFrom16(register _cmsTRANSFORM* Info, + register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride) { @@ -2580,7 +2580,7 @@ cmsUInt8Number* PackHalfFrom16(register _cmsTRANSFORM* Info, } return output + sizeof(cmsUInt16Number); - } + } else { for (i=0; i < nChan; i++) { @@ -2595,8 +2595,8 @@ cmsUInt8Number* PackHalfFrom16(register _cmsTRANSFORM* Info, } static -cmsUInt8Number* PackHalfFromFloat(_cmsTRANSFORM* info, - cmsFloat32Number wOut[], +cmsUInt8Number* PackHalfFromFloat(_cmsTRANSFORM* info, + cmsFloat32Number wOut[], cmsUInt8Number* output, cmsUInt32Number Stride) { @@ -2604,7 +2604,7 @@ cmsUInt8Number* PackHalfFromFloat(_cmsTRANSFORM* info, cmsFloat32Number maximum = IsInkSpace(info ->OutputFormat) ? 100.0F : 1.0F; int nChan = T_CHANNELS(info -> OutputFormat); int i; - + if (T_PLANAR(info -> OutputFormat)) { @@ -2614,7 +2614,7 @@ cmsUInt8Number* PackHalfFromFloat(_cmsTRANSFORM* info, } return output + sizeof(cmsUInt16Number); - } + } else { for (i=0; i < nChan; i++) { @@ -2643,12 +2643,12 @@ static cmsFormatters16 InputFormatters16[] = { { FLOAT_SH(1)|BYTES_SH(2), ANYCHANNELS|ANYPLANAR|ANYEXTRA|ANYSPACE, UnrollHalfTo16}, - { CHANNELS_SH(1)|BYTES_SH(1), ANYSPACE, Unroll1Byte}, + { CHANNELS_SH(1)|BYTES_SH(1), ANYSPACE, Unroll1Byte}, { CHANNELS_SH(1)|BYTES_SH(1)|EXTRA_SH(1), ANYSPACE, Unroll1ByteSkip1}, { CHANNELS_SH(1)|BYTES_SH(1)|EXTRA_SH(2), ANYSPACE, Unroll1ByteSkip2}, { CHANNELS_SH(1)|BYTES_SH(1)|FLAVOR_SH(1), ANYSPACE, Unroll1ByteReversed}, { COLORSPACE_SH(PT_MCH2)|CHANNELS_SH(2)|BYTES_SH(1), 0, Unroll2Bytes}, - + { TYPE_LabV2_8, 0, UnrollLabV2_8 }, { TYPE_ALabV2_8, 0, UnrollALabV2_8 }, { TYPE_LabV2_16, 0, UnrollLabV2_16 }, @@ -2660,12 +2660,12 @@ static cmsFormatters16 InputFormatters16[] = { { CHANNELS_SH(4)|BYTES_SH(1), ANYSPACE, Unroll4Bytes}, { CHANNELS_SH(4)|BYTES_SH(1)|FLAVOR_SH(1), ANYSPACE, Unroll4BytesReverse}, - { CHANNELS_SH(4)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4BytesSwapFirst}, - { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Unroll4BytesSwap}, - { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4BytesSwapSwapFirst}, + { CHANNELS_SH(4)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4BytesSwapFirst}, + { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Unroll4BytesSwap}, + { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4BytesSwapSwapFirst}, { BYTES_SH(1)|PLANAR_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollPlanarBytes}, - { BYTES_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollChunkyBytes}, + { BYTES_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollChunkyBytes}, { CHANNELS_SH(1)|BYTES_SH(2), ANYSPACE, Unroll1Word}, @@ -2680,13 +2680,13 @@ static cmsFormatters16 InputFormatters16[] = { { CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll3WordsSkip1SwapFirst}, { CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)|DOSWAP_SH(1), ANYSPACE, Unroll3WordsSkip1Swap}, { CHANNELS_SH(4)|BYTES_SH(2)|FLAVOR_SH(1), ANYSPACE, Unroll4WordsReverse}, - { CHANNELS_SH(4)|BYTES_SH(2)|SWAPFIRST_SH(1), ANYSPACE, Unroll4WordsSwapFirst}, - { CHANNELS_SH(4)|BYTES_SH(2)|DOSWAP_SH(1), ANYSPACE, Unroll4WordsSwap}, - { CHANNELS_SH(4)|BYTES_SH(2)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4WordsSwapSwapFirst}, + { CHANNELS_SH(4)|BYTES_SH(2)|SWAPFIRST_SH(1), ANYSPACE, Unroll4WordsSwapFirst}, + { CHANNELS_SH(4)|BYTES_SH(2)|DOSWAP_SH(1), ANYSPACE, Unroll4WordsSwap}, + { CHANNELS_SH(4)|BYTES_SH(2)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll4WordsSwapSwapFirst}, { BYTES_SH(2)|PLANAR_SH(1), ANYFLAVOR|ANYSWAP|ANYENDIAN|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollPlanarWords}, - { BYTES_SH(2), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYENDIAN|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollAnyWords}, + { BYTES_SH(2), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYENDIAN|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollAnyWords}, }; @@ -2697,10 +2697,10 @@ static cmsFormattersFloat InputFormattersFloat[] = { // ---------------------------- ------------------------------------ ---------------------------- { TYPE_Lab_DBL, ANYPLANAR|ANYEXTRA, UnrollLabDoubleToFloat}, { TYPE_Lab_FLT, ANYPLANAR|ANYEXTRA, UnrollLabFloatToFloat}, - + { TYPE_XYZ_DBL, ANYPLANAR|ANYEXTRA, UnrollXYZDoubleToFloat}, { TYPE_XYZ_FLT, ANYPLANAR|ANYEXTRA, UnrollXYZFloatToFloat}, - + { FLOAT_SH(1)|BYTES_SH(4), ANYPLANAR|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollFloatsToFloat}, { FLOAT_SH(1)|BYTES_SH(0), ANYPLANAR|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollDoublesToFloat}, { FLOAT_SH(1)|BYTES_SH(2), ANYPLANAR|ANYEXTRA|ANYCHANNELS|ANYSPACE, UnrollHalfToFloat} @@ -2741,9 +2741,9 @@ cmsFormatter _cmsGetStockInputFormatter(cmsUInt32Number dwInput, cmsUInt32Number break; default:; - + } - + fr.Fmt16 = NULL; return fr; } @@ -2758,7 +2758,7 @@ static cmsFormatters16 OutputFormatters16[] = { { FLOAT_SH(1)|BYTES_SH(4), ANYCHANNELS|ANYPLANAR|ANYEXTRA|ANYSPACE, PackFloatFrom16}, { FLOAT_SH(1)|BYTES_SH(2), ANYCHANNELS|ANYPLANAR|ANYEXTRA|ANYSPACE, PackHalfFrom16}, - { CHANNELS_SH(1)|BYTES_SH(1), ANYSPACE, Pack1Byte}, + { CHANNELS_SH(1)|BYTES_SH(1), ANYSPACE, Pack1Byte}, { CHANNELS_SH(1)|BYTES_SH(1)|EXTRA_SH(1), ANYSPACE, Pack1ByteSkip1}, { CHANNELS_SH(1)|BYTES_SH(1)|EXTRA_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack1ByteSkip1SwapFirst}, @@ -2772,9 +2772,9 @@ static cmsFormatters16 OutputFormatters16[] = { { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|OPTIMIZED_SH(1), ANYSPACE, Pack3BytesAndSkip1Optimized}, { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|SWAPFIRST_SH(1)|OPTIMIZED_SH(1), ANYSPACE, Pack3BytesAndSkip1SwapFirstOptimized}, - { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1)|OPTIMIZED_SH(1), + { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1)|OPTIMIZED_SH(1), ANYSPACE, Pack3BytesAndSkip1SwapSwapFirstOptimized}, - { CHANNELS_SH(3)|BYTES_SH(1)|DOSWAP_SH(1)|EXTRA_SH(1)|OPTIMIZED_SH(1), + { CHANNELS_SH(3)|BYTES_SH(1)|DOSWAP_SH(1)|EXTRA_SH(1)|OPTIMIZED_SH(1), ANYSPACE, Pack3BytesAndSkip1SwapOptimized}, { CHANNELS_SH(3)|BYTES_SH(1)|DOSWAP_SH(1)|OPTIMIZED_SH(1), ANYSPACE, Pack3BytesSwapOptimized}, @@ -2783,7 +2783,7 @@ static cmsFormatters16 OutputFormatters16[] = { { CHANNELS_SH(3)|BYTES_SH(1), ANYSPACE, Pack3Bytes}, { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1), ANYSPACE, Pack3BytesAndSkip1}, { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack3BytesAndSkip1SwapFirst}, - { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), + { CHANNELS_SH(3)|BYTES_SH(1)|EXTRA_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack3BytesAndSkip1SwapSwapFirst}, { CHANNELS_SH(3)|BYTES_SH(1)|DOSWAP_SH(1)|EXTRA_SH(1), ANYSPACE, Pack3BytesAndSkip1Swap}, { CHANNELS_SH(3)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Pack3BytesSwap}, @@ -2791,12 +2791,12 @@ static cmsFormatters16 OutputFormatters16[] = { { CHANNELS_SH(6)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Pack6BytesSwap}, { CHANNELS_SH(4)|BYTES_SH(1), ANYSPACE, Pack4Bytes}, { CHANNELS_SH(4)|BYTES_SH(1)|FLAVOR_SH(1), ANYSPACE, Pack4BytesReverse}, - { CHANNELS_SH(4)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack4BytesSwapFirst}, - { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Pack4BytesSwap}, - { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack4BytesSwapSwapFirst}, + { CHANNELS_SH(4)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack4BytesSwapFirst}, + { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Pack4BytesSwap}, + { CHANNELS_SH(4)|BYTES_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack4BytesSwapSwapFirst}, - { BYTES_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackAnyBytes}, - { BYTES_SH(1)|PLANAR_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackPlanarBytes}, + { BYTES_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackAnyBytes}, + { BYTES_SH(1)|PLANAR_SH(1), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackPlanarBytes}, { CHANNELS_SH(1)|BYTES_SH(2), ANYSPACE, Pack1Word}, { CHANNELS_SH(1)|BYTES_SH(2)|EXTRA_SH(1), ANYSPACE, Pack1WordSkip1}, @@ -2810,18 +2810,18 @@ static cmsFormatters16 OutputFormatters16[] = { { CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)|DOSWAP_SH(1), ANYSPACE, Pack3WordsAndSkip1Swap}, { CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack3WordsAndSkip1SwapFirst}, - { CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), + { CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Pack3WordsAndSkip1SwapSwapFirst}, { CHANNELS_SH(4)|BYTES_SH(2), ANYSPACE, Pack4Words}, { CHANNELS_SH(4)|BYTES_SH(2)|FLAVOR_SH(1), ANYSPACE, Pack4WordsReverse}, - { CHANNELS_SH(4)|BYTES_SH(2)|DOSWAP_SH(1), ANYSPACE, Pack4WordsSwap}, + { CHANNELS_SH(4)|BYTES_SH(2)|DOSWAP_SH(1), ANYSPACE, Pack4WordsSwap}, { CHANNELS_SH(4)|BYTES_SH(2)|ENDIAN16_SH(1), ANYSPACE, Pack4WordsBigEndian}, { CHANNELS_SH(6)|BYTES_SH(2), ANYSPACE, Pack6Words}, { CHANNELS_SH(6)|BYTES_SH(2)|DOSWAP_SH(1), ANYSPACE, Pack6WordsSwap}, - { BYTES_SH(2)|PLANAR_SH(1), ANYFLAVOR|ANYENDIAN|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackPlanarWords}, + { BYTES_SH(2)|PLANAR_SH(1), ANYFLAVOR|ANYENDIAN|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackPlanarWords}, { BYTES_SH(2), ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYENDIAN|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackAnyWords} }; @@ -2832,22 +2832,22 @@ static cmsFormattersFloat OutputFormattersFloat[] = { // ---------------------------- --------------------------------------------------- ---------------------------- { TYPE_Lab_FLT, ANYPLANAR|ANYEXTRA, PackLabFloatFromFloat}, { TYPE_XYZ_FLT, ANYPLANAR|ANYEXTRA, PackXYZFloatFromFloat}, - + { TYPE_Lab_DBL, ANYPLANAR|ANYEXTRA, PackLabDoubleFromFloat}, { TYPE_XYZ_DBL, ANYPLANAR|ANYEXTRA, PackXYZDoubleFromFloat}, - - { FLOAT_SH(1)|BYTES_SH(4), - ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackChunkyFloatsFromFloat }, + + { FLOAT_SH(1)|BYTES_SH(4), + ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackChunkyFloatsFromFloat }, { FLOAT_SH(1)|BYTES_SH(4)|PLANAR_SH(1), ANYEXTRA|ANYCHANNELS|ANYSPACE, PackPlanarFloatsFromFloat}, { FLOAT_SH(1)|BYTES_SH(0), - ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackChunkyDoublesFromFloat }, + ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackChunkyDoublesFromFloat }, { FLOAT_SH(1)|BYTES_SH(0)|PLANAR_SH(1), ANYEXTRA|ANYCHANNELS|ANYSPACE, PackPlanarDoublesFromFloat}, - + { FLOAT_SH(1)|BYTES_SH(2), - ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackHalfFromFloat }, - + ANYFLAVOR|ANYSWAPFIRST|ANYSWAP|ANYEXTRA|ANYCHANNELS|ANYSPACE, PackHalfFromFloat }, + + - }; @@ -2859,7 +2859,7 @@ cmsFormatter _cmsGetStockOutputFormatter(cmsUInt32Number dwInput, cmsUInt32Numbe cmsFormatter fr; - switch (dwFlags) + switch (dwFlags) { case CMS_PACK_FLAGS_16BITS: { @@ -2889,7 +2889,7 @@ cmsFormatter _cmsGetStockOutputFormatter(cmsUInt32Number dwInput, cmsUInt32Numbe break; default:; - + } fr.Fmt16 = NULL; @@ -2919,7 +2919,7 @@ cmsBool _cmsRegisterFormattersPlugin(cmsPluginBase* Data) FactoryList = NULL; return TRUE; } - + fl = (cmsFormattersFactoryList*) _cmsPluginMalloc(sizeof(cmsFormattersFactoryList)); if (fl == NULL) return FALSE; @@ -2932,8 +2932,8 @@ cmsBool _cmsRegisterFormattersPlugin(cmsPluginBase* Data) } cmsFormatter _cmsGetFormatter(cmsUInt32Number Type, // Specific type, i.e. TYPE_RGB_8 - cmsFormatterDirection Dir, - cmsUInt32Number dwFlags) + cmsFormatterDirection Dir, + cmsUInt32Number dwFlags) { cmsFormattersFactoryList* f; @@ -2944,9 +2944,9 @@ cmsFormatter _cmsGetFormatter(cmsUInt32Number Type, // Specific type, i. } // Revert to default - if (Dir == cmsFormatterInput) + if (Dir == cmsFormatterInput) return _cmsGetStockInputFormatter(Type, dwFlags); - else + else return _cmsGetStockOutputFormatter(Type, dwFlags); } @@ -2968,7 +2968,7 @@ cmsBool _cmsFormatterIs8bit(cmsUInt32Number Type) // Build a suitable formatter for the colorspace of this profile cmsUInt32Number CMSEXPORT cmsFormatterForColorspaceOfProfile(cmsHPROFILE hProfile, cmsUInt32Number nBytes, cmsBool lIsFloat) { - + cmsColorSpaceSignature ColorSpace = cmsGetColorSpace(hProfile); cmsUInt32Number ColorSpaceBits = _cmsLCMScolorSpace(ColorSpace); cmsUInt32Number nOutputChans = cmsChannelsOf(ColorSpace); @@ -2981,7 +2981,7 @@ cmsUInt32Number CMSEXPORT cmsFormatterForColorspaceOfProfile(cmsHPROFILE hProfil // Build a suitable formatter for the colorspace of this profile cmsUInt32Number CMSEXPORT cmsFormatterForPCSOfProfile(cmsHPROFILE hProfile, cmsUInt32Number nBytes, cmsBool lIsFloat) { - + cmsColorSpaceSignature ColorSpace = cmsGetPCS(hProfile); int ColorSpaceBits = _cmsLCMScolorSpace(ColorSpace); cmsUInt32Number nOutputChans = cmsChannelsOf(ColorSpace); |