Merge from origin/emacs-26

96aaeaaffa ; * src/lcms.c: Minor stylistic changes in comments.
c3df816585 Fix compilation warning in etags.c
5490ccc5eb Add lisp variable lcms-d65-xyz
dee96f4a17 * lisp/emacs-lisp/cl-macs.el (cl-letf): Fix Edebug spec (b...
12e864eb30 Avoid MinGW64 compiler warnings in unexw32.c
625cee5316 Start emacs-26 release branch

# Conflicts:
#	README
#	configure.ac
#	msdos/sed2v2.inp
#	nt/README.W32

1 files changed, 19 insertions, 0 deletions

diff --git a/test/src/lcms-tests.el b/test/src/lcms-tests.el
index 74648e1979e..962902eb100 100644
--- a/test/src/lcms-tests.el
+++ b/test/src/lcms-tests.el
@@ -33,6 +33,9 @@
 (require 'ert)
 (require 'color)
 
+(defconst lcms-colorspacious-d65 '(0.95047 1.0 1.08883)
+  "D65 white point from colorspacious.")
+
 (defun lcms-approx-p (a b &optional delta)
   "Check if A and B are within relative error DELTA of one another.
 B is considered the exact value."
@@ -46,6 +49,22 @@ B is considered the exact value."
         (lcms-approx-p a2 b2 delta)
         (lcms-approx-p a3 b3 delta))))
 
+(ert-deftest lcms-cri-cam02-ucs ()
+  "Test use of `lcms-cam02-ucs'."
+  (should-error (lcms-cam02-ucs '(0 0 0) '(0 0 0) "error"))
+  (should-error (lcms-cam02-ucs '(0 0 0) 'error))
+  (should-not
+   (lcms-approx-p
+    (let ((lcms-d65-xyz '(0.44757 1.0 0.40745)))
+      (lcms-cam02-ucs '(0.5 0.5 0.5) '(0 0 0)))
+    (lcms-cam02-ucs '(0.5 0.5 0.5) '(0 0 0))))
+  (should (eql 0.0 (lcms-cam02-ucs '(0.5 0.5 0.5) '(0.5 0.5 0.5))))
+  (should
+   (lcms-approx-p (lcms-cam02-ucs lcms-colorspacious-d65
+                                  '(0 0 0)
+                                  lcms-colorspacious-d65)
+                  100.0)))
+
 (ert-deftest lcms-whitepoint ()
   "Test use of `lcms-temp->white-point'."
   (skip-unless (featurep 'lcms2))