switch to geometrybasics

SimonDanisch · SimonDanisch · commit 7250da4627ff · 2020-03-08T15:24:32.000+01:00
diff --git a/Project.toml b/Project.toml
@@ -6,14 +6,13 @@ version = "0.6.2"
 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"
 Colors = "0.11"
 FreeType = "2, 3"
-GeometryTypes = "0.7, 0.8"
 StaticArrays = "0.12"
 julia = "1"
 
diff --git a/src/FreeTypeAbstraction.jl b/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
diff --git a/src/layout.jl b/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

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-const Rect2D = HyperRectangle{2, Float32}`
`2`		`-`
`3`	`1`	`iter_or_array(x) = repeated(x)`
`4`	`2`	`iter_or_array(x::Repeated) = x`
`5`	`3`	`iter_or_array(x::AbstractArray) = x`