Revert "moved freetype to internal, added glyph caching"

Not a big enough win. This reverts commit 7df672b.
aarzilli · Oct 29, 2016 · e043630 · e043630
1 parent 8c720ce
commit e043630
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 96 deletions.
diff --git a/_demo/demo.go b/_demo/demo.go
@@ -32,12 +32,6 @@ func main() {
 			trace.Start(fh)
 			defer trace.Stop()
 		}
-		fhp, _ := os.Create("demo.cpu.pprof")
-		if fhp != nil {
-			defer fhp.Close()
-			pprof.StartCPUProfile(fhp)
-			defer pprof.StopCPUProfile()
-		}
 	}
 
 	switch whichdemo {

diff --git a/shiny.go b/shiny.go
@@ -19,7 +19,7 @@ import (
 	"github.com/aarzilli/nucular/rect"
 	nstyle "github.com/aarzilli/nucular/style"
 
-	"github.com/aarzilli/nucular/internal/freetype/raster"
+	"github.com/golang/freetype/raster"
 
 	"golang.org/x/exp/shiny/driver"
 	"golang.org/x/exp/shiny/screen"

diff --git a/style/style.go b/style/style.go
@@ -11,8 +11,8 @@ import (
 
 	"golang.org/x/image/font"
 
-	"github.com/aarzilli/nucular/internal/freetype"
-	"github.com/aarzilli/nucular/internal/freetype/truetype"
+	"github.com/golang/freetype"
+	"github.com/golang/freetype/truetype"
 )
 
 type WidgetStates int

diff --git a/internal/freetype/AUTHORS → vendor/github.com/golang/freetype/AUTHORS b/internal/freetype/AUTHORS → vendor/github.com/golang/freetype/AUTHORS
diff --git a/internal/freetype/CONTRIBUTORS → ...r/github.com/golang/freetype/CONTRIBUTORS b/internal/freetype/CONTRIBUTORS → ...r/github.com/golang/freetype/CONTRIBUTORS
diff --git a/internal/freetype/LICENSE → vendor/github.com/golang/freetype/LICENSE b/internal/freetype/LICENSE → vendor/github.com/golang/freetype/LICENSE
diff --git a/internal/freetype/README → vendor/github.com/golang/freetype/README b/internal/freetype/README → vendor/github.com/golang/freetype/README
diff --git a/internal/freetype/freetype.go → ...or/github.com/golang/freetype/freetype.go b/internal/freetype/freetype.go → ...or/github.com/golang/freetype/freetype.go
diff --git a/internal/freetype/raster/geom.go → ...github.com/golang/freetype/raster/geom.go b/internal/freetype/raster/geom.go → ...github.com/golang/freetype/raster/geom.go
diff --git a/internal/freetype/raster/paint.go → ...ithub.com/golang/freetype/raster/paint.go b/internal/freetype/raster/paint.go → ...ithub.com/golang/freetype/raster/paint.go
diff --git a/internal/freetype/raster/raster.go → ...thub.com/golang/freetype/raster/raster.go b/internal/freetype/raster/raster.go → ...thub.com/golang/freetype/raster/raster.go
diff --git a/internal/freetype/raster/stroke.go → ...thub.com/golang/freetype/raster/stroke.go b/internal/freetype/raster/stroke.go → ...thub.com/golang/freetype/raster/stroke.go
diff --git a/internal/freetype/truetype/face.go → ...thub.com/golang/freetype/truetype/face.go b/internal/freetype/truetype/face.go → ...thub.com/golang/freetype/truetype/face.go
diff --git a/internal/freetype/truetype/glyph.go → ...hub.com/golang/freetype/truetype/glyph.go b/internal/freetype/truetype/glyph.go → ...hub.com/golang/freetype/truetype/glyph.go
diff --git a/internal/freetype/truetype/hint.go → ...thub.com/golang/freetype/truetype/hint.go b/internal/freetype/truetype/hint.go → ...thub.com/golang/freetype/truetype/hint.go
diff --git a/internal/freetype/truetype/opcodes.go → ...b.com/golang/freetype/truetype/opcodes.go b/internal/freetype/truetype/opcodes.go → ...b.com/golang/freetype/truetype/opcodes.go
diff --git a/internal/freetype/truetype/truetype.go → ....com/golang/freetype/truetype/truetype.go b/internal/freetype/truetype/truetype.go → ....com/golang/freetype/truetype/truetype.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -18,6 +18,18 @@
 			"path": "github.com/BurntSushi/xgb/xproto",
 			"revision": "e13605d223ac0bca1fc3948d9782db9545c331e8"
 		},
+		{
+			"path": "github.com/golang/freetype",
+			"revision": "38b4c392adc5eed94207994c4848fff99f4ac234"
+		},
+		{
+			"path": "github.com/golang/freetype/raster",
+			"revision": "38b4c392adc5eed94207994c4848fff99f4ac234"
+		},
+		{
+			"path": "github.com/golang/freetype/truetype",
+			"revision": "38b4c392adc5eed94207994c4848fff99f4ac234"
+		},
 		{
 			"path": "github.com/hashicorp/golang-lru",
 			"revision": "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"