Skip to content

Commit 398ba91

Browse files
committed
8348110: Update LCMS to 2.17
Backport-of: 763ee0a7e5bb6e9bdbf739e886d7c47bb28ea2b0
1 parent 276a157 commit 398ba91

30 files changed

+451
-176
lines changed

src/java.desktop/share/legal/lcms.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
## Little Color Management System (LCMS) v2.16
1+
## Little Color Management System (LCMS) v2.17
22

33
### LCMS License
44
<pre>
55

66
MIT License
77

8-
Copyright (C) 1998-2023 Marti Maria Saguer
8+
Copyright (C) 1998-2025 Marti Maria Saguer
99

1010
Permission is hereby granted, free of charge, to any person obtaining
1111
a copy of this software and associated documentation files (the "Software"),
@@ -26,10 +26,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
2626
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
2727

2828
---------------------------------
29-
The below license applies to the following files:
29+
The below applies to the following file(s):
3030
liblcms/cmssm.c
3131

32-
Copyright 2001, softSurfer (www.softsurfer.com)
32+
Copyright (C) 2001, softSurfer (www.softsurfer.com)
3333

3434
This code may be freely used and modified for any purpose
3535
providing that this copyright notice is included with it.
@@ -99,5 +99,5 @@ Christian Albrecht
9999
Dimitrios Anastassakis
100100
Lemke Software
101101
Tim Zaman
102-
103-
```
102+
Amir Montazery and Open Source Technology Improvement Fund (ostif.org), Google, for fuzzer fundings.
103+
```

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//---------------------------------------------------------------------------------
3131
//
3232
// Little Color Management System
33-
// Copyright (c) 1998-2023 Marti Maria Saguer
33+
// Copyright (c) 1998-2024 Marti Maria Saguer
3434
//
3535
// Permission is hereby granted, free of charge, to any person obtaining
3636
// a copy of this software and associated documentation files (the "Software"),
@@ -612,8 +612,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in,
612612
cmsUInt8Number* SourcePtr;
613613
cmsUInt8Number* DestPtr;
614614

615-
cmsUInt32Number SourceStrideIncrement = 0;
616-
cmsUInt32Number DestStrideIncrement = 0;
615+
size_t SourceStrideIncrement = 0;
616+
size_t DestStrideIncrement = 0;
617617

618618
// The loop itself
619619
for (i = 0; i < LineCount; i++) {
@@ -640,8 +640,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in,
640640
cmsUInt8Number* SourcePtr[cmsMAXCHANNELS];
641641
cmsUInt8Number* DestPtr[cmsMAXCHANNELS];
642642

643-
cmsUInt32Number SourceStrideIncrements[cmsMAXCHANNELS];
644-
cmsUInt32Number DestStrideIncrements[cmsMAXCHANNELS];
643+
size_t SourceStrideIncrements[cmsMAXCHANNELS];
644+
size_t DestStrideIncrements[cmsMAXCHANNELS];
645645

646646
memset(SourceStrideIncrements, 0, sizeof(SourceStrideIncrements));
647647
memset(DestStrideIncrements, 0, sizeof(DestStrideIncrements));

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
//---------------------------------------------------------------------------------
3131
//
3232
// Little Color Management System
33-
// Copyright (c) 1998-2023 Marti Maria Saguer
33+
// Copyright (c) 1998-2024 Marti Maria Saguer
3434
//
3535
// Permission is hereby granted, free of charge, to any person obtaining
3636
// a copy of this software and associated documentation files (the "Software"),
@@ -117,17 +117,16 @@ cmsFloat64Number computeFL(cmsCIECAM02* pMod)
117117
return FL;
118118
}
119119

120-
static
121-
cmsFloat64Number computeD(cmsCIECAM02* pMod)
120+
static cmsFloat64Number computeD(cmsCIECAM02* pMod)
122121
{
123-
cmsFloat64Number D;
122+
cmsFloat64Number D, temp;
124123

125-
D = pMod->F - (1.0/3.6)*(exp(((-pMod ->LA-42) / 92.0)));
124+
temp = 1.0 - ((1.0 / 3.6) * exp((-pMod->LA - 42) / 92.0));
126125

126+
D = pMod->F * temp;
127127
return D;
128128
}
129129

130-
131130
static
132131
CAM02COLOR XYZtoCAT02(CAM02COLOR clr)
133132
{

0 commit comments

Comments
 (0)