8297089: [BACKOUT] JDK-8297088 Update LCMS to 2.14

Reviewed-by: dholmes

Author: Daniel D. Daugherty

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

@@ -1,107 +1,27 @@
-## Little Color Management System (LCMS) v2.14
+## Little Color Management System (LCMS) v2.12
 
 ### LCMS License
 <pre>
 
-README.1ST file information
-
-LittleCMS core is released under MIT License
-
----------------------------------
-
-Little CMS
-Copyright (c) 1998-2022 Marti Maria Saguer
+Little Color Management System
+Copyright (c) 1998-2020 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"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject
-to the following conditions:
+a copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION 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:
-liblcms/cmssm.c
-
-Copyright 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.
-SoftSurfer makes no warranty for this code, and cannot be held
-liable for any real or imagined damage resulting from its use.
-Users of this code must verify correctness for their application.
-
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 </pre>
-
-### AUTHORS File Information
-```
-
-Main Author
-------------
-Marti Maria
-
-
-Contributors
-------------
-Bob Friesenhahn
-Kai-Uwe Behrmann
-Stuart Nixon
-Jordi Vilar
-Richard Hughes
-Auke Nauta
-Chris Evans (Google)
-Lorenzo Ridolfi
-Robin Watts (Artifex)
-Shawn Pedersen
-Andrew Brygin
-Samuli Suominen
-Florian Hˆch
-Aurelien Jarno
-Claudiu Cebuc
-Michael Vhrel (Artifex)
-Michal Cihar
-Daniel Kaneider
-Mateusz Jurczyk (Google)
-Paul Miller
-SÈbastien LÈon
-Christian Schmitz
-XhmikosR
-Stanislav Brabec (SuSe)
-Leonhard Gruenschloss (Google)
-Patrick Noffke
-Christopher James Halse Rogers
-John Hein
-Thomas Weber (Debian)
-Mark Allen
-Noel Carboni
-Sergei Trofimovic
-Philipp Knechtges
-
-Special Thanks
---------------
-Artifex software
-AlienSkin software
-Jan Morovic
-Jos Vernon (WebSupergoo)
-Harald Schneider (Maxon)
-Christian Albrecht
-Dimitrios Anastassakis
-Lemke Software
-Tim Zaman
-
-
-```

src/java.desktop/share/native/liblcms/UPDATING.txt

@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2022 Marti Maria Saguer
+//  Copyright (c) 1998-2020 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"),
@@ -220,21 +220,21 @@ static
 void fromFLTto8(void* dst, const void* src)
 {
     cmsFloat32Number n = *(cmsFloat32Number*)src;
-    *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0);
+    *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f);
 }
 
 static
 void fromFLTto16(void* dst, const void* src)
 {
     cmsFloat32Number n = *(cmsFloat32Number*)src;
-    *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0);
+    *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f);
 }
 
 static
 void fromFLTto16SE(void* dst, const void* src)
 {
     cmsFloat32Number n = *(cmsFloat32Number*)src;
-    cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0);
+    cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0f);
 
     *(cmsUInt16Number*)dst = CHANGE_ENDIAN(i);
 }
@@ -272,7 +272,7 @@ void fromHLFto8(void* dst, const void* src)
 {
 #ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src);
-       *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0);
+       *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f);
 #else
     cmsUNUSED_PARAMETER(dst);
     cmsUNUSED_PARAMETER(src);
@@ -285,7 +285,7 @@ void fromHLFto16(void* dst, const void* src)
 {
 #ifndef CMS_NO_HALF_SUPPORT
        cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src);
-       *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0);
+       *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f);
 #else
     cmsUNUSED_PARAMETER(dst);
     cmsUNUSED_PARAMETER(src);
@@ -297,7 +297,7 @@ void fromHLFto16SE(void* dst, const void* src)
 {
 #ifndef CMS_NO_HALF_SUPPORT
     cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src);
-    cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0);
+    cmsUInt16Number i = _cmsQuickSaturateWord(n * 65535.0f);
     *(cmsUInt16Number*)dst = CHANGE_ENDIAN(i);
 #else
     cmsUNUSED_PARAMETER(dst);
@@ -443,9 +443,9 @@ void ComputeIncrementsForChunky(cmsUInt32Number Format,
        cmsUInt32Number channelSize = trueBytesSize(Format);
        cmsUInt32Number pixelSize = channelSize * total_chans;
 
-       // Sanity check
-       if (total_chans <= 0 || total_chans >= cmsMAXCHANNELS)
-           return;
+           // Sanity check
+           if (total_chans <= 0 || total_chans >= cmsMAXCHANNELS)
+                   return;
 
         memset(channels, 0, sizeof(channels));
 

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

@@ -30,7 +30,7 @@
 //---------------------------------------------------------------------------------
 //
 //  Little Color Management System
-//  Copyright (c) 1998-2022 Marti Maria Saguer
+//  Copyright (c) 1998-2020 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"),