diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-12-28 19:46:29 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-12-28 22:57:11 +0400 |
| commit | 9e0116f013eb8f49bda73f8b4574478da82a2ba1 (patch) | |
| tree | 05e7e33397fe71429c9d7723de96ad2f9947031d /src/thirdparty/lcms2 | |
| parent | 035e67fb7bdb22adc69d379f5822eeb06045486b (diff) | |
update Little CMS to v2.4 (git e4624c8)
Diffstat (limited to 'src/thirdparty/lcms2')
| -rw-r--r-- | src/thirdparty/lcms2/AUTHORS | 1 | ||||
| -rw-r--r-- | src/thirdparty/lcms2/src/cmspack.c | 24 |
2 files changed, 23 insertions, 2 deletions
diff --git a/src/thirdparty/lcms2/AUTHORS b/src/thirdparty/lcms2/AUTHORS index 9479da7ea..8f4fdf317 100644 --- a/src/thirdparty/lcms2/AUTHORS +++ b/src/thirdparty/lcms2/AUTHORS @@ -26,6 +26,7 @@ Michal Cihar Daniel Kaneider
Mateusz Jurczyk (Google)
Paul Miller
+Sébastien Léon
Special Thanks
--------------
diff --git a/src/thirdparty/lcms2/src/cmspack.c b/src/thirdparty/lcms2/src/cmspack.c index d96e6dda2..f01bd5121 100644 --- a/src/thirdparty/lcms2/src/cmspack.c +++ b/src/thirdparty/lcms2/src/cmspack.c @@ -288,8 +288,25 @@ cmsUInt8Number* Unroll3BytesSkip1Swap(register _cmsTRANSFORM* info, }
static
-cmsUInt8Number* Unroll3BytesSkip1SwapFirst(register _cmsTRANSFORM* info,
- register cmsUInt16Number wIn[],
+cmsUInt8Number* Unroll3BytesSkip1SwapSwapFirst(register _cmsTRANSFORM* info,
+ register cmsUInt16Number wIn[],
+ register cmsUInt8Number* accum,
+ register cmsUInt32Number Stride)
+{
+ 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[],
register cmsUInt8Number* accum,
register cmsUInt32Number Stride)
{
@@ -2872,6 +2889,9 @@ static cmsFormatters16 InputFormatters16[] = { { CHANNELS_SH(3)|EXTRA_SH(1)|BYTES_SH(1)|DOSWAP_SH(1), ANYSPACE, Unroll3BytesSkip1Swap},
{ CHANNELS_SH(3)|EXTRA_SH(1)|BYTES_SH(1)|SWAPFIRST_SH(1), ANYSPACE, Unroll3BytesSkip1SwapFirst},
+ { CHANNELS_SH(3)|EXTRA_SH(1)|BYTES_SH(1)|DOSWAP_SH(1)|SWAPFIRST_SH(1),
+ ANYSPACE, Unroll3BytesSkip1SwapSwapFirst},
+
{ 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},
|