support vector of char

Author: t-bltg

src/rendering.jl

@@ -43,7 +43,7 @@ Render `str` into `img` using the font `face` of size `pixelsize` at coordinates
 * `valign`: :vtop, :vcenter, :vbaseline, or :vbottom
 """
 function renderstring!(
-        img::AbstractMatrix{T}, str::String, face::FTFont, pixelsize::Union{Int, Tuple{Int, Int}}, y0, x0;
+        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,11 +105,7 @@ function renderstring!(
             px += kx
         end
 
-        fcol = if fcolor isa AbstractVector
-            fcolor[istr]
-        else
-            fcolor
-        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)

test/runtests.jl

@@ -168,8 +168,9 @@ renderstring!(
     valign = :vcenter,
 )
 renderstring!(zeros(UInt8, 20, 100), "helgo", face, 10, 25, 80)
-let fcolor = map(x->RGB{Float32}(x...), [(.1, .2, .3), (.5, .2, .25), (.6, .3, .1), (.2, .5, .6), (.7, .1, .9)])
-    renderstring!(zeros(RGB{Float32}, 20, 100), "helgo", face, 10, 25, 80; fcolor = fcolor)
+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