Skip to content
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

Jump to bottom

Handle invalid color channel values from pl/color-xyz-to-apply-rgb #171

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle invalid color channel values from pl/color-xyz-to-apply-rgb #171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bc26b2
`pl/color-xyz-to-apple-rgb`: handle NaN
schellj Aug 5, 2019
2bb7d80
`pl/color-xyz-to-apple-rgb`: clip values outside of 0.0 - 1.0
schellj Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion powerline-separators.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,17 @@ COLOR1 and COLOR2 must be supplied as hex strings with a leading #."
(blue (/ (+ (nth 2 c1) (nth 2 c2)) 2)))
(color-rgb-to-hex red green blue)))

(defun pl/apply-apple-gamma (V)
"Apply Apple gamma correction to sRGB' value V"
(setq V (min 1.0 (max 0.0 (expt V (/ 1.8)))))
(if (isnan V) 0.0 V))

(defun pl/color-xyz-to-apple-rgb (X Y Z)
"Convert CIE X Y Z colors to Apple RGB color space."
(let ((r (+ (* 3.2404542 X) (* -1.5371385 Y) (* -0.4985314 Z)))
(g (+ (* -0.9692660 X) (* 1.8760108 Y) (* 0.0415560 Z)))
(b (+ (* 0.0556434 X) (* -0.2040259 Y) (* 1.0572252 Z))))
(list (expt r (/ 1.8)) (expt g (/ 1.8)) (expt b (/ 1.8)))))
(mapcar 'pl/apply-apple-gamma (list r g b))))

(defun pl/color-srgb-to-apple-rgb (red green blue)
"Convert RED GREEN BLUE colors from sRGB color space to Apple RGB.
Expand Down