aw/golang-image
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

font: fix up some old x/exp/shiny references.

Browse Source 
Also add canonical import paths for the newly merged packages.

Change-Id: I96fe3a964ba08e718fc9163c980ef7ea9da551fe
Reviewed-on: https://go-review.googlesource.com/14148
Reviewed-by: David Symonds <dsymonds@golang.org>
This commit is contained in:
Nigel Tao 2015-09-01 15:04:37 +10:00
parent 00f88f596f
commit b3d8467d91
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
example/font/main.go
View File

@ -4,7 +4,7 @@
// +build ignore // +build ignore
// //
// This build tag means that "go install golang.org/x/exp/shiny/..." doesn't // This build tag means that "go install golang.org/x/image/..." doesn't
// install this example program. Use "go run main.go" to run it. // install this example program. Use "go run main.go" to run it.
// Font is a basic example of using fonts. // Font is a basic example of using fonts.
@ -22,8 +22,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"golang.org/x/exp/shiny/font" "golang.org/x/image/font"
"golang.org/x/exp/shiny/font/plan9font" "golang.org/x/image/font/plan9font"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
) )

4
font/font.go
View File

@ -7,9 +7,7 @@
// //
// Other packages provide font face implementations. For example, a truetype // Other packages provide font face implementations. For example, a truetype
// package would provide one based on .ttf font files. // package would provide one based on .ttf font files.
package font package font // import "golang.org/x/image/font"
// TODO: move this from golang.org/x/exp to golang.org/x/image ??
import ( import (
"image" "image"

4
font/plan9font/example_test.go
View File

@ -13,8 +13,8 @@ import (
"path" "path"
"path/filepath" "path/filepath"
"golang.org/x/exp/shiny/font" "golang.org/x/image/font"
"golang.org/x/exp/shiny/font/plan9font" "golang.org/x/image/font/plan9font"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
) )

4
font/plan9font/plan9font.go
View File

@ -5,7 +5,7 @@
// Package plan9font implements font faces for the Plan 9 font and subfont file // Package plan9font implements font faces for the Plan 9 font and subfont file
// formats. These formats are described at // formats. These formats are described at
// http://plan9.bell-labs.com/magic/man2html/6/font // http://plan9.bell-labs.com/magic/man2html/6/font
package plan9font package plan9font // import "golang.org/x/image/font/plan9font"
// TODO: have a subface use an *image.Alpha instead of plan9Image implementing // TODO: have a subface use an *image.Alpha instead of plan9Image implementing
// the image.Image interface? The image/draw code has a fast path for // the image.Image interface? The image/draw code has a fast path for
@ -21,7 +21,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"golang.org/x/exp/shiny/font" "golang.org/x/image/font"
"golang.org/x/image/math/fixed" "golang.org/x/image/math/fixed"
) )