Skip to content

Updated dependencies #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ganners wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated dependencies #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions draw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ import (
"math"
"time"

"code.google.com/p/draw2d/draw2d"
"code.google.com/p/freetype-go/freetype"
"code.google.com/p/freetype-go/freetype/truetype"
"github.com/golang/freetype"
"github.com/golang/freetype/truetype"
"github.com/llgcode/draw2d"
"github.com/llgcode/draw2d/draw2dimg"
img_font "golang.org/x/image/font"
"golang.org/x/image/math/fixed"
)

const tileSize = 256
Expand Down Expand Up @@ -97,10 +100,10 @@ func drawText(img *image.RGBA, font *truetype.Font, color color.Color, x, y int,
ctx.SetClip(img.Bounds())
ctx.SetDst(img)
ctx.SetSrc(image.NewUniform(color))
ctx.SetHinting(freetype.FullHinting)
ctx.SetHinting(img_font.HintingFull)

width := int(widthOfString(font, ptSize, s))
pt := freetype.Pt(x-width/2, y+int(ctx.PointToFix32(ptSize)>>8)/2)
pt := freetype.Pt(x-width/2, y+int(int32(ctx.PointToFixed(ptSize))>>8)/2)
_, err := ctx.DrawString(s, pt)
if err != nil {
return err
Expand All @@ -119,9 +122,9 @@ func widthOfString(font *truetype.Font, size float64, s string) float64 {
for _, rune := range s {
index := font.Index(rune)
if hasPrev {
width += int(font.Kerning(font.FUnitsPerEm(), prev, index))
width += int(font.Kern(fixed.Int26_6(font.FUnitsPerEm()), prev, index))
}
width += int(font.HMetric(font.FUnitsPerEm(), index).AdvanceWidth)
width += int(font.HMetric(fixed.Int26_6(font.FUnitsPerEm()), index).AdvanceWidth)
prev, hasPrev = index, true
}

Expand All @@ -134,7 +137,7 @@ func round(n float64) int {
}

func drawPolyLine(img *image.RGBA, color color.Color, coords [][]float64) {
path := draw2d.NewPathStorage()
path := new(draw2d.Path)
for i, coord := range coords {
if i == 0 {
path.MoveTo(coord[0], coord[1])
Expand All @@ -143,7 +146,7 @@ func drawPolyLine(img *image.RGBA, color color.Color, coords [][]float64) {
}
}

gc := draw2d.NewGraphicContext(img)
gc := draw2dimg.NewGraphicContext(img)
gc.SetStrokeColor(color)
gc.Stroke(path)
}
2 changes: 1 addition & 1 deletion draw_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"testing"

"code.google.com/p/freetype-go/freetype"
"github.com/golang/freetype"
)

func BenchmarkDrawTile(b *testing.B) {
Expand Down
4 changes: 2 additions & 2 deletions http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strconv"
"strings"

"code.google.com/p/freetype-go/freetype"
"code.google.com/p/freetype-go/freetype/truetype"
"github.com/golang/freetype"
"github.com/golang/freetype/truetype"
)

type TileHandler struct {
Expand Down