Skip to content

Commit

Permalink
8348110: Update LCMS to 2.17
Browse files Browse the repository at this point in the history
Reviewed-by: honkar, prr, dnguyen
  • Loading branch information
Alisen Chung committed Mar 6, 2025
1 parent 0892913 commit a23fb0a
Show file tree
Hide file tree
Showing 30 changed files with 451 additions and 176 deletions.
12 changes: 6 additions & 6 deletions src/java.desktop/share/legal/lcms.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Little Color Management System (LCMS) v2.16
## Little Color Management System (LCMS) v2.17

### LCMS License
<pre>

MIT License

Copyright (C) 1998-2023 Marti Maria Saguer
Copyright (C) 1998-2025 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"),
Expand All @@ -26,10 +26,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

---------------------------------
The below license applies to the following files:
The below applies to the following file(s):
liblcms/cmssm.c

Copyright 2001, softSurfer (www.softsurfer.com)
Copyright (C) 2001, softSurfer (www.softsurfer.com)

This code may be freely used and modified for any purpose
providing that this copyright notice is included with it.
Expand Down Expand Up @@ -99,5 +99,5 @@ Christian Albrecht
Dimitrios Anastassakis
Lemke Software
Tim Zaman
```
Amir Montazery and Open Source Technology Improvement Fund (ostif.org), Google, for fuzzer fundings.
```
10 changes: 5 additions & 5 deletions src/java.desktop/share/native/liblcms/cmsalpha.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
//---------------------------------------------------------------------------------
//
// Little Color Management System
// Copyright (c) 1998-2023 Marti Maria Saguer
// Copyright (c) 1998-2024 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"),
Expand Down Expand Up @@ -612,8 +612,8 @@ void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in,
cmsUInt8Number* SourcePtr;
cmsUInt8Number* DestPtr;

cmsUInt32Number SourceStrideIncrement = 0;
cmsUInt32Number DestStrideIncrement = 0;
size_t SourceStrideIncrement = 0;
size_t DestStrideIncrement = 0;

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

cmsUInt32Number SourceStrideIncrements[cmsMAXCHANNELS];
cmsUInt32Number DestStrideIncrements[cmsMAXCHANNELS];
size_t SourceStrideIncrements[cmsMAXCHANNELS];
size_t DestStrideIncrements[cmsMAXCHANNELS];

memset(SourceStrideIncrements, 0, sizeof(SourceStrideIncrements));
memset(DestStrideIncrements, 0, sizeof(DestStrideIncrements));
Expand Down
11 changes: 5 additions & 6 deletions src/java.desktop/share/native/liblcms/cmscam02.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
//---------------------------------------------------------------------------------
//
// Little Color Management System
// Copyright (c) 1998-2023 Marti Maria Saguer
// Copyright (c) 1998-2024 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"),
Expand Down Expand Up @@ -117,17 +117,16 @@ cmsFloat64Number computeFL(cmsCIECAM02* pMod)
return FL;
}

static
cmsFloat64Number computeD(cmsCIECAM02* pMod)
static cmsFloat64Number computeD(cmsCIECAM02* pMod)
{
cmsFloat64Number D;
cmsFloat64Number D, temp;

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

D = pMod->F * temp;
return D;
}


static
CAM02COLOR XYZtoCAT02(CAM02COLOR clr)
{
Expand Down
Loading

1 comment on commit a23fb0a

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.