Merge pull request #41 from JuliaGraphics/sd/fix#40

fix #40

Author: SimonDanisch

.travis.yml

@@ -3,11 +3,10 @@ os:
   - linux
   - osx
 julia:
-  - 1.3
-  - nightly
-matrix:
- allow_failures:
- - julia: nightly
+  - 1
 
 notifications:
   email: false
+
+after_success:
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

src/layout.jl

@@ -34,8 +34,8 @@ function iterate_extents(f, line::AbstractString, fonts, scales)
     iterator = zip(line, iter_or_array(scales), iter_or_array(fonts))
     lastpos = 0.0
     for (char, scale, font) in iterator
-        extent, glyph_box = metrics_bb(char, font, scale)
-        mini = minimimum(glyph_box) .+ Vec2f0(lastpos, 0.0)
+        glyph_box, extent = metrics_bb(char, font, scale)
+        mini = minimum(glyph_box) .+ Vec2f0(lastpos, 0.0)
         glyph_box = Rect2D(mini, widths(glyph_box))
         glyph_advance = Point2f0(extent.advance)
         lastpos += glyph_advance[1]
@@ -53,5 +53,5 @@ function glyph_rects(line::AbstractString, fonts, scales)
 end
 
 function boundingbox(line::AbstractString, fonts, scales)
-    reduce(union, glyph_rects(lines, fonts, scales))
+    return reduce(union, glyph_rects(line, fonts, scales))
 end

test/runtests.jl

@@ -1,10 +1,13 @@
 using FreeTypeAbstraction, Colors, ColorVectorSpace, GeometryTypes
 using Test
-using FreeTypeAbstraction: Vec, glyph_rects, get_extent, FTFont, kerning
+using FreeTypeAbstraction: boundingbox, Vec, glyph_rects, get_extent, FTFont, kerning
 using FreeType
 
 face = FreeTypeAbstraction.findfont("hack"; additional_fonts=@__DIR__)
 
+bb = boundingbox("asdasd", face, 1.0)
+@test bb == Rect(4.0, -1.0, 224.0, 50.0)
+
 FA = FreeTypeAbstraction
 
 FA.set_pixelsize(face, 64) # should be the default