Merge pull request #69 from t-bltg/cols

Support `Vector` of colors and chars

Author: SimonDanisch

src/rendering.jl

@@ -37,14 +37,14 @@ Render `str` into `img` using the font `face` of size `pixelsize` at coordinates
 
 # Arguments
 * `y0,x0`: origin is in upper left with positive `y` going down
-* `fcolor`: foreground color; typemax(T) for T<:Integer, otherwise one(T)
+* `fcolor`: foreground color; AbstractVector{T}, typemax(T) for T<:Integer, otherwise one(T)
 * `bcolor`: background color; set to `nothing` for transparent
 * `halign`: :hleft, :hcenter, or :hright
 * `valign`: :vtop, :vcenter, :vbaseline, or :vbottom
 """
 function renderstring!(
-        img::AbstractMatrix{T}, str::String, face::FTFont, pixelsize::Union{Int, Tuple{Int, Int}}, y0, x0;
-        fcolor::T = one_or_typemax(T), bcolor::Union{T,Nothing} = zero(T),
+        img::AbstractMatrix{T}, str::Union{AbstractVector{Char},String}, face::FTFont, pixelsize::Union{Int, Tuple{Int, Int}}, y0, x0;
+        fcolor::Union{AbstractVector{T},T} = one_or_typemax(T), bcolor::Union{T,Nothing} = zero(T),
         halign::Symbol = :hleft, valign::Symbol = :vbaseline
     ) where T<:Union{Real,Colorant}
 
@@ -53,6 +53,8 @@ function renderstring!(
         pixelsize = pixelsize[1]
     end
 
+    str = str isa AbstractVector ? String(str) : str
+
     set_pixelsize(face, pixelsize)
 
     bitmaps = Vector{Matrix{UInt8}}(undef, lastindex(str))
@@ -103,21 +105,23 @@ function renderstring!(
             px += kx
         end
 
+        fcol = fcolor isa AbstractVector ? fcolor[istr] : fcolor
+
         # trim parts of glyph images that are outside the destination
         cliprowlo, cliprowhi = max(0, -(py-by)), max(0, py - by + h - imgh)
         clipcollo, clipcolhi = max(0, -bx-px),   max(0, px + bx + w - imgw)
 
         if bcolor === nothing
             for row = 1+cliprowlo : h-cliprowhi, col = 1+clipcollo : w-clipcolhi
                 bitmaps[istr][col,row]==0 && continue
-                c1 = bitmaps[istr][col,row] / bitmapmax * fcolor
+                c1 = bitmaps[istr][col,row] / bitmapmax * fcol
                 img[row+py-by, col+px+bx] = T <: Integer ? round(T, c1) : T(c1)
             end
         else
             for row = 1+cliprowlo : h-cliprowhi, col = 1+clipcollo : w-clipcolhi
                 bitmaps[istr][col, row] == 0 && continue
                 w1 = bitmaps[istr][col, row] / bitmapmax
-                c1 = w1 * fcolor
+                c1 = w1 * fcol
                 c0 = (1.0 - w1) * bcolor
                 img[row + py - by, col + px + bx] = T <: Integer ? round(T, c1 + c0) : T(c1 + c0)
             end

test/runtests.jl

@@ -168,6 +168,10 @@ renderstring!(
     valign = :vcenter,
 )
 renderstring!(zeros(UInt8, 20, 100), "helgo", face, 10, 25, 80)
+for str in ("helgo", collect("helgo"))
+    fcolor = [RGB{Float32}(rand(3)...) for _ ∈ 1:length(str)]
+    renderstring!(zeros(RGB{Float32}, 20, 100), str, face, 10, 0, 0; fcolor = fcolor)
+end
 
 # Find fonts
 # these fonts should be available on all platforms: