Use GoKi version of Freetype which contains some bugfixes

Fixes #99
fyne-io · Jan 29, 2019 · 1f95668 · 1f95668
1 parent 8ace64e
commit 1f95668
Show file tree

Hide file tree

Showing 43 changed files with 109 additions and 46 deletions.
diff --git a/driver/gl/driver.go b/driver/gl/driver.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"fyne.io/fyne"
-	"github.com/golang/freetype/truetype"
+	"github.com/goki/freetype/truetype"
 	"golang.org/x/image/font"
 )
 

diff --git a/driver/gl/font.go b/driver/gl/font.go
@@ -5,7 +5,7 @@ import (
 
 	"fyne.io/fyne"
 	"fyne.io/fyne/theme"
-	"github.com/golang/freetype/truetype"
+	"github.com/goki/freetype/truetype"
 	"golang.org/x/image/font"
 	"golang.org/x/image/math/fixed"
 )

diff --git a/driver/gl/gl.go b/driver/gl/gl.go
@@ -20,8 +20,8 @@ import (
 	"fyne.io/fyne/theme"
 	"fyne.io/fyne/widget"
 	"github.com/go-gl/gl/v3.2-core/gl"
-	"github.com/golang/freetype"
-	"github.com/golang/freetype/truetype"
+	"github.com/goki/freetype"
+	"github.com/goki/freetype/truetype"
 	"github.com/srwiley/oksvg"
 	"github.com/srwiley/rasterx"
 	"golang.org/x/image/font"

diff --git a/vendor/github.com/golang/freetype/AUTHORS → vendor/github.com/goki/freetype/AUTHORS b/vendor/github.com/golang/freetype/AUTHORS → vendor/github.com/goki/freetype/AUTHORS
diff --git a/...r/github.com/golang/freetype/CONTRIBUTORS → vendor/github.com/goki/freetype/CONTRIBUTORS b/...r/github.com/golang/freetype/CONTRIBUTORS → vendor/github.com/goki/freetype/CONTRIBUTORS
diff --git a/vendor/github.com/golang/freetype/LICENSE → vendor/github.com/goki/freetype/LICENSE b/vendor/github.com/golang/freetype/LICENSE → vendor/github.com/goki/freetype/LICENSE
diff --git a/vendor/github.com/golang/freetype/README → vendor/github.com/goki/freetype/README b/vendor/github.com/golang/freetype/README → vendor/github.com/goki/freetype/README
diff --git a/...ng/freetype/cmd/print-glyph-points/main.c → ...ki/freetype/cmd/print-glyph-points/main.c b/...ng/freetype/cmd/print-glyph-points/main.c → ...ki/freetype/cmd/print-glyph-points/main.c
diff --git a/...m/golang/freetype/example/capjoin/main.go → ...com/goki/freetype/example/capjoin/main.go b/...m/golang/freetype/example/capjoin/main.go → ...com/goki/freetype/example/capjoin/main.go
diff --git a/...om/golang/freetype/example/drawer/main.go → ....com/goki/freetype/example/drawer/main.go b/...om/golang/freetype/example/drawer/main.go → ....com/goki/freetype/example/drawer/main.go
diff --git a/.../golang/freetype/example/freetype/main.go → ...om/goki/freetype/example/freetype/main.go b/.../golang/freetype/example/freetype/main.go → ...om/goki/freetype/example/freetype/main.go
diff --git a/...com/golang/freetype/example/gamma/main.go → ...b.com/goki/freetype/example/gamma/main.go b/...com/golang/freetype/example/gamma/main.go → ...b.com/goki/freetype/example/gamma/main.go
diff --git a/...ang/freetype/example/genbasicfont/main.go → ...oki/freetype/example/genbasicfont/main.go b/...ang/freetype/example/genbasicfont/main.go → ...oki/freetype/example/genbasicfont/main.go
diff --git a/...om/golang/freetype/example/raster/main.go → ....com/goki/freetype/example/raster/main.go b/...om/golang/freetype/example/raster/main.go → ....com/goki/freetype/example/raster/main.go
diff --git a/...com/golang/freetype/example/round/main.go → ...b.com/goki/freetype/example/round/main.go b/...com/golang/freetype/example/round/main.go → ...b.com/goki/freetype/example/round/main.go
diff --git a/.../golang/freetype/example/truetype/main.go → ...om/goki/freetype/example/truetype/main.go b/.../golang/freetype/example/truetype/main.go → ...om/goki/freetype/example/truetype/main.go
diff --git a/...or/github.com/golang/freetype/freetype.go → vendor/github.com/goki/freetype/freetype.go b/...or/github.com/golang/freetype/freetype.go → vendor/github.com/goki/freetype/freetype.go
diff --git a/...thub.com/golang/freetype/freetype_test.go → ...github.com/goki/freetype/freetype_test.go b/...thub.com/golang/freetype/freetype_test.go → ...github.com/goki/freetype/freetype_test.go
diff --git a/...thub.com/golang/freetype/licenses/ftl.txt → ...github.com/goki/freetype/licenses/ftl.txt b/...thub.com/golang/freetype/licenses/ftl.txt → ...github.com/goki/freetype/licenses/ftl.txt
diff --git a/...thub.com/golang/freetype/licenses/gpl.txt → ...github.com/goki/freetype/licenses/gpl.txt b/...thub.com/golang/freetype/licenses/gpl.txt → ...github.com/goki/freetype/licenses/gpl.txt
diff --git a/...github.com/golang/freetype/raster/geom.go → ...r/github.com/goki/freetype/raster/geom.go b/...github.com/golang/freetype/raster/geom.go → ...r/github.com/goki/freetype/raster/geom.go
diff --git a/...ithub.com/golang/freetype/raster/paint.go → .../github.com/goki/freetype/raster/paint.go b/...ithub.com/golang/freetype/raster/paint.go → .../github.com/goki/freetype/raster/paint.go
diff --git a/...thub.com/golang/freetype/raster/raster.go → ...github.com/goki/freetype/raster/raster.go b/...thub.com/golang/freetype/raster/raster.go → ...github.com/goki/freetype/raster/raster.go
diff --git a/...thub.com/golang/freetype/raster/stroke.go → ...github.com/goki/freetype/raster/stroke.go b/...thub.com/golang/freetype/raster/stroke.go → ...github.com/goki/freetype/raster/stroke.go
diff --git a/...thub.com/golang/freetype/testdata/COPYING → ...github.com/goki/freetype/testdata/COPYING b/...thub.com/golang/freetype/testdata/COPYING → ...github.com/goki/freetype/testdata/COPYING
diff --git a/...ithub.com/golang/freetype/testdata/README → .../github.com/goki/freetype/testdata/README b/...ithub.com/golang/freetype/testdata/README → .../github.com/goki/freetype/testdata/README
diff --git a/...b.com/golang/freetype/testdata/luximr.ttf → ...hub.com/goki/freetype/testdata/luximr.ttf b/...b.com/golang/freetype/testdata/luximr.ttf → ...hub.com/goki/freetype/testdata/luximr.ttf
diff --git a/...b.com/golang/freetype/testdata/luximr.ttx → ...hub.com/goki/freetype/testdata/luximr.ttx b/...b.com/golang/freetype/testdata/luximr.ttx → ...hub.com/goki/freetype/testdata/luximr.ttx
diff --git a/...b.com/golang/freetype/testdata/luxirr.ttf → ...hub.com/goki/freetype/testdata/luxirr.ttf b/...b.com/golang/freetype/testdata/luxirr.ttf → ...hub.com/goki/freetype/testdata/luxirr.ttf
diff --git a/...b.com/golang/freetype/testdata/luxirr.ttx → ...hub.com/goki/freetype/testdata/luxirr.ttx b/...b.com/golang/freetype/testdata/luxirr.ttx → ...hub.com/goki/freetype/testdata/luxirr.ttx
diff --git a/...ype/testdata/luxisr-12pt-sans-hinting.txt → ...ype/testdata/luxisr-12pt-sans-hinting.txt b/...ype/testdata/luxisr-12pt-sans-hinting.txt → ...ype/testdata/luxisr-12pt-sans-hinting.txt
diff --git a/...ype/testdata/luxisr-12pt-with-hinting.txt → ...ype/testdata/luxisr-12pt-with-hinting.txt b/...ype/testdata/luxisr-12pt-with-hinting.txt → ...ype/testdata/luxisr-12pt-with-hinting.txt
diff --git a/...b.com/golang/freetype/testdata/luxisr.ttf → ...hub.com/goki/freetype/testdata/luxisr.ttf b/...b.com/golang/freetype/testdata/luxisr.ttf → ...hub.com/goki/freetype/testdata/luxisr.ttf
diff --git a/...b.com/golang/freetype/testdata/luxisr.ttx → ...hub.com/goki/freetype/testdata/luxisr.ttx b/...b.com/golang/freetype/testdata/luxisr.ttx → ...hub.com/goki/freetype/testdata/luxisr.ttx
diff --git a/...etype/testdata/make-other-hinting-txts.sh → ...etype/testdata/make-other-hinting-txts.sh b/...etype/testdata/make-other-hinting-txts.sh → ...etype/testdata/make-other-hinting-txts.sh