Skip to content

Commit

Permalink
Merge pull request #83 from JuliaGraphics/fbot/deps
Browse files Browse the repository at this point in the history
Run femtocleaner
  • Loading branch information
timholy authored Sep 23, 2017
2 parents de47acb + 2a50fb7 commit 32835c2
Show file tree
Hide file tree
Showing 3 changed files with 111 additions and 111 deletions.
4 changes: 2 additions & 2 deletions images/comparison.jl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Colors

Base.mean{C<:Color}(c1::C,c2::C) = convert(C, (convert(XYZ, c1) + convert(XYZ, c2))/2) # colorimetrically "proper"
Base.mean(c1::C,c2::C) where {C<:Color} = convert(C, (convert(XYZ, c1) + convert(XYZ, c2))/2) # colorimetrically "proper"

# RGB linear vector space averaging
function meanrgb{C<:AbstractRGB}(c1::C, c2::C)
function meanrgb(c1::C, c2::C) where C<:AbstractRGB
C((red(c1)+red(c2))/2,
(green(c1)+green(c2))/2,
(blue(c1)+blue(c2))/2)
Expand Down
Loading

0 comments on commit 32835c2

Please sign in to comment.