spacepaste

Paste details

reply | raw

  1.  
  2. diff -pruN lcms2-2.9.orig/ChangeLog lcms2-2.9/ChangeLog
  3. --- lcms2-2.9.orig/ChangeLog 2017-11-01 02:36:47.000000000 +1100
  4. +++ lcms2-2.9/ChangeLog 2017-11-13 04:15:10.000000000 +1100
  5. @@ -5,6 +5,9 @@
  6. Several fixes related with security, and therefore not detailed here.
  7. C++ compiles now without warnings
  8. Added OSX and clang in travis
  9. +Added a travis-ci test matrix for many compilers and OS. Thanks to Thomas Weber (debian) for this great improvement.
  10. +testbed can now work with dynamic versions of library
  11. +Fixed wrong planar formatters regarding linestride interpretation
  13. -----------------------
  14. 2.8 Featured release
  15. diff -pruN lcms2-2.9.orig/src/cmshalf.c lcms2-2.9/src/cmshalf.c
  16. --- lcms2-2.9.orig/src/cmshalf.c 2017-11-01 02:36:47.000000000 +1100
  17. +++ lcms2-2.9/src/cmshalf.c 2017-11-13 04:15:10.000000000 +1100
  18. @@ -503,7 +503,7 @@ static cmsUInt8Number Shift[512] = {
  19. 0x18, 0x18, 0x18, 0x18, 0x0d
  20. };
  22. -cmsFloat32Number _cmsHalf2Float(cmsUInt16Number h)
  23. +cmsFloat32Number CMSEXPORT _cmsHalf2Float(cmsUInt16Number h)
  24. {
  25. union {
  26. cmsFloat32Number flt;
  27. @@ -516,7 +516,7 @@ cmsFloat32Number _cmsHalf2Float(cmsUInt1
  28. return out.flt;
  29. }
  31. -cmsUInt16Number _cmsFloat2Half(cmsFloat32Number flt)
  32. +cmsUInt16Number CMSEXPORT _cmsFloat2Half(cmsFloat32Number flt)
  33. {
  34. union {
  35. cmsFloat32Number flt;
  36. diff -pruN lcms2-2.9.orig/src/cmsintrp.c lcms2-2.9/src/cmsintrp.c
  37. --- lcms2-2.9.orig/src/cmsintrp.c 2017-11-01 02:36:47.000000000 +1100
  38. +++ lcms2-2.9/src/cmsintrp.c 2017-11-13 04:15:10.000000000 +1100
  39. @@ -158,8 +158,8 @@ cmsInterpParams* _cmsComputeInterpParams
  42. // This one is a wrapper on the anterior, but assuming all directions have same number of nodes
  43. -cmsInterpParams* _cmsComputeInterpParams(cmsContext ContextID, cmsUInt32Number nSamples,
  44. - cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags)
  45. +cmsInterpParams* CMSEXPORT _cmsComputeInterpParams(cmsContext ContextID, cmsUInt32Number nSamples,
  46. + cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags)
  47. {
  48. int i;
  49. cmsUInt32Number Samples[MAX_INPUT_DIMENSIONS];
  50. @@ -174,7 +174,7 @@ cmsInterpParams* _cmsComputeInterpParams
  53. // Free all associated memory
  54. -void _cmsFreeInterpParams(cmsInterpParams* p)
  55. +void CMSEXPORT _cmsFreeInterpParams(cmsInterpParams* p)
  56. {
  57. if (p != NULL) _cmsFree(p ->ContextID, p);
  58. }
  59. diff -pruN lcms2-2.9.orig/src/cmsio1.c lcms2-2.9/src/cmsio1.c
  60. --- lcms2-2.9.orig/src/cmsio1.c 2017-11-01 02:36:47.000000000 +1100
  61. +++ lcms2-2.9/src/cmsio1.c 2017-11-13 04:15:10.000000000 +1100
  62. @@ -307,7 +307,7 @@ Error:
  63. // Read and create a BRAND NEW MPE LUT from a given profile. All stuff dependent of version, etc
  64. // is adjusted here in order to create a LUT that takes care of all those details.
  65. // We add intent = 0xffffffff as a way to read matrix shaper always, no matter of other LUT
  66. -cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
  67. +cmsPipeline* CMSEXPORT _cmsReadInputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
  68. {
  69. cmsTagTypeSignature OriginalType;
  70. cmsTagSignature tag16;
  71. @@ -582,7 +582,7 @@ Error:
  72. }
  74. // Create an output MPE LUT from agiven profile. Version mismatches are handled here
  75. -cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
  76. +cmsPipeline* CMSEXPORT _cmsReadOutputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
  77. {
  78. cmsTagTypeSignature OriginalType;
  79. cmsTagSignature tag16;
  80. @@ -705,7 +705,7 @@ Error:
  82. // This one includes abstract profiles as well. Matrix-shaper cannot be obtained on that device class. The
  83. // tag name here may default to AToB0
  84. -cmsPipeline* _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
  85. +cmsPipeline* CMSEXPORT _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent)
  86. {
  87. cmsPipeline* Lut;
  88. cmsTagTypeSignature OriginalType;
  89. diff -pruN lcms2-2.9.orig/src/cmslut.c lcms2-2.9/src/cmslut.c
  90. --- lcms2-2.9.orig/src/cmslut.c 2017-11-01 02:36:47.000000000 +1100
  91. +++ lcms2-2.9/src/cmslut.c 2017-11-13 04:15:10.000000000 +1100
  92. @@ -292,7 +292,7 @@ cmsStage* CMSEXPORT cmsStageAllocToneCur
  95. // Create a bunch of identity curves
  96. -cmsStage* _cmsStageAllocIdentityCurves(cmsContext ContextID, cmsUInt32Number nChannels)
  97. +cmsStage* CMSEXPORT _cmsStageAllocIdentityCurves(cmsContext ContextID, cmsUInt32Number nChannels)
  98. {
  99. cmsStage* mpe = cmsStageAllocToneCurves(ContextID, nChannels, NULL);
  101. @@ -712,7 +712,7 @@ int IdentitySampler(register const cmsUI
  102. }
  104. // Creates an MPE that just copies input to output
  105. -cmsStage* _cmsStageAllocIdentityCLut(cmsContext ContextID, cmsUInt32Number nChan)
  106. +cmsStage* CMSEXPORT _cmsStageAllocIdentityCLut(cmsContext ContextID, cmsUInt32Number nChan)
  107. {
  108. cmsUInt32Number Dimensions[MAX_INPUT_DIMENSIONS];
  109. cmsStage* mpe ;
  110. @@ -736,7 +736,7 @@ cmsStage* _cmsStageAllocIdentityCLut(cms
  113. // Quantize a value 0 <= i < MaxSamples to 0..0xffff
  114. -cmsUInt16Number _cmsQuantizeVal(cmsFloat64Number i, cmsUInt32Number MaxSamples)
  115. +cmsUInt16Number CMSEXPORT _cmsQuantizeVal(cmsFloat64Number i, cmsUInt32Number MaxSamples)
  116. {
  117. cmsFloat64Number x;
  119. @@ -969,7 +969,7 @@ void EvaluateLab2XYZ(const cmsFloat32Num
  122. // No dup or free routines needed, as the structure has no pointers in it.
  123. -cmsStage* _cmsStageAllocLab2XYZ(cmsContext ContextID)
  124. +cmsStage* CMSEXPORT _cmsStageAllocLab2XYZ(cmsContext ContextID)
  125. {
  126. return _cmsStageAllocPlaceholder(ContextID, cmsSigLab2XYZElemType, 3, 3, EvaluateLab2XYZ, NULL, NULL, NULL);
  127. }
  128. @@ -1020,7 +1020,7 @@ cmsStage* _cmsStageAllocLabV2ToV4curves(
  129. // ********************************************************************************
  131. // Matrix-based conversion, which is more accurate, but slower and cannot properly be saved in devicelink profiles
  132. -cmsStage* _cmsStageAllocLabV2ToV4(cmsContext ContextID)
  133. +cmsStage* CMSEXPORT _cmsStageAllocLabV2ToV4(cmsContext ContextID)
  134. {
  135. static const cmsFloat64Number V2ToV4[] = { 65535.0/65280.0, 0, 0,
  136. 0, 65535.0/65280.0, 0,
  137. @@ -1036,7 +1036,7 @@ cmsStage* _cmsStageAllocLabV2ToV4(cmsCon
  140. // Reverse direction
  141. -cmsStage* _cmsStageAllocLabV4ToV2(cmsContext ContextID)
  142. +cmsStage* CMSEXPORT _cmsStageAllocLabV4ToV2(cmsContext ContextID)
  143. {
  144. static const cmsFloat64Number V4ToV2[] = { 65280.0/65535.0, 0, 0,
  145. 0, 65280.0/65535.0, 0,
  146. @@ -1179,7 +1179,7 @@ void EvaluateXYZ2Lab(const cmsFloat32Num
  147. cmsUNUSED_PARAMETER(mpe);
  148. }
  150. -cmsStage* _cmsStageAllocXYZ2Lab(cmsContext ContextID)
  151. +cmsStage* CMSEXPORT _cmsStageAllocXYZ2Lab(cmsContext ContextID)
  152. {
  153. return _cmsStageAllocPlaceholder(ContextID, cmsSigXYZ2LabElemType, 3, 3, EvaluateXYZ2Lab, NULL, NULL, NULL);
  155. diff -pruN lcms2-2.9.orig/src/cmsnamed.c lcms2-2.9/src/cmsnamed.c
  156. --- lcms2-2.9.orig/src/cmsnamed.c 2017-11-01 02:36:47.000000000 +1100
  157. +++ lcms2-2.9/src/cmsnamed.c 2017-11-13 04:15:10.000000000 +1100
  158. @@ -730,7 +730,7 @@ void EvalNamedColor(const cmsFloat32Numb
  161. // Named color lookup element
  162. -cmsStage* _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS)
  163. +cmsStage* CMSEXPORT _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS)
  164. {
  165. return _cmsStageAllocPlaceholder(NamedColorList ->ContextID,
  166. cmsSigNamedColorElemType,
  167. diff -pruN lcms2-2.9.orig/src/cmspack.c lcms2-2.9/src/cmspack.c
  168. --- lcms2-2.9.orig/src/cmspack.c 2017-11-01 02:36:47.000000000 +1100
  169. +++ lcms2-2.9/src/cmspack.c 2017-11-13 04:15:10.000000000 +1100
  170. @@ -531,7 +531,7 @@ cmsUInt8Number* UnrollPlanarWords(regist
  171. cmsUInt8Number* Init = accum;
  173. if (DoSwap) {
  174. - accum += T_EXTRA(info -> InputFormat) * Stride * sizeof(cmsUInt16Number);
  175. + accum += T_EXTRA(info -> InputFormat) * Stride;
  176. }
  178. for (i=0; i < nChan; i++) {
  179. @@ -544,7 +544,7 @@ cmsUInt8Number* UnrollPlanarWords(regist
  181. wIn[index] = Reverse ? REVERSE_FLAVOR_16(v) : v;
  183. - accum += Stride * sizeof(cmsUInt16Number);
  184. + accum += Stride;
  185. }
  187. return (Init + sizeof(cmsUInt16Number));
  188. @@ -772,13 +772,18 @@ cmsUInt8Number* UnrollLabDoubleTo16(regi
  189. {
  190. if (T_PLANAR(info -> InputFormat)) {
  192. - cmsFloat64Number* Pt = (cmsFloat64Number*) accum;
  193. -
  194. cmsCIELab Lab;
  195. -
  196. - Lab.L = Pt[0];
  197. - Lab.a = Pt[Stride];
  198. - Lab.b = Pt[Stride*2];
  199. + cmsUInt8Number* pos_L;
  200. + cmsUInt8Number* pos_a;
  201. + cmsUInt8Number* pos_b;
  202. +
  203. + pos_L = accum;
  204. + pos_a = accum + Stride;
  205. + pos_b = accum + Stride * 2;
  206. +
  207. + Lab.L = *(cmsFloat64Number*) pos_L;
  208. + Lab.a = *(cmsFloat64Number*) pos_a;
  209. + Lab.b = *(cmsFloat64Number*) pos_b;
  211. cmsFloat2LabEncoded(wIn, &Lab);
  212. return accum + sizeof(cmsFloat64Number);
  213. @@ -803,12 +808,17 @@ cmsUInt8Number* UnrollLabFloatTo16(regis
  215. if (T_PLANAR(info -> InputFormat)) {
  217. - cmsFloat32Number* Pt = (cmsFloat32Number*) accum;
  218. -
  219. -
  220. - Lab.L = Pt[0];
  221. - Lab.a = Pt[Stride];
  222. - Lab.b = Pt[Stride*2];
  223. + cmsUInt8Number* pos_L;
  224. + cmsUInt8Number* pos_a;
  225. + cmsUInt8Number* pos_b;
  226. +
  227. + pos_L = accum;
  228. + pos_a = accum + Stride;
  229. + pos_b = accum + Stride * 2;
  230. +
  231. + Lab.L = *(cmsFloat32Number*)pos_L;
  232. + Lab.a = *(cmsFloat32Number*)pos_a;
  233. + Lab.b = *(cmsFloat32Number*)pos_b;
  235. cmsFloat2LabEncoded(wIn, &Lab);
  236. return accum + sizeof(cmsFloat32Number);
  237. @@ -834,12 +844,19 @@ cmsUInt8Number* UnrollXYZDoubleTo16(regi
  238. {
  239. if (T_PLANAR(info -> InputFormat)) {
  241. - cmsFloat64Number* Pt = (cmsFloat64Number*) accum;
  242. cmsCIEXYZ XYZ;
  243. + cmsUInt8Number* pos_X;
  244. + cmsUInt8Number* pos_Y;
  245. + cmsUInt8Number* pos_Z;
  246. +
  247. + pos_X = accum;
  248. + pos_Y = accum + Stride;
  249. + pos_Z = accum + Stride * 2;
  250. +
  251. + XYZ.X = *(cmsFloat64Number*)pos_X;
  252. + XYZ.Y = *(cmsFloat64Number*)pos_Y;
  253. + XYZ.Z = *(cmsFloat64Number*)pos_Z;
  255. - XYZ.X = Pt[0];
  256. - XYZ.Y = Pt[Stride];
  257. - XYZ.Z = Pt[Stride*2];
  258. cmsFloat2XYZEncoded(wIn, &XYZ);
  260. return accum + sizeof(cmsFloat64Number);
  261. @@ -863,12 +880,19 @@ cmsUInt8Number* UnrollXYZFloatTo16(regis
  262. {
  263. if (T_PLANAR(info -> InputFormat)) {
  265. - cmsFloat32Number* Pt = (cmsFloat32Number*) accum;
  266. cmsCIEXYZ XYZ;
  267. + cmsUInt8Number* pos_X;
  268. + cmsUInt8Number* pos_Y;
  269. + cmsUInt8Number* pos_Z;
  270. +
  271. + pos_X = accum;
  272. + pos_Y = accum + Stride;
  273. + pos_Z = accum + Stride * 2;
  274. +
  275. + XYZ.X = *(cmsFloat32Number*)pos_X;
  276. + XYZ.Y = *(cmsFloat32Number*)pos_Y;
  277. + XYZ.Z = *(cmsFloat32Number*)pos_Z;
  279. - XYZ.X = Pt[0];
  280. - XYZ.Y = Pt[Stride];
  281. - XYZ.Z = Pt[Stride*2];
  282. cmsFloat2XYZEncoded(wIn, &XYZ);
  284. return accum + sizeof(cmsFloat32Number);
  285. @@ -913,6 +937,20 @@ cmsINLINE cmsBool IsInkSpace(cmsUInt32Nu
  286. }
  287. }
  289. +// Return the size in bytes of a given formatter
  290. +static
  291. +cmsUInt32Number PixelSize(cmsUInt32Number Format)
  292. +{
  293. + cmsUInt32Number fmt_bytes = T_BYTES(Format);
  294. +
  295. + // For double, the T_BYTES field is zero
  296. + if (fmt_bytes == 0)
  297. + return sizeof(cmsUInt64Number);
  298. +
  299. + // Otherwise, it is already correct for all formats
  300. + return fmt_bytes;
  301. +}
  302. +
  303. // Inks does come in percentage, remaining cases are between 0..1.0, again to 16 bits
  304. static
  305. cmsUInt8Number* UnrollDoubleTo16(register _cmsTRANSFORM* info,
  306. @@ -934,6 +972,8 @@ cmsUInt8Number* UnrollDoubleTo16(registe
  307. cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 655.35 : 65535.0;
  310. + Stride /= PixelSize(info->InputFormat);
  311. +
  312. if (ExtraFirst)
  313. start = Extra;
  315. @@ -989,6 +1029,7 @@ cmsUInt8Number* UnrollFloatTo16(register
  316. cmsUInt32Number i, start = 0;
  317. cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 655.35 : 65535.0;
  319. + Stride /= PixelSize(info->InputFormat);
  321. if (ExtraFirst)
  322. start = Extra;
  323. @@ -1065,6 +1106,7 @@ cmsUInt8Number* UnrollFloatsToFloat(_cms
  324. cmsUInt32Number i, start = 0;
  325. cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 100.0F : 1.0F;
  327. + Stride /= PixelSize(info->InputFormat);
  329. if (ExtraFirst)
  330. start = Extra;
  331. @@ -1117,6 +1159,7 @@ cmsUInt8Number* UnrollDoublesToFloat(_cm
  332. cmsUInt32Number i, start = 0;
  333. cmsFloat64Number maximum = IsInkSpace(info ->InputFormat) ? 100.0 : 1.0;
  335. + Stride /= PixelSize(info->InputFormat);
  337. if (ExtraFirst)
  338. start = Extra;
  339. @@ -1162,7 +1205,9 @@ cmsUInt8Number* UnrollLabDoubleToFloat(_
  341. if (T_PLANAR(info -> InputFormat)) {
  343. - wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1
  344. + Stride /= PixelSize(info->InputFormat);
  345. +
  346. + wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1
  347. wIn[1] = (cmsFloat32Number) ((Pt[Stride] + 128) / 255.0); // form -128..+127 to 0..1
  348. wIn[2] = (cmsFloat32Number) ((Pt[Stride*2] + 128) / 255.0);
  350. @@ -1190,6 +1235,8 @@ cmsUInt8Number* UnrollLabFloatToFloat(_c
  352. if (T_PLANAR(info -> InputFormat)) {
  354. + Stride /= PixelSize(info->InputFormat);
  355. +
  356. wIn[0] = (cmsFloat32Number) (Pt[0] / 100.0); // from 0..100 to 0..1
  357. wIn[1] = (cmsFloat32Number) ((Pt[Stride] + 128) / 255.0); // form -128..+127 to 0..1
  358. wIn[2] = (cmsFloat32Number) ((Pt[Stride*2] + 128) / 255.0);
  359. @@ -1220,6 +1267,8 @@ cmsUInt8Number* UnrollXYZDoubleToFloat(_
  361. if (T_PLANAR(info -> InputFormat)) {
  363. + Stride /= PixelSize(info->InputFormat);
  364. +
  365. wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ);
  366. wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ);
  367. wIn[2] = (cmsFloat32Number) (Pt[Stride*2] / MAX_ENCODEABLE_XYZ);
  368. @@ -1247,6 +1296,8 @@ cmsUInt8Number* UnrollXYZFloatToFloat(_c
  370. if (T_PLANAR(info -> InputFormat)) {
  372. + Stride /= PixelSize(info->InputFormat);
  373. +
  374. wIn[0] = (cmsFloat32Number) (Pt[0] / MAX_ENCODEABLE_XYZ);
  375. wIn[1] = (cmsFloat32Number) (Pt[Stride] / MAX_ENCODEABLE_XYZ);
  376. wIn[2] = (cmsFloat32Number) (Pt[Stride*2] / MAX_ENCODEABLE_XYZ);
  377. @@ -1429,7 +1480,7 @@ cmsUInt8Number* PackPlanarWords(register
  378. cmsUInt16Number v;
  380. if (DoSwap) {
  381. - output += T_EXTRA(info -> OutputFormat) * Stride * sizeof(cmsUInt16Number);
  382. + output += T_EXTRA(info -> OutputFormat) * Stride;
  383. }
  385. for (i=0; i < nChan; i++) {
  386. @@ -1445,7 +1496,7 @@ cmsUInt8Number* PackPlanarWords(register
  387. v = REVERSE_FLAVOR_16(v);
  389. *(cmsUInt16Number*) output = v;
  390. - output += (Stride * sizeof(cmsUInt16Number));
  391. + output += Stride;
  392. }
  394. return (Init + sizeof(cmsUInt16Number));
  395. @@ -2297,6 +2348,8 @@ cmsUInt8Number* PackLabFloatFrom16(regis
  397. cmsFloat32Number* Out = (cmsFloat32Number*) output;
  399. + Stride /= PixelSize(info->OutputFormat);
  400. +
  401. Out[0] = (cmsFloat32Number)Lab.L;
  402. Out[Stride] = (cmsFloat32Number)Lab.a;
  403. Out[Stride*2] = (cmsFloat32Number)Lab.b;
  404. @@ -2325,6 +2378,8 @@ cmsUInt8Number* PackXYZDoubleFrom16(regi
  405. cmsFloat64Number* Out = (cmsFloat64Number*) output;
  406. cmsXYZEncoded2Float(&XYZ, wOut);
  408. + Stride /= PixelSize(Info->OutputFormat);
  409. +
  410. Out[0] = XYZ.X;
  411. Out[Stride] = XYZ.Y;
  412. Out[Stride*2] = XYZ.Z;
  413. @@ -2352,6 +2407,8 @@ cmsUInt8Number* PackXYZFloatFrom16(regis
  414. cmsFloat32Number* Out = (cmsFloat32Number*) output;
  415. cmsXYZEncoded2Float(&XYZ, wOut);
  417. + Stride /= PixelSize(Info->OutputFormat);
  418. +
  419. Out[0] = (cmsFloat32Number) XYZ.X;
  420. Out[Stride] = (cmsFloat32Number) XYZ.Y;
  421. Out[Stride*2] = (cmsFloat32Number) XYZ.Z;
  422. @@ -2391,6 +2448,8 @@ cmsUInt8Number* PackDoubleFrom16(registe
  423. cmsFloat64Number* swap1 = (cmsFloat64Number*) output;
  424. cmsUInt32Number i, start = 0;
  426. + Stride /= PixelSize(info->OutputFormat);
  427. +
  428. if (ExtraFirst)
  429. start = Extra;
  431. @@ -2442,6 +2501,8 @@ cmsUInt8Number* PackFloatFrom16(register
  432. cmsFloat32Number* swap1 = (cmsFloat32Number*)output;
  433. cmsUInt32Number i, start = 0;
  435. + Stride /= PixelSize(info->OutputFormat);
  436. +
  437. if (ExtraFirst)
  438. start = Extra;
  440. @@ -2495,6 +2556,8 @@ cmsUInt8Number* PackFloatsFromFloat(_cms
  441. cmsFloat64Number v = 0;
  442. cmsUInt32Number i, start = 0;
  444. + Stride /= PixelSize(info->OutputFormat);
  445. +
  446. if (ExtraFirst)
  447. start = Extra;
  449. @@ -2544,6 +2607,8 @@ cmsUInt8Number* PackDoublesFromFloat(_cm
  450. cmsFloat64Number* swap1 = (cmsFloat64Number*)output;
  451. cmsUInt32Number i, start = 0;
  453. + Stride /= PixelSize(info->OutputFormat);
  454. +
  455. if (ExtraFirst)
  456. start = Extra;
  458. @@ -2590,6 +2655,8 @@ cmsUInt8Number* PackLabFloatFromFloat(_c
  460. if (T_PLANAR(Info -> OutputFormat)) {
  462. + Stride /= PixelSize(Info->OutputFormat);
  463. +
  464. Out[0] = (cmsFloat32Number) (wOut[0] * 100.0);
  465. Out[Stride] = (cmsFloat32Number) (wOut[1] * 255.0 - 128.0);
  466. Out[Stride*2] = (cmsFloat32Number) (wOut[2] * 255.0 - 128.0);
  467. @@ -2618,6 +2685,8 @@ cmsUInt8Number* PackLabDoubleFromFloat(_
  469. if (T_PLANAR(Info -> OutputFormat)) {
  471. + Stride /= PixelSize(Info->OutputFormat);
  472. +
  473. Out[0] = (cmsFloat64Number) (wOut[0] * 100.0);
  474. Out[Stride] = (cmsFloat64Number) (wOut[1] * 255.0 - 128.0);
  475. Out[Stride*2] = (cmsFloat64Number) (wOut[2] * 255.0 - 128.0);
  476. @@ -2647,6 +2716,8 @@ cmsUInt8Number* PackXYZFloatFromFloat(_c
  478. if (T_PLANAR(Info -> OutputFormat)) {
  480. + Stride /= PixelSize(Info->OutputFormat);
  481. +
  482. Out[0] = (cmsFloat32Number) (wOut[0] * MAX_ENCODEABLE_XYZ);
  483. Out[Stride] = (cmsFloat32Number) (wOut[1] * MAX_ENCODEABLE_XYZ);
  484. Out[Stride*2] = (cmsFloat32Number) (wOut[2] * MAX_ENCODEABLE_XYZ);
  485. @@ -2675,6 +2746,8 @@ cmsUInt8Number* PackXYZDoubleFromFloat(_
  487. if (T_PLANAR(Info -> OutputFormat)) {
  489. + Stride /= PixelSize(Info->OutputFormat);
  490. +
  491. Out[0] = (cmsFloat64Number) (wOut[0] * MAX_ENCODEABLE_XYZ);
  492. Out[Stride] = (cmsFloat64Number) (wOut[1] * MAX_ENCODEABLE_XYZ);
  493. Out[Stride*2] = (cmsFloat64Number) (wOut[2] * MAX_ENCODEABLE_XYZ);
  494. @@ -2718,6 +2791,8 @@ cmsUInt8Number* UnrollHalfTo16(register
  495. cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 655.35F : 65535.0F;
  498. + Stride /= PixelSize(info->OutputFormat);
  499. +
  500. if (ExtraFirst)
  501. start = Extra;
  503. @@ -2769,6 +2844,7 @@ cmsUInt8Number* UnrollHalfToFloat(_cmsTR
  504. cmsUInt32Number i, start = 0;
  505. cmsFloat32Number maximum = IsInkSpace(info ->InputFormat) ? 100.0F : 1.0F;
  507. + Stride /= PixelSize(info->OutputFormat);
  509. if (ExtraFirst)
  510. start = Extra;
  511. @@ -2820,6 +2896,8 @@ cmsUInt8Number* PackHalfFrom16(register
  512. cmsUInt16Number* swap1 = (cmsUInt16Number*)output;
  513. cmsUInt32Number i, start = 0;
  515. + Stride /= PixelSize(info->OutputFormat);
  516. +
  517. if (ExtraFirst)
  518. start = Extra;
  520. @@ -2871,6 +2949,8 @@ cmsUInt8Number* PackHalfFromFloat(_cmsTR
  521. cmsFloat32Number v = 0;
  522. cmsUInt32Number i, start = 0;
  524. + Stride /= PixelSize(info->OutputFormat);
  525. +
  526. if (ExtraFirst)
  527. start = Extra;
  529. @@ -3288,10 +3368,10 @@ cmsBool _cmsRegisterFormattersPlugin(cm
  530. return TRUE;
  531. }
  533. -cmsFormatter _cmsGetFormatter(cmsContext ContextID,
  534. - cmsUInt32Number Type, // Specific type, i.e. TYPE_RGB_8
  535. - cmsFormatterDirection Dir,
  536. - cmsUInt32Number dwFlags)
  537. +cmsFormatter CMSEXPORT _cmsGetFormatter(cmsContext ContextID,
  538. + cmsUInt32Number Type, // Specific type, i.e. TYPE_RGB_8
  539. + cmsFormatterDirection Dir,
  540. + cmsUInt32Number dwFlags)
  541. {
  542. _cmsFormattersPluginChunkType* ctx = ( _cmsFormattersPluginChunkType*) _cmsContextGetClientChunk(ContextID, FormattersPlugin);
  543. cmsFormattersFactoryList* f;
  544. diff -pruN lcms2-2.9.orig/src/lcms2_internal.h lcms2-2.9/src/lcms2_internal.h
  545. --- lcms2-2.9.orig/src/lcms2_internal.h 2017-11-01 02:36:47.000000000 +1100
  546. +++ lcms2-2.9/src/lcms2_internal.h 2017-11-13 04:15:10.000000000 +1100
  547. @@ -180,13 +180,14 @@ cmsINLINE cmsUInt16Number _cmsQuickSatur
  548. return _cmsQuickFloorWord(d);
  549. }
  551. +// Test bed entry points---------------------------------------------------------------
  552. +#define CMSCHECKPOINT CMSAPI
  554. // Pthread support --------------------------------------------------------------------
  555. #ifndef CMS_NO_PTHREADS
  557. // This is the threading support. Unfortunately, it has to be platform-dependent because
  558. // windows does not support pthreads.
  559. -
  560. #ifdef CMS_IS_WINDOWS_
  562. #define WIN32_LEAN_AND_MEAN 1
  563. @@ -823,10 +824,10 @@ void _cmsTagSignature2St
  565. // Interpolation ---------------------------------------------------------------------------------------------------------
  567. -cmsInterpParams* _cmsComputeInterpParams(cmsContext ContextID, cmsUInt32Number nSamples, cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags);
  568. -cmsInterpParams* _cmsComputeInterpParamsEx(cmsContext ContextID, const cmsUInt32Number nSamples[], cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags);
  569. -void _cmsFreeInterpParams(cmsInterpParams* p);
  570. -cmsBool _cmsSetInterpolationRoutine(cmsContext ContextID, cmsInterpParams* p);
  571. +CMSCHECKPOINT cmsInterpParams* CMSEXPORT _cmsComputeInterpParams(cmsContext ContextID, cmsUInt32Number nSamples, cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags);
  572. +cmsInterpParams* _cmsComputeInterpParamsEx(cmsContext ContextID, const cmsUInt32Number nSamples[], cmsUInt32Number InputChan, cmsUInt32Number OutputChan, const void* Table, cmsUInt32Number dwFlags);
  573. +CMSCHECKPOINT void CMSEXPORT _cmsFreeInterpParams(cmsInterpParams* p);
  574. +cmsBool _cmsSetInterpolationRoutine(cmsContext ContextID, cmsInterpParams* p);
  576. // Curves ----------------------------------------------------------------------------------------------------------------
  578. @@ -876,20 +877,20 @@ struct _cmsStage_struct {
  581. // Special Stages (cannot be saved)
  582. -cmsStage* _cmsStageAllocLab2XYZ(cmsContext ContextID);
  583. -cmsStage* _cmsStageAllocXYZ2Lab(cmsContext ContextID);
  584. -cmsStage* _cmsStageAllocLabPrelin(cmsContext ContextID);
  585. -cmsStage* _cmsStageAllocLabV2ToV4(cmsContext ContextID);
  586. -cmsStage* _cmsStageAllocLabV2ToV4curves(cmsContext ContextID);
  587. -cmsStage* _cmsStageAllocLabV4ToV2(cmsContext ContextID);
  588. -cmsStage* _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS);
  589. -cmsStage* _cmsStageAllocIdentityCurves(cmsContext ContextID, cmsUInt32Number nChannels);
  590. -cmsStage* _cmsStageAllocIdentityCLut(cmsContext ContextID, cmsUInt32Number nChan);
  591. -cmsStage* _cmsStageNormalizeFromLabFloat(cmsContext ContextID);
  592. -cmsStage* _cmsStageNormalizeFromXyzFloat(cmsContext ContextID);
  593. -cmsStage* _cmsStageNormalizeToLabFloat(cmsContext ContextID);
  594. -cmsStage* _cmsStageNormalizeToXyzFloat(cmsContext ContextID);
  595. -cmsStage* _cmsStageClipNegatives(cmsContext ContextID, cmsUInt32Number nChannels);
  596. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocLab2XYZ(cmsContext ContextID);
  597. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocXYZ2Lab(cmsContext ContextID);
  598. +cmsStage* _cmsStageAllocLabPrelin(cmsContext ContextID);
  599. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocLabV2ToV4(cmsContext ContextID);
  600. +cmsStage* _cmsStageAllocLabV2ToV4curves(cmsContext ContextID);
  601. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocLabV4ToV2(cmsContext ContextID);
  602. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocNamedColor(cmsNAMEDCOLORLIST* NamedColorList, cmsBool UsePCS);
  603. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocIdentityCurves(cmsContext ContextID, cmsUInt32Number nChannels);
  604. +CMSCHECKPOINT cmsStage* CMSEXPORT _cmsStageAllocIdentityCLut(cmsContext ContextID, cmsUInt32Number nChan);
  605. +cmsStage* _cmsStageNormalizeFromLabFloat(cmsContext ContextID);
  606. +cmsStage* _cmsStageNormalizeFromXyzFloat(cmsContext ContextID);
  607. +cmsStage* _cmsStageNormalizeToLabFloat(cmsContext ContextID);
  608. +cmsStage* _cmsStageNormalizeToXyzFloat(cmsContext ContextID);
  609. +cmsStage* _cmsStageClipNegatives(cmsContext ContextID, cmsUInt32Number nChannels);
  612. // For curve set only
  613. @@ -924,9 +925,9 @@ struct _cmsPipeline_struct {
  614. // Read tags using low-level function, provide necessary glue code to adapt versions, etc. All those return a brand new copy
  615. // of the LUTS, since ownership of original is up to the profile. The user should free allocated resources.
  617. -cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
  618. -cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
  619. -cmsPipeline* _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
  620. +CMSCHECKPOINT cmsPipeline* CMSEXPORT _cmsReadInputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
  621. +CMSCHECKPOINT cmsPipeline* CMSEXPORT _cmsReadOutputLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
  622. +CMSCHECKPOINT cmsPipeline* CMSEXPORT _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, cmsUInt32Number Intent);
  624. // Special values
  625. cmsBool _cmsReadMediaWhitePoint(cmsCIEXYZ* Dest, cmsHPROFILE hProfile);
  626. @@ -951,7 +952,8 @@ cmsSEQ* _cmsCompileProfileSequence(cmsCo
  628. // LUT optimization ------------------------------------------------------------------------------------------------
  630. -cmsUInt16Number _cmsQuantizeVal(cmsFloat64Number i, cmsUInt32Number MaxSamples);
  631. +CMSCHECKPOINT cmsUInt16Number CMSEXPORT _cmsQuantizeVal(cmsFloat64Number i, cmsUInt32Number MaxSamples);
  632. +
  633. cmsUInt32Number _cmsReasonableGridpointsByColorspace(cmsColorSpaceSignature Colorspace, cmsUInt32Number dwFlags);
  635. cmsBool _cmsEndPointsBySpace(cmsColorSpaceSignature Space,
  636. @@ -985,17 +987,17 @@ cmsPipeline* _cmsCreateGamutCheckPip
  637. cmsBool _cmsFormatterIsFloat(cmsUInt32Number Type);
  638. cmsBool _cmsFormatterIs8bit(cmsUInt32Number Type);
  640. -cmsFormatter _cmsGetFormatter(cmsContext ContextID,
  641. - cmsUInt32Number Type, // Specific type, i.e. TYPE_RGB_8
  642. - cmsFormatterDirection Dir,
  643. - cmsUInt32Number dwFlags);
  644. +CMSCHECKPOINT cmsFormatter CMSEXPORT _cmsGetFormatter(cmsContext ContextID,
  645. + cmsUInt32Number Type, // Specific type, i.e. TYPE_RGB_8
  646. + cmsFormatterDirection Dir,
  647. + cmsUInt32Number dwFlags);
  650. #ifndef CMS_NO_HALF_SUPPORT
  652. // Half float
  653. -cmsFloat32Number _cmsHalf2Float(cmsUInt16Number h);
  654. -cmsUInt16Number _cmsFloat2Half(cmsFloat32Number flt);
  655. +CMSCHECKPOINT cmsFloat32Number CMSEXPORT _cmsHalf2Float(cmsUInt16Number h);
  656. +CMSCHECKPOINT cmsUInt16Number CMSEXPORT _cmsFloat2Half(cmsFloat32Number flt);
  658. #endif
  660. diff -pruN lcms2-2.9.orig/testbed/testcms2.c lcms2-2.9/testbed/testcms2.c
  661. --- lcms2-2.9.orig/testbed/testcms2.c 2017-11-01 02:36:47.000000000 +1100
  662. +++ lcms2-2.9/testbed/testcms2.c 2017-11-13 04:15:10.000000000 +1100
  663. @@ -3813,9 +3813,9 @@ void CheckSingleFormatter16(cmsContext i
  664. Values[i] <<= 8;
  665. }
  667. - b.Fmt16(&info, Values, Buffer, 1);
  668. + b.Fmt16(&info, Values, Buffer, 2);
  669. memset(Values, 0, sizeof(Values));
  670. - f.Fmt16(&info, Values, Buffer, 1);
  671. + f.Fmt16(&info, Values, Buffer, 2);
  673. for (i=0; i < nChannels; i++) {
  674. if (bytes == 1)
  675.  
Powered by spacepaste. Paste removal.