Skip to content

8348110: Update LCMS to 2.17 #680

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: pr/679
Choose a base branch
from
Draft

8348110: Update LCMS to 2.17 #680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions THIRD_PARTY_README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1725,14 +1725,14 @@ THE SOFTWARE.

-------------------------------------------------------------------------------

%% This notice is provided with respect to Little CMS 2.16, which may be
%% This notice is provided with respect to Little CMS 2.17, which may be
included with JRE 8, JDK 8, and OpenJDK 8.

--- begin of LICENSE ---

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 @@ -1753,10 +1753,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 @@ -1823,6 +1823,7 @@ Christian Albrecht
Dimitrios Anastassakis
Lemke Software
Tim Zaman
Amir Montazery and Open Source Technology Improvement Fund (ostif.org), Google, for fuzzer fundings.

--- end of LICENSE ---

Expand Down
10 changes: 5 additions & 5 deletions jdk/src/share/native/sun/java2d/cmm/lcms/cmsalpha.c
View file
Open in desktop
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 jdk/src/share/native/sun/java2d/cmm/lcms/cmscam02.c
View file
Open in desktop
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