Merge pull request #35 from JuliaGraphics/sd/geometrybasics

switch to geometrybasics

Author: SimonDanisch

Project.toml

@@ -1,19 +1,19 @@
 name = "FreeTypeAbstraction"
 uuid = "663a7486-cb36-511b-a19d-713bb74d65c9"
-version = "0.6.6"
+version = "0.7.0"
 
 [deps]
 ColorVectorSpace = "c3611d14-8923-5661-9e6a-0046d554d3a4"
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
 FreeType = "b38be410-82b0-50bf-ab77-7b57e271db43"
-GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
+GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
 ColorVectorSpace = "0.8"
+GeometryBasics = "0.2"
 Colors = "0.11, 0.12"
 FreeType = "3"
-GeometryTypes = "0.7, 0.8"
 StaticArrays = "0.12"
 julia = "1"
 

README.md

@@ -1,5 +1,7 @@
 [![codecov](https://codecov.io/gh/JuliaGraphics/FreeTypeAbstraction.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaGraphics/FreeTypeAbstraction.jl)
+
 [![Build Status](https://travis-ci.org/JuliaGraphics/FreeTypeAbstraction.jl.svg?branch=master)](https://travis-ci.org/JuliaGraphics/FreeTypeAbstraction.jl)
+
 # FreeTypeAbstraction
 
 Draw text into a Matrix.
@@ -19,4 +21,4 @@ myarray = zeros(UInt8,100,100)
 renderstring!(myarray, "hello", face, (10,10), 90, 10, halign=:hright)
 ```
 
-credits to @aaalexandrov from whom most of the code stems.
+credits to @aaalexandrov from whom most of the early code comes.

src/FreeTypeAbstraction.jl

@@ -1,6 +1,6 @@
 module FreeTypeAbstraction
 
-using FreeType, StaticArrays, Colors, ColorVectorSpace, GeometryTypes
+using FreeType, StaticArrays, Colors, ColorVectorSpace, GeometryBasics
 using Base.Iterators: Repeated, repeated
 import Base: /, *, ==
 import Base.Broadcast: BroadcastStyle, Style, broadcasted

src/layout.jl

@@ -1,5 +1,3 @@
-const Rect2D = HyperRectangle{2, Float32}
-
 iter_or_array(x) = repeated(x)
 iter_or_array(x::Repeated) = x
 iter_or_array(x::AbstractArray) = x

test/runtests.jl

@@ -1,4 +1,4 @@
-using FreeTypeAbstraction, Colors, ColorVectorSpace, GeometryTypes
+using FreeTypeAbstraction, Colors, ColorVectorSpace, GeometryBasics
 using Test
 using FreeTypeAbstraction: boundingbox, Vec, glyph_rects, get_extent, FTFont, kerning
 using FreeType
@@ -39,6 +39,7 @@ a = renderstring!(
     50,
     valign = :vtop,
 )
+
 @test all(a[1:10, :] .== 0)
 @test any(a[11:20, :] .!= 0)
 a = renderstring!(