fix tests

Author: SimonDanisch

src/layout.jl

@@ -8,7 +8,12 @@ iter_or_array(x::StaticArray) = repeated(x)
 function metrics_bb(char::Char, font::FTFont, pixel_size)
     extent = get_extent(font, char) .* Vec2f0(pixel_size)
     mini = bearing(extent)
-    return Rect2D(mini, Vec2f0(extent.pixel_size)), extent
+    return Rect2D(mini, Vec2f0(extent.scale)), extent
+end
+
+function boundingbox(char::Char, font::FTFont, pixel_size)
+    bb, extent = metrics_bb(char, font, pixel_size)
+    return bb
 end
 
 function glyph_ink_size(char::Char, font::FTFont, pixel_size)

src/rendering.jl

@@ -1,10 +1,15 @@
 
+function loadchar(face::FTFont, c::Char)
+    err = FT_Load_Char(face, c, FT_LOAD_RENDER)
+    check_error(err, "Could not load char to render.")
+end
+
 function renderface(face::FTFont, c::Char, pixelsize::Integer)
     set_pixelsize(face, pixelsize)
     loadchar(face, c)
     glyph = face.glyph
     @assert glyph.format == FreeType.FT_GLYPH_FORMAT_BITMAP
-    return glyphbitmap(glyph.bitmap), get_extent(face, c)
+    return glyphbitmap(glyph.bitmap), FontExtent(glyph.metrics)
 end
 
 function glyphbitmap(bitmap::FreeType.FT_Bitmap)
@@ -45,17 +50,17 @@ function renderstring!(
 
     if pixelsize isa Tuple
         @warn "using tuple for pixelsize is deprecated, please use one integer"
-        set_pixelsize(face, pixelsize[1])
-    else
-        set_pixelsize(face, pixelsize)
+        pixelsize = pixelsize[1]
     end
 
+    set_pixelsize(face, pixelsize)
+
     bitmaps = Vector{Matrix{UInt8}}(undef, lastindex(str))
     metrics = Vector{FontExtent{Int}}(undef, lastindex(str))
     ymin = ymax = sumadvancex = 0
 
     for (istr, char) = enumerate(str)
-        bitmap, metric_float = renderface(face, char)
+        bitmap, metric_float = renderface(face, char, pixelsize)
         metric = round.(Int, metric_float)
         bitmaps[istr] = bitmap
         metrics[istr] = metric

src/types.jl

@@ -185,11 +185,6 @@ function kerning(c1::Char, c2::Char, face::FTFont)
     return Vec2f0(kerning2d[].x / divisor, kerning2d[].y / divisor)
 end
 
-function loadchar(face::FTFont, c::Char)
-    err = FT_Load_Char(face, c, FT_LOAD_RENDER | FT_LOAD_NO_HINTING)
-    check_error(err, "Could not load char to render.")
-end
-
 function get_extent(face::FTFont, char::Char)
     if use_cache(face)
         get!(get_cache(face), char) do

test/runtests.jl

@@ -1,53 +1,20 @@
 using FreeTypeAbstraction, Colors, ColorVectorSpace, GeometryBasics
 using Test
-using FreeTypeAbstraction: boundingbox, Vec, glyph_rects, get_extent, FTFont, kerning
+using FreeTypeAbstraction: boundingbox, Vec, glyph_rects, get_extent, FTFont, kerning, glyph_ink_size
 using FreeType
 
 face = FreeTypeAbstraction.findfont("hack"; additional_fonts=@__DIR__)
 
-FreeTypeAbstraction.get_pixelsize(face)
-FreeTypeAbstraction.set_pixelsize(face, 122)
-FreeTypeAbstraction.set_pixelsize(face, 64)
-err = FT_Load_Char(face, 'm', FT_LOAD_DEFAULT)
-metrics = face.glyph.metrics
-# 64 since metrics are in 1/64 units (units to 26.6 fractional pixels)
-FontExtent(metrics, 64.0)
-
-
-
-
-
-
-
-
-err = FT_Load_Char(face, 'm', FT_LOAD_NO_AUTOHINT)
-metrics = face.glyph.metrics
-# 64 since metrics are in 1/64 units (units to 26.6 fractional pixels)
-FontExtent(metrics, 1.0)
-
-
-
-
-
-
-
-
-
-
-
-
-bb = boundingbox("asdasd", face, 1.0)
-@test bb == Rect(4.0, -1.0, 224.0, 50.0)
+bb = boundingbox("asdasd", face, 64)
+@test round.(Int, minimum(bb)) == Vec(4, -1)
+@test round.(Int, widths(bb)) == Vec2(221, 50)
 
 FA = FreeTypeAbstraction
 
 FA.set_pixelsize(face, 64) # should be the default
-img, extent = renderface(face, 'C')
+img, extent = renderface(face, 'C', 64)
 @test size(img) == (30, 49)
 @test typeof(img) == Array{UInt8,2}
-@test extent == FontExtent{Float32}(Float32[-15.0, 6.0], Float32[4.0, 48.0], Float32[39.0, 62.0], Float32[30.0, 49.0])
-img, extent = renderface(face, 'C', 200)
-@test round.(Int, widths(FA.boundingbox(extent))) == Vec(size(img))
 
 a = renderstring!(zeros(UInt8, 20, 100), "helgo", face, 10, 10, 10)