Skip to content

Add the CMY color model #198

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

Open
andreuvall wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add the CMY color model #198

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
11 changes: 10 additions & 1 deletion src/ColorVectorSpace.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ isdefined(Base, :get_extension) || using Requires

export RGBRGB, complement, nan, dotc, dot, ⋅, hadamard, ⊙, tensor, ⊗, norm, varmult, stdmult

MathTypes{T,C<:Union{AbstractGray{T},AbstractRGB{T}}} = Union{C,TransparentColor{C,T}}
MathTypes{T,C<:Union{AbstractGray{T},AbstractRGB{T},CMY}} = Union{C,TransparentColor{C,T}}

## Version compatibility with ColorTypes
### TODO: Remove the definitons other than `one` when dropping ColorTypes v0.10 support
Expand Down Expand Up @@ -161,6 +161,7 @@ channels(c::AbstractGray) = (gray(c),)
channels(c::TransparentGray) = (gray(c), alpha(c))
channels(c::AbstractRGB) = (red(c), green(c), blue(c))
channels(c::TransparentRGB) = (red(c), green(c), blue(c), alpha(c))
channels(c::CMY) = (cyan(c), magenta(c), yellow(c))

if reinterpret(N0f16, 0xBADb)^2 === N0f16(float(reinterpret(N0f16, 0xBADb))^2)
function _mul(x::N0f8, y::N0f8)
Expand Down Expand Up @@ -291,6 +292,14 @@ end
dotc(x::T, y::T) where {T<:AbstractRGB} = 0.200f0 * acc(red(x))*acc(red(y)) + 0.771f0 * acc(green(x))*acc(green(y)) + 0.029f0 * acc(blue(x))*acc(blue(y))
dotc(x::AbstractRGB, y::AbstractRGB) = dotc(promote(x, y)...)

# CMY
function (/)(c::CMY, f::AbstractFloat)
r = oneunit(divtype(eltype(c), typeof(f))) / f
_mapc(rettype(/, c, f), v -> v * r, c)
end
(+)(a::CMY, b::CMY) = _mapc(rettype(+, a, b), +, a, b)
(-)(a::CMY, b::CMY) = _mapc(rettype(-, a, b), -, a, b)

# Scalar Gray
const unaryops = (:~, :conj, :abs,
:sin, :cos, :tan, :sinh, :cosh, :tanh,
Expand Down
Loading