From ee968712d0749e213b0eabb529d535df9080f21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 15 Apr 2024 15:23:01 +0200 Subject: [PATCH] lcms: Remove remaining 'register' instruction. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lcms/lcms-1.19.dfsg2/debian/changelog | 7 + .../patches/add-swab-function-prototype.diff | 13 + .../patches/remove-register-instruction.diff | 1515 +++++++++++++++++ .../lcms-1.19.dfsg2/debian/patches/series | 2 + 4 files changed, 1537 insertions(+) create mode 100644 debian/lcms/lcms-1.19.dfsg2/debian/patches/add-swab-function-prototype.diff create mode 100644 debian/lcms/lcms-1.19.dfsg2/debian/patches/remove-register-instruction.diff diff --git a/debian/lcms/lcms-1.19.dfsg2/debian/changelog b/debian/lcms/lcms-1.19.dfsg2/debian/changelog index 8104b2f6..594f49fb 100644 --- a/debian/lcms/lcms-1.19.dfsg2/debian/changelog +++ b/debian/lcms/lcms-1.19.dfsg2/debian/changelog @@ -1,3 +1,10 @@ +lcms (1.19.dfsg2-1.6~0debian13.0.0+4~a) trixie; urgency=medium + + * Remove remaining 'register' instruction. + * Add swab function prototype. + + -- Slávek Banko Mon, 15 Apr 2024 14:01:41 +0200 + lcms (1.19.dfsg2-1.6~0debian11.0.0+3~a) bullseye; urgency=medium * Dropped python support diff --git a/debian/lcms/lcms-1.19.dfsg2/debian/patches/add-swab-function-prototype.diff b/debian/lcms/lcms-1.19.dfsg2/debian/patches/add-swab-function-prototype.diff new file mode 100644 index 00000000..254ae0ff --- /dev/null +++ b/debian/lcms/lcms-1.19.dfsg2/debian/patches/add-swab-function-prototype.diff @@ -0,0 +1,13 @@ +Index: b/src/cmsio1.c +=================================================================== +--- a/src/cmsio1.c ++++ b/src/cmsio1.c +@@ -38,6 +38,8 @@ + + #ifdef __BEOS__ + # define USE_CUSTOM_SWAB 1 ++#else ++extern void swab(const void *from, void *to, size_t len); + #endif + + diff --git a/debian/lcms/lcms-1.19.dfsg2/debian/patches/remove-register-instruction.diff b/debian/lcms/lcms-1.19.dfsg2/debian/patches/remove-register-instruction.diff new file mode 100644 index 00000000..3f206443 --- /dev/null +++ b/debian/lcms/lcms-1.19.dfsg2/debian/patches/remove-register-instruction.diff @@ -0,0 +1,1515 @@ +Index: b/include/lcms.h +=================================================================== +--- a/include/lcms.h ++++ b/include/lcms.h +@@ -1241,9 +1241,9 @@ + + // LUT Sampling + +-typedef int (* _cmsSAMPLER)(register WORD In[], +- register WORD Out[], +- register LPVOID Cargo); ++typedef int (* _cmsSAMPLER)(WORD In[], ++ WORD Out[], ++ LPVOID Cargo); + + #define SAMPLER_HASTL1 LUT_HASTL1 + #define SAMPLER_HASTL2 LUT_HASTL2 +@@ -1253,9 +1253,9 @@ + + // Formatters + +-typedef unsigned char* (* cmsFORMATTER)(register void* CMMcargo, +- register WORD ToUnroll[], +- register LPBYTE Buffer); ++typedef unsigned char* (* cmsFORMATTER)(void* CMMcargo, ++ WORD ToUnroll[], ++ LPBYTE Buffer); + + LCMSAPI void LCMSEXPORT cmsSetUserFormatters(cmsHTRANSFORM hTransform, DWORD dwInput, cmsFORMATTER Input, + DWORD dwOutput, cmsFORMATTER Output); +@@ -1890,9 +1890,9 @@ + + typedef void (* _cmsCNVRT)(WORD In[], WORD Out[]); + +-typedef LPBYTE (* _cmsFIXFN)(register struct _cmstransform_struct *info, +- register WORD ToUnroll[], +- register LPBYTE Buffer); ++typedef LPBYTE (* _cmsFIXFN)(struct _cmstransform_struct *info, ++ WORD ToUnroll[], ++ LPBYTE Buffer); + + + +Index: b/python/lcms_wrap.cxx +=================================================================== +--- a/python/lcms_wrap.cxx ++++ b/python/lcms_wrap.cxx +@@ -560,14 +560,14 @@ + swig_module_info *iter = start; + do { + if (iter->size) { +- register size_t l = 0; +- register size_t r = iter->size - 1; ++ size_t l = 0; ++ size_t r = iter->size - 1; + do { + /* since l+r >= 0, we can (>> 1) instead (/ 2) */ +- register size_t i = (l + r) >> 1; ++ size_t i = (l + r) >> 1; + const char *iname = iter->types[i]->name; + if (iname) { +- register int compare = strcmp(name, iname); ++ int compare = strcmp(name, iname); + if (compare == 0) { + return iter->types[i]; + } else if (compare < 0) { +@@ -611,7 +611,7 @@ + of the str field (the human readable name) */ + swig_module_info *iter = start; + do { +- register size_t i = 0; ++ size_t i = 0; + for (; i < iter->size; ++i) { + if (iter->types[i]->str && (SWIG_TypeEquiv(iter->types[i]->str, name))) + return iter->types[i]; +@@ -630,10 +630,10 @@ + SWIGRUNTIME char * + SWIG_PackData(char *c, void *ptr, size_t sz) { + static const char hex[17] = "0123456789abcdef"; +- register const unsigned char *u = (unsigned char *) ptr; +- register const unsigned char *eu = u + sz; ++ const unsigned char *u = (unsigned char *) ptr; ++ const unsigned char *eu = u + sz; + for (; u != eu; ++u) { +- register unsigned char uu = *u; ++ unsigned char uu = *u; + *(c++) = hex[(uu & 0xf0) >> 4]; + *(c++) = hex[uu & 0xf]; + } +@@ -645,11 +645,11 @@ + */ + SWIGRUNTIME const char * + SWIG_UnpackData(const char *c, void *ptr, size_t sz) { +- register unsigned char *u = (unsigned char *) ptr; +- register const unsigned char *eu = u + sz; ++ unsigned char *u = (unsigned char *) ptr; ++ const unsigned char *eu = u + sz; + for (; u != eu; ++u) { +- register char d = *(c++); +- register unsigned char uu; ++ char d = *(c++); ++ unsigned char uu; + if ((d >= '0') && (d <= '9')) + uu = ((d - '0') << 4); + else if ((d >= 'a') && (d <= 'f')) +@@ -1326,7 +1326,7 @@ + } + if (!PyTuple_Check(args)) { + if (min <= 1 && max >= 1) { +- register int i; ++ int i; + objs[0] = args; + for (i = 1; i < max; ++i) { + objs[i] = 0; +@@ -1336,7 +1336,7 @@ + PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple"); + return 0; + } else { +- register Py_ssize_t l = PyTuple_GET_SIZE(args); ++ Py_ssize_t l = PyTuple_GET_SIZE(args); + if (l < min) { + PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d", + name, (min == max ? "" : "at least "), (int)min, (int)l); +@@ -1346,7 +1346,7 @@ + name, (min == max ? "" : "at most "), (int)max, (int)l); + return 0; + } else { +- register int i; ++ int i; + for (i = 0; i < l; ++i) { + objs[i] = PyTuple_GET_ITEM(args, i); + } +Index: b/samples/mkcmy.c +=================================================================== +--- a/samples/mkcmy.c ++++ b/samples/mkcmy.c +@@ -84,7 +84,7 @@ + // Our space will be CIE primaries plus a gamma of 4.5 + + static +-int Forward(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int Forward(WORD In[], WORD Out[], LPVOID Cargo) + { + LPCARGO C = (LPCARGO) Cargo; + WORD RGB[3]; +@@ -102,7 +102,7 @@ + + + static +-int Reverse(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int Reverse(WORD In[], WORD Out[], LPVOID Cargo) + { + + LPCARGO C = (LPCARGO) Cargo; +Index: b/samples/mkgrayer.c +=================================================================== +--- a/samples/mkgrayer.c ++++ b/samples/mkgrayer.c +@@ -27,7 +27,7 @@ + #define GRID_POINTS 33 + + static +-int Forward(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int Forward(WORD In[], WORD Out[], LPVOID Cargo) + { + cmsCIELab Lab; + +Index: b/samples/mktiff8.c +=================================================================== +--- a/samples/mktiff8.c ++++ b/samples/mktiff8.c +@@ -75,7 +75,7 @@ + + + static +-int Identity(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int Identity(WORD In[], WORD Out[], LPVOID Cargo) + { + Out[0] = In[0]; + Out[1] = In[1]; +Index: b/src/cmscgats.c +=================================================================== +--- a/src/cmscgats.c ++++ b/src/cmscgats.c +@@ -675,8 +675,8 @@ + static + void InSymbol(LPIT8 it8) + { +- register char *idptr; +- register int k; ++ char *idptr; ++ int k; + SYMBOL key; + int sng; + +Index: b/src/cmsgamma.c +=================================================================== +--- a/src/cmsgamma.c ++++ b/src/cmsgamma.c +@@ -172,7 +172,7 @@ + LPGAMMATABLE LCMSEXPORT cmsJoinGamma(LPGAMMATABLE InGamma, + LPGAMMATABLE OutGamma) + { +- register int i; ++ int i; + L16PARAMS L16In, L16Out; + LPWORD InPtr, OutPtr; + LPGAMMATABLE p; +@@ -243,7 +243,7 @@ + + LPGAMMATABLE LCMSEXPORT cmsReverseGamma(int nResultSamples, LPGAMMATABLE InGamma) + { +- register int i; ++ int i; + L16PARAMS L16In; + LPWORD InPtr; + LPGAMMATABLE p; +Index: b/src/cmsgmt.c +=================================================================== +--- a/src/cmsgmt.c ++++ b/src/cmsgmt.c +@@ -690,7 +690,7 @@ + + + static +-int GamutSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int GamutSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + LPGAMUTCHAIN t = (LPGAMUTCHAIN) Cargo; + WORD Proof[MAXCHANNELS], Check[MAXCHANNELS]; +@@ -923,7 +923,7 @@ + // any gamut remapping is applied + + static +-int SoftProofSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int SoftProofSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + LPGAMUTCHAIN t = (LPGAMUTCHAIN) Cargo; + WORD Colorant[MAXCHANNELS]; +@@ -1008,7 +1008,7 @@ + static + int MostlyLinear(WORD Table[], int nEntries) + { +- register int i; ++ int i; + int diff; + + for (i=5; i < nEntries; i++) { +Index: b/src/cmsintrp.c +=================================================================== +--- a/src/cmsintrp.c ++++ b/src/cmsintrp.c +@@ -513,9 +513,9 @@ + + WORD cmsReverseLinearInterpLUT16(WORD Value, WORD LutTable[], LPL16PARAMS p) + { +- register int l = 1; +- register int r = 0x10000; +- register int x = 0, res; // 'int' Give spacing for negative values ++ int l = 1; ++ int r = 0x10000; ++ int x = 0, res; // 'int' Give spacing for negative values + int NumZeroes, NumPoles; + int cell0, cell1; + double val2; +@@ -703,9 +703,9 @@ + + int OutChan, TotalOut; + Fixed32 fx, fy, fz; +- register int rx, ry, rz; ++ int rx, ry, rz; + int x0, y0, z0; +- register int X0, X1, Y0, Y1, Z0, Z1; ++ int X0, X1, Y0, Y1, Z0, Z1; + int d000, d001, d010, d011, + d100, d101, d110, d111, + dx00, dx01, dx10, dx11, +@@ -892,7 +892,7 @@ + int OutChan; + Fixed32 X0, X1, Y0, Y1, Z0, Z1; + int TotalOut = p -> nOutputs; +- register LPWORD LutTable = LutTable1; ++ LPWORD LutTable = LutTable1; + + + +@@ -1009,9 +1009,9 @@ + Fixed32 rx, ry, rz; + Fixed32 c1, c2, c3, Rest; + int OutChan; +- register Fixed32 X0, X1, Y0, Y1, Z0, Z1; ++ Fixed32 X0, X1, Y0, Y1, Z0, Z1; + int TotalOut = p -> nOutputs; +- register LPL8PARAMS p8 = p ->p8; ++ LPL8PARAMS p8 = p ->p8; + + + +Index: b/src/cmsio1.c +=================================================================== +--- a/src/cmsio1.c ++++ b/src/cmsio1.c +@@ -51,9 +51,9 @@ + static + void xswab(const void *from, void *to, size_t len) + { +- register unsigned long temp; +- register int n; +- register char *fp, *tp; ++ unsigned long temp; ++ int n; ++ char *fp, *tp; + + n = (len >> 1) + 1; + fp = (char *)from; +Index: b/src/cmslut.c +=================================================================== +--- a/src/cmslut.c ++++ b/src/cmslut.c +@@ -394,7 +394,7 @@ + + void LCMSEXPORT cmsEvalLUT(LPLUT Lut, WORD In[], WORD Out[]) + { +- register unsigned int i; ++ unsigned int i; + WORD StageABC[MAXCHANNELS], StageLMN[MAXCHANNELS]; + + +Index: b/src/cmsmtrx.c +=================================================================== +--- a/src/cmsmtrx.c ++++ b/src/cmsmtrx.c +@@ -471,7 +471,7 @@ + + int MAT3inverse(LPMAT3 a, LPMAT3 b) + { +- register int i, j, max; ++ int i, j, max; + + MAT3identity(b); + +Index: b/src/cmspack.c +=================================================================== +--- a/src/cmspack.c ++++ b/src/cmspack.c +@@ -51,10 +51,10 @@ + + + static +-LPBYTE UnrollAnyBytes(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollAnyBytes(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + int nChan = T_CHANNELS(info -> InputFormat); +- register int i; ++ int i; + + for (i=0; i < nChan; i++) { + +@@ -67,7 +67,7 @@ + + + static +-LPBYTE Unroll4Bytes(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4Bytes(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = RGB_8_TO_16(*accum); accum++; // C + wIn[1] = RGB_8_TO_16(*accum); accum++; // M +@@ -78,7 +78,7 @@ + } + + static +-LPBYTE Unroll4BytesReverse(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4BytesReverse(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = RGB_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // C + wIn[1] = RGB_8_TO_16(REVERSE_FLAVOR_8(*accum)); accum++; // M +@@ -90,7 +90,7 @@ + + + static +-LPBYTE Unroll4BytesSwapFirst(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4BytesSwapFirst(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + + wIn[3] = RGB_8_TO_16(*accum); accum++; // K +@@ -106,7 +106,7 @@ + + // KYMC + static +-LPBYTE Unroll4BytesSwap(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4BytesSwap(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[3] = RGB_8_TO_16(*accum); accum++; // K + wIn[2] = RGB_8_TO_16(*accum); accum++; // Y +@@ -118,7 +118,7 @@ + + + static +-LPBYTE Unroll4BytesSwapSwapFirst(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4BytesSwapSwapFirst(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[2] = RGB_8_TO_16(*accum); accum++; // K + wIn[1] = RGB_8_TO_16(*accum); accum++; // Y +@@ -130,10 +130,10 @@ + + + static +-LPBYTE UnrollAnyWords(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollAnyWords(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + int nChan = T_CHANNELS(info -> InputFormat); +- register int i; ++ int i; + + for (i=0; i < nChan; i++) { + +@@ -145,7 +145,7 @@ + + + static +-LPBYTE Unroll4Words(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4Words(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = *(LPWORD) accum; accum+= 2; // C + wIn[1] = *(LPWORD) accum; accum+= 2; // M +@@ -156,7 +156,7 @@ + } + + static +-LPBYTE Unroll4WordsReverse(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsReverse(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = REVERSE_FLAVOR_16(*(LPWORD) accum); accum+= 2; // C + wIn[1] = REVERSE_FLAVOR_16(*(LPWORD) accum); accum+= 2; // M +@@ -168,7 +168,7 @@ + + + static +-LPBYTE Unroll4WordsSwapFirst(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsSwapFirst(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[3] = *(LPWORD) accum; accum+= 2; // K + wIn[0] = *(LPWORD) accum; accum+= 2; // C +@@ -181,7 +181,7 @@ + + // KYMC + static +-LPBYTE Unroll4WordsSwap(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsSwap(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[3] = *(LPWORD) accum; accum+= 2; // K + wIn[2] = *(LPWORD) accum; accum+= 2; // Y +@@ -192,7 +192,7 @@ + } + + static +-LPBYTE Unroll4WordsSwapSwapFirst(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsSwapSwapFirst(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[2] = *(LPWORD) accum; accum+= 2; // K + wIn[1] = *(LPWORD) accum; accum+= 2; // Y +@@ -204,7 +204,7 @@ + + + static +-LPBYTE Unroll4WordsBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; //C + wIn[1] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; //M +@@ -215,7 +215,7 @@ + } + + static +-LPBYTE Unroll4WordsBigEndianReverse(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsBigEndianReverse(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = REVERSE_FLAVOR_16(CHANGE_ENDIAN(*(LPWORD) accum)); accum+= 2; //C + wIn[1] = REVERSE_FLAVOR_16(CHANGE_ENDIAN(*(LPWORD) accum)); accum+= 2; //M +@@ -228,7 +228,7 @@ + + // KYMC + static +-LPBYTE Unroll4WordsSwapBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll4WordsSwapBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[3] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; //K + wIn[2] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; //Y +@@ -239,7 +239,7 @@ + } + + static +-LPBYTE Unroll3Bytes(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3Bytes(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + + wIn[0] = RGB_8_TO_16(*accum); accum++; // R +@@ -253,7 +253,7 @@ + // Lab8 encoding using v2 PCS + + static +-LPBYTE Unroll3BytesLab(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3BytesLab(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + + wIn[0] = (WORD) ((*accum) << 8); accum++; +@@ -267,7 +267,7 @@ + // BRG + + static +-LPBYTE Unroll3BytesSwap(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3BytesSwap(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + + wIn[2] = RGB_8_TO_16(*accum); accum++; // B +@@ -278,7 +278,7 @@ + } + + static +-LPBYTE Unroll3Words(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3Words(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = *(LPWORD) accum; accum+= 2; // C R + wIn[1] = *(LPWORD) accum; accum+= 2; // M G +@@ -288,7 +288,7 @@ + + + static +-LPBYTE Unroll3WordsSwap(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3WordsSwap(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[2] = *(LPWORD) accum; accum+= 2; // C R + wIn[1] = *(LPWORD) accum; accum+= 2; // M G +@@ -298,7 +298,7 @@ + + + static +-LPBYTE Unroll3WordsBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3WordsBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; + wIn[1] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; +@@ -308,7 +308,7 @@ + + + static +-LPBYTE Unroll3WordsSwapBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll3WordsSwapBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[2] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; + wIn[1] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; +@@ -321,7 +321,7 @@ + // Monochrome duplicates L into RGB for null-transforms + + static +-LPBYTE Unroll1Byte(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1Byte(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = RGB_8_TO_16(*accum); accum++; // L + return accum; +@@ -329,7 +329,7 @@ + + + static +-LPBYTE Unroll1ByteSkip2(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1ByteSkip2(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = RGB_8_TO_16(*accum); accum++; // L + accum += 2; +@@ -337,7 +337,7 @@ + } + + static +-LPBYTE Unroll1ByteReversed(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1ByteReversed(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(RGB_8_TO_16(*accum)); accum++; // L + return accum; +@@ -345,14 +345,14 @@ + + + static +-LPBYTE Unroll1Word(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1Word(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = *(LPWORD) accum; accum+= 2; // L + return accum; + } + + static +-LPBYTE Unroll1WordReversed(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1WordReversed(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = REVERSE_FLAVOR_16(*(LPWORD) accum); accum+= 2; + return accum; +@@ -360,14 +360,14 @@ + + + static +-LPBYTE Unroll1WordBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1WordBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; + return accum; + } + + static +-LPBYTE Unroll1WordSkip3(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll1WordSkip3(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = *(LPWORD) accum; + +@@ -379,7 +379,7 @@ + // Monochrome + alpha. Alpha is lost + + static +-LPBYTE Unroll2Byte(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll2Byte(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = RGB_8_TO_16(*accum); accum++; // L + wIn[3] = RGB_8_TO_16(*accum); accum++; // alpha +@@ -387,7 +387,7 @@ + } + + static +-LPBYTE Unroll2ByteSwapFirst(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll2ByteSwapFirst(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[3] = RGB_8_TO_16(*accum); accum++; // alpha + wIn[0] = wIn[1] = wIn[2] = RGB_8_TO_16(*accum); accum++; // L +@@ -396,7 +396,7 @@ + + + static +-LPBYTE Unroll2Word(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll2Word(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = *(LPWORD) accum; accum+= 2; // L + wIn[3] = *(LPWORD) accum; accum += 2; // alpha +@@ -406,7 +406,7 @@ + + + static +-LPBYTE Unroll2WordSwapFirst(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll2WordSwapFirst(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[3] = *(LPWORD) accum; accum += 2; // alpha + wIn[0] = wIn[1] = wIn[2] = *(LPWORD) accum; accum+= 2; // L +@@ -415,7 +415,7 @@ + } + + static +-LPBYTE Unroll2WordBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE Unroll2WordBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + wIn[0] = wIn[1] = wIn[2] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; + wIn[3] = CHANGE_ENDIAN(*(LPWORD) accum); accum+= 2; +@@ -427,10 +427,10 @@ + + + static +-LPBYTE UnrollPlanarBytes(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollPlanarBytes(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + int nChan = T_CHANNELS(info -> InputFormat); +- register int i; ++ int i; + LPBYTE Init = accum; + + for (i=0; i < nChan; i++) { +@@ -445,10 +445,10 @@ + + + static +-LPBYTE UnrollPlanarWords(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollPlanarWords(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + int nChan = T_CHANNELS(info -> InputFormat); +- register int i; ++ int i; + LPBYTE Init = accum; + + for (i=0; i < nChan; i++) { +@@ -463,10 +463,10 @@ + + + static +-LPBYTE UnrollPlanarWordsBigEndian(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollPlanarWordsBigEndian(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + int nChan = T_CHANNELS(info -> InputFormat); +- register int i; ++ int i; + LPBYTE Init = accum; + + for (i=0; i < nChan; i++) { +@@ -481,7 +481,7 @@ + + // floating point + static +-LPBYTE UnrollLabDouble(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollLabDouble(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + + if (T_PLANAR(info -> InputFormat)) { +@@ -515,7 +515,7 @@ + } + + static +-LPBYTE UnrollXYZDouble(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollXYZDouble(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + if (T_PLANAR(info -> InputFormat)) { + +@@ -545,7 +545,7 @@ + + // Inks does come in percentage + static +-LPBYTE UnrollInkDouble(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollInkDouble(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + double* Inks = (double*) accum; + int nChan = T_CHANNELS(info -> InputFormat); +@@ -578,7 +578,7 @@ + + // Remaining cases are between 0..1.0 + static +-LPBYTE UnrollDouble(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollDouble(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + double* Inks = (double*) accum; + int nChan = T_CHANNELS(info -> InputFormat); +@@ -611,7 +611,7 @@ + + + static +-LPBYTE UnrollDouble1Chan(register _LPcmsTRANSFORM info, register WORD wIn[], register LPBYTE accum) ++LPBYTE UnrollDouble1Chan(_LPcmsTRANSFORM info, WORD wIn[], LPBYTE accum) + { + double* Inks = (double*) accum; + double v; +@@ -637,10 +637,10 @@ + static int err[MAXCHANNELS]; + + static +-LPBYTE PackNBytesDither(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNBytesDither(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + unsigned int n, pe, pf; + + for (i=0; i < nChan; i++) { +@@ -661,10 +661,10 @@ + + + static +-LPBYTE PackNBytesSwapDither(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNBytesSwapDither(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + unsigned int n, pe, pf; + + for (i=nChan-1; i >= 0; --i) { +@@ -688,10 +688,10 @@ + // Generic chunky for byte + + static +-LPBYTE PackNBytes(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNBytes(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + + for (i=0; i < nChan; i++) + *output++ = RGB_16_TO_8(wOut[i]); +@@ -702,10 +702,10 @@ + // Chunky reversed order bytes + + static +-LPBYTE PackNBytesSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNBytesSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + + for (i=nChan-1; i >= 0; --i) + *output++ = RGB_16_TO_8(wOut[i]); +@@ -716,10 +716,10 @@ + + + static +-LPBYTE PackNWords(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNWords(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + + for (i=0; i < nChan; i++) { + *(LPWORD) output = wOut[i]; +@@ -730,10 +730,10 @@ + } + + static +-LPBYTE PackNWordsSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNWordsSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + + for (i=nChan-1; i >= 0; --i) { + *(LPWORD) output = wOut[i]; +@@ -746,10 +746,10 @@ + + + static +-LPBYTE PackNWordsBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNWordsBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + + for (i=0; i < nChan; i++) { + *(LPWORD) output = CHANGE_ENDIAN(wOut[i]); +@@ -761,10 +761,10 @@ + + + static +-LPBYTE PackNWordsSwapBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackNWordsSwapBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + + for (i=nChan-1; i >= 0; --i) { + *(LPWORD) output = CHANGE_ENDIAN(wOut[i]); +@@ -776,10 +776,10 @@ + + + static +-LPBYTE PackPlanarBytes(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackPlanarBytes(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + LPBYTE Init = output; + + for (i=0; i < nChan; i++) { +@@ -793,10 +793,10 @@ + + + static +-LPBYTE PackPlanarWords(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackPlanarWords(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + int nChan = T_CHANNELS(info -> OutputFormat); +- register int i; ++ int i; + LPBYTE Init = output; + + for (i=0; i < nChan; i++) { +@@ -812,7 +812,7 @@ + // CMYKcm (unrolled for speed) + + static +-LPBYTE Pack6Bytes(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack6Bytes(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[0]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -827,7 +827,7 @@ + // KCMYcm + + static +-LPBYTE Pack6BytesSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack6BytesSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[3]); + *output++ = RGB_16_TO_8(wOut[0]); +@@ -841,7 +841,7 @@ + + // CMYKcm + static +-LPBYTE Pack6Words(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack6Words(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[0]; + output+= 2; +@@ -861,7 +861,7 @@ + + // KCMYcm + static +-LPBYTE Pack6WordsSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack6WordsSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[3]; + output+= 2; +@@ -881,7 +881,7 @@ + + // CMYKcm + static +-LPBYTE Pack6WordsBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack6WordsBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[0]); + output+= 2; +@@ -901,7 +901,7 @@ + + // KCMYcm + static +-LPBYTE Pack6WordsSwapBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack6WordsSwapBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[3]); + output+= 2; +@@ -921,7 +921,7 @@ + + + static +-LPBYTE Pack4Bytes(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4Bytes(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[0]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -932,7 +932,7 @@ + } + + static +-LPBYTE Pack4BytesReverse(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4BytesReverse(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = REVERSE_FLAVOR_8(RGB_16_TO_8(wOut[0])); + *output++ = REVERSE_FLAVOR_8(RGB_16_TO_8(wOut[1])); +@@ -944,7 +944,7 @@ + + + static +-LPBYTE Pack4BytesSwapFirst(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4BytesSwapFirst(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[3]); + *output++ = RGB_16_TO_8(wOut[0]); +@@ -958,7 +958,7 @@ + // ABGR + + static +-LPBYTE Pack4BytesSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4BytesSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[3]); + *output++ = RGB_16_TO_8(wOut[2]); +@@ -970,7 +970,7 @@ + + + static +-LPBYTE Pack4BytesSwapSwapFirst(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4BytesSwapSwapFirst(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[2]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -982,7 +982,7 @@ + + + static +-LPBYTE Pack4Words(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4Words(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[0]; + output+= 2; +@@ -998,7 +998,7 @@ + + + static +-LPBYTE Pack4WordsReverse(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4WordsReverse(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = REVERSE_FLAVOR_16(wOut[0]); + output+= 2; +@@ -1015,7 +1015,7 @@ + // ABGR + + static +-LPBYTE Pack4WordsSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4WordsSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[3]; + output+= 2; +@@ -1031,7 +1031,7 @@ + + // CMYK + static +-LPBYTE Pack4WordsBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4WordsBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[0]); + output+= 2; +@@ -1047,7 +1047,7 @@ + + + static +-LPBYTE Pack4WordsBigEndianReverse(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4WordsBigEndianReverse(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(REVERSE_FLAVOR_16(wOut[0])); + output+= 2; +@@ -1064,7 +1064,7 @@ + // KYMC + + static +-LPBYTE Pack4WordsSwapBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack4WordsSwapBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[3]); + output+= 2; +@@ -1079,7 +1079,7 @@ + } + + static +-LPBYTE Pack3Bytes(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3Bytes(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[0]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -1089,7 +1089,7 @@ + } + + static +-LPBYTE Pack3BytesLab(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3BytesLab(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = (BYTE) (wOut[0] >> 8); + *output++ = (BYTE) (wOut[1] >> 8); +@@ -1100,7 +1100,7 @@ + + + static +-LPBYTE Pack3BytesSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3BytesSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[2]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -1111,7 +1111,7 @@ + + + static +-LPBYTE Pack3Words(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3Words(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[0]; + output+= 2; +@@ -1124,7 +1124,7 @@ + } + + static +-LPBYTE Pack3WordsSwap(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsSwap(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[2]; + output+= 2; +@@ -1137,7 +1137,7 @@ + } + + static +-LPBYTE Pack3WordsBigEndian(register _LPcmsTRANSFORM info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsBigEndian(_LPcmsTRANSFORM info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[0]); + output+= 2; +@@ -1151,7 +1151,7 @@ + + + static +-LPBYTE Pack3WordsSwapBigEndian(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsSwapBigEndian(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[2]); + output+= 2; +@@ -1165,7 +1165,7 @@ + + + static +-LPBYTE Pack3BytesAndSkip1(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3BytesAndSkip1(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[0]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -1177,7 +1177,7 @@ + + + static +-LPBYTE Pack3BytesAndSkip1SwapFirst(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3BytesAndSkip1SwapFirst(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + output++; + *output++ = RGB_16_TO_8(wOut[0]); +@@ -1188,7 +1188,7 @@ + } + + static +-LPBYTE Pack3BytesAndSkip1Swap(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3BytesAndSkip1Swap(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + output++; + *output++ = RGB_16_TO_8(wOut[2]); +@@ -1200,7 +1200,7 @@ + + + static +-LPBYTE Pack3BytesAndSkip1SwapSwapFirst(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3BytesAndSkip1SwapSwapFirst(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[2]); + *output++ = RGB_16_TO_8(wOut[1]); +@@ -1212,7 +1212,7 @@ + + + static +-LPBYTE Pack3WordsAndSkip1(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsAndSkip1(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[0]; + output+= 2; +@@ -1226,7 +1226,7 @@ + } + + static +-LPBYTE Pack3WordsAndSkip1Swap(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsAndSkip1Swap(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + output+= 2; + *(LPWORD) output = wOut[2]; +@@ -1242,7 +1242,7 @@ + + + static +-LPBYTE Pack3WordsAndSkip1SwapSwapFirst(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsAndSkip1SwapSwapFirst(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[2]; + output+= 2; +@@ -1258,7 +1258,7 @@ + + + static +-LPBYTE Pack3WordsAndSkip1BigEndian(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsAndSkip1BigEndian(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[0]); + output+= 2; +@@ -1273,7 +1273,7 @@ + + + static +-LPBYTE Pack3WordsAndSkip1SwapBigEndian(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack3WordsAndSkip1SwapBigEndian(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + output+= 2; + *(LPWORD) output = CHANGE_ENDIAN(wOut[2]); +@@ -1290,7 +1290,7 @@ + + + static +-LPBYTE Pack1Byte(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1Byte(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[0]); + return output; +@@ -1298,7 +1298,7 @@ + + + static +-LPBYTE Pack1ByteAndSkip1(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1ByteAndSkip1(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *output++ = RGB_16_TO_8(wOut[0]); + output++; +@@ -1307,7 +1307,7 @@ + + + static +-LPBYTE Pack1ByteAndSkip1SwapFirst(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1ByteAndSkip1SwapFirst(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + output++; + *output++ = RGB_16_TO_8(wOut[0]); +@@ -1316,7 +1316,7 @@ + } + + static +-LPBYTE Pack1Word(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1Word(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[0]; + output+= 2; +@@ -1325,7 +1325,7 @@ + } + + static +-LPBYTE Pack1WordBigEndian(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1WordBigEndian(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[0]); + output+= 2; +@@ -1335,7 +1335,7 @@ + + + static +-LPBYTE Pack1WordAndSkip1(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1WordAndSkip1(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = wOut[0]; + output+= 4; +@@ -1344,7 +1344,7 @@ + } + + static +-LPBYTE Pack1WordAndSkip1SwapFirst(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1WordAndSkip1SwapFirst(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + output += 2; + *(LPWORD) output = wOut[0]; +@@ -1355,7 +1355,7 @@ + + + static +-LPBYTE Pack1WordAndSkip1BigEndian(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE Pack1WordAndSkip1BigEndian(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + *(LPWORD) output = CHANGE_ENDIAN(wOut[0]); + output+= 4; +@@ -1367,7 +1367,7 @@ + // Unencoded Float values -- don't try optimize speed + + static +-LPBYTE PackLabDouble(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackLabDouble(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + + if (T_PLANAR(Info -> OutputFormat)) { +@@ -1396,7 +1396,7 @@ + } + + static +-LPBYTE PackXYZDouble(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackXYZDouble(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + + if (T_PLANAR(Info -> OutputFormat)) { +@@ -1423,7 +1423,7 @@ + + + static +-LPBYTE PackInkDouble(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackInkDouble(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + double* Inks = (double*) output; + int nChan = T_CHANNELS(Info -> OutputFormat); +@@ -1453,7 +1453,7 @@ + + + static +-LPBYTE PackDouble(register _LPcmsTRANSFORM Info, register WORD wOut[], register LPBYTE output) ++LPBYTE PackDouble(_LPcmsTRANSFORM Info, WORD wOut[], LPBYTE output) + { + double* Inks = (double*) output; + int nChan = T_CHANNELS(Info -> OutputFormat); +Index: b/src/cmsps2.c +=================================================================== +--- a/src/cmsps2.c ++++ b/src/cmsps2.c +@@ -687,7 +687,7 @@ + // component. -1 is used to mark begining of whole block. + + static +-int OutputValueSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int OutputValueSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + LPSAMPLERCARGO sc = (LPSAMPLERCARGO) Cargo; + unsigned int i; +Index: b/src/cmssamp.c +=================================================================== +--- a/src/cmssamp.c ++++ b/src/cmssamp.c +@@ -44,7 +44,7 @@ + + int cmsIsLinear(WORD Table[], int nEntries) + { +- register int i; ++ int i; + int diff; + + for (i=0; i < nEntries; i++) { +@@ -215,7 +215,7 @@ + // precalculate the devicelink 3D CLUT for almost any transform + + static +-int XFormSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int XFormSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + cmsDoTransform((cmsHTRANSFORM) Cargo, In, Out, 1); + return TRUE; +@@ -311,7 +311,7 @@ + + // Preserve black only if that is the only ink used + static +-int BlackPreservingGrayOnlySampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int BlackPreservingGrayOnlySampler(WORD In[], WORD Out[], LPVOID Cargo) + { + BPCARGO* bp = (LPBPCARGO) Cargo; + +@@ -333,7 +333,7 @@ + + // Preserve all K plane. + static +-int BlackPreservingSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int BlackPreservingSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + + WORD LabK[4]; +@@ -400,7 +400,7 @@ + #endif + + static +-int EstimateTAC(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int EstimateTAC(WORD In[], WORD Out[], LPVOID Cargo) + { + BPCARGO* bp = (LPBPCARGO) Cargo; + WORD RoundTrip[4]; +@@ -419,7 +419,7 @@ + + // Estimate the maximum error + static +-int BlackPreservingEstimateErrorSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int BlackPreservingEstimateErrorSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + BPCARGO* bp = (LPBPCARGO) Cargo; + WORD ColorimetricOut[4]; +Index: b/src/cmsvirt.c +=================================================================== +--- a/src/cmsvirt.c ++++ b/src/cmsvirt.c +@@ -457,7 +457,7 @@ + // K: Does not change + + static +-int InkLimitingSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int InkLimitingSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + double InkLimit = *(double *) Cargo; + double SumCMY, SumCMYK, Ratio; +@@ -746,7 +746,7 @@ + + + static +-int bchswSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int bchswSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + cmsCIELab LabIn, LabOut; + cmsCIELCh LChIn, LChOut; +Index: b/src/cmsxform.c +=================================================================== +--- a/src/cmsxform.c ++++ b/src/cmsxform.c +@@ -163,10 +163,10 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS]; +- register unsigned int i, n; ++ unsigned int i, n; + + + accum = (LPBYTE) in; +@@ -189,12 +189,12 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; + WORD wStageABC[3], wPCS[3], wStageLMN[MAXCHANNELS]; + WORD wGamut[1]; +- register unsigned int i, n; ++ unsigned int i, n; + + + +@@ -291,8 +291,8 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; + unsigned int i, n; + +@@ -351,10 +351,10 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; +- register unsigned int i, n; ++ unsigned int i, n; + + + accum = (LPBYTE) in; +@@ -380,10 +380,10 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; +- register unsigned int i, n; ++ unsigned int i, n; + WORD CacheIn[MAXCHANNELS], CacheOut[MAXCHANNELS]; + + +@@ -449,10 +449,10 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; +- register unsigned int i, n; ++ unsigned int i, n; + WORD CacheIn[MAXCHANNELS], CacheOut[MAXCHANNELS]; + + +@@ -504,10 +504,10 @@ + LPVOID in, + LPVOID out, unsigned int Size) + { +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; +- register unsigned int i, n; ++ unsigned int i, n; + + + accum = (LPBYTE) in; +@@ -531,10 +531,10 @@ + LPVOID out, unsigned int Size) + { + +- register LPBYTE accum; +- register LPBYTE output; ++ LPBYTE accum; ++ LPBYTE output; + WORD wIn[MAXCHANNELS], wOut[MAXCHANNELS]; +- register unsigned int i; ++ unsigned int i; + + + accum = (LPBYTE) in; +@@ -1740,7 +1740,7 @@ + + // Multiple profile transform. + static +-int MultiprofileSampler(register WORD In[], register WORD Out[], register LPVOID Cargo) ++int MultiprofileSampler(WORD In[], WORD Out[], LPVOID Cargo) + { + cmsHTRANSFORM* Transforms = (cmsHTRANSFORM*) Cargo; + int i; +Index: b/tifficc/tifficc.c +=================================================================== +--- a/tifficc/tifficc.c ++++ b/tifficc/tifficc.c +@@ -936,7 +936,7 @@ + // Formatter for 8bit Lab TIFF (photometric 8) + + static +-unsigned char* UnrollTIFFLab8(register void* nfo, register WORD wIn[], register LPBYTE accum) ++unsigned char* UnrollTIFFLab8(void* nfo, WORD wIn[], LPBYTE accum) + { + _LPcmsTRANSFORM info = (_LPcmsTRANSFORM) nfo; + +@@ -950,7 +950,7 @@ + + + static +-unsigned char* PackTIFFLab8(register void* nfo, register WORD wOut[], register LPBYTE output) ++unsigned char* PackTIFFLab8(void* nfo, WORD wOut[], LPBYTE output) + { + _LPcmsTRANSFORM info = (_LPcmsTRANSFORM) nfo; + int a, b; diff --git a/debian/lcms/lcms-1.19.dfsg2/debian/patches/series b/debian/lcms/lcms-1.19.dfsg2/debian/patches/series index cbe8340e..33f8cda0 100644 --- a/debian/lcms/lcms-1.19.dfsg2/debian/patches/series +++ b/debian/lcms/lcms-1.19.dfsg2/debian/patches/series @@ -1 +1,3 @@ debian-changes.diff +remove-register-instruction.diff +add-swab-function-prototype.diff