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

Add conversions to and from Oklab and LCHOklab #518

Closed
wants to merge 4 commits into from
Closed

Add conversions to and from Oklab and LCHOklab #518

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac37484
add conversions for Oklab
nealmckee Jan 1, 2022
2758f2c
fix conversion to Oklab
nealmckee Jan 2, 2022
63372fd
fix incorrect type assertion
nealmckee Jan 2, 2022
9ed2a8e
fix swapped conversion matrices
nealmckee Jan 2, 2022
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
49 changes: 48 additions & 1 deletion src/conversions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ end
# To avoid stack overflow, the source types which do not support direct or
# indirect conversion to RGB should be rejected.
cnvt(::Type{CV}, c::Union{LMS, xyY} ) where {CV<:AbstractRGB} = cnvt(CV, cnvt(XYZ{eltype(c)}, c))
cnvt(::Type{CV}, c::Union{Lab, Luv, LCHab, LCHuv}) where {CV<:AbstractRGB} = cnvt(CV, cnvt(XYZ{eltype(c)}, c))
cnvt(::Type{CV}, c::Union{Lab, Luv, Oklab, LCHab, LCHuv, LCHOklab}) where {CV<:AbstractRGB} = cnvt(CV, cnvt(XYZ{eltype(c)}, c))
cnvt(::Type{CV}, c::Union{DIN99d, DIN99o, DIN99} ) where {CV<:AbstractRGB} = cnvt(CV, cnvt(XYZ{eltype(c)}, c))
@noinline function cnvt(::Type{CV}, @nospecialize(c::Color)) where {CV<:AbstractRGB}
error("No conversion of ", c, " to ", CV, " has been defined")
Expand Down Expand Up @@ -428,6 +428,13 @@ function cnvt(::Type{XYZ{T}}, c::LMS) where T
@mul3x3 XYZ{T} CAT02_INV c.l c.m c.s
end

function cnvt(::Type{XYZ{T}}, c::Oklab) where T
lms = @mul3x3 LMS{T} LMSP2OKLAB_INV c.l c.a c.b
lmsp = LMS{T}([lms.l, lms.m, lms.s].^3...)
@mul3x3 XYZ{T} XYZ2LMS_OKLAB_INV lmsp.l lmsp.m lmsp.s
end

cnvt(::Type{XYZ{T}}, c::LCHOklab) where {T} = cnvt(XYZ{T}, cnvt(Oklab{T}, c))
cnvt(::Type{XYZ{T}}, c::Union{LCHab, DIN99, DIN99o}) where {T} = cnvt(XYZ{T}, cnvt(Lab{T}, c))
cnvt(::Type{XYZ{T}}, c::LCHuv) where {T} = cnvt(XYZ{T}, cnvt(Luv{T}, c))
cnvt(::Type{XYZ{T}}, c::Color) where {T} = cnvt(XYZ{T}, convert(RGB{T}, c)::RGB{T})
Expand Down Expand Up @@ -571,6 +578,35 @@ end
cnvt(::Type{Luv{T}}, c::Color) where {T} = cnvt(Luv{T}, convert(XYZ{T}, c)::XYZ{T})


# Everything to Oklab
# -----------------

# Matrices from the original definition at https://bottosson.github.io/posts/oklab/
const XYZ2LMS_OKLAB = Mat3x3([ 0.8189330101 0.3618667424 -0.1288597137
0.0329845436 0.9293118715 0.0361456387
0.0482003018 0.2643662691 0.6338517070 ])

const XYZ2LMS_OKLAB_INV = Mat3x3(inv(Float64.(XYZ2LMS_OKLAB)))

const LMSP2OKLAB = Mat3x3([ 0.2104542553 0.7936177850 -0.0040720468
1.9779984951 -2.4285922050 0.4505937099
0.0259040371 0.7827717662 -0.8086757660])

const LMSP2OKLAB_INV = Mat3x3(inv(Float64.(LMSP2OKLAB)))

function cnvt(::Type{Oklab{T}}, c::XYZ) where T
lms = @mul3x3 LMS{T} XYZ2LMS_OKLAB c.x c.y c.z
lmsp = LMS{T}(cbrt01.([lms.l, lms.m, lms.s])...)
@mul3x3 Oklab{T} LMSP2OKLAB lmsp.l lmsp.m lmsp.s
end

function cnvt(::Type{Oklab{T}}, c::LCHOklab) where T
Oklab{T}(c.l, polar_to_cartesian(c.c, c.h)...)
end

cnvt(::Type{Oklab{T}}, c::Color) where {T} = cnvt(Oklab{T}, convert(XYZ{T}, c)::XYZ{T})


# Everything to LCHuv
# -------------------

Expand All @@ -593,6 +629,17 @@ end
cnvt(::Type{LCHab{T}}, c::Color) where {T} = cnvt(LCHab{T}, convert(Lab{T}, c)::Lab{T})


# Everything to LCHOklab
# -------------------

function cnvt(::Type{LCHOklab{T}}, c::Oklab) where T
LCHOklab{T}(c.l, chroma(c), hue(c))
end


cnvt(::Type{LCHOklab{T}}, c::Color) where {T} = cnvt(LCHOklab{T}, convert(Oklab{T}, c)::Oklab{T})


# Everything to DIN99
# -------------------

Expand Down