wouter/rtl-gopow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched freetype source vendor from google code to github

Browse Source
This commit is contained in:
David Högborg
2016-01-26 09:21:27 +01:00
parent 1c915a237d
commit a07b34988f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
internal/gopow/annotater.go
View File

@@ -6,9 +6,10 @@ import (
"math" "math"
"time" "time"
"code.google.com/p/freetype-go/freetype"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/dustin/go-humanize" "github.com/dustin/go-humanize"
"github.com/golang/freetype"
"golang.org/x/image/font"
"github.com/dhogborg/rtl-gopow/internal/resources" "github.com/dhogborg/rtl-gopow/internal/resources"
) )
@@ -53,7 +54,7 @@ func (a *Annotator) init() error {
return err return err
} }
font, err := freetype.ParseFont(fontBytes) luxisr, err := freetype.ParseFont(fontBytes)
if err != nil { if err != nil {
return err return err
} }
@@ -63,7 +64,7 @@ func (a *Annotator) init() error {
a.context = freetype.NewContext() a.context = freetype.NewContext()
a.context.SetDPI(dpi) a.context.SetDPI(dpi)
a.context.SetFont(font) a.context.SetFont(luxisr)
a.context.SetFontSize(size) a.context.SetFontSize(size)
a.context.SetClip(a.image.Bounds()) a.context.SetClip(a.image.Bounds())
@@ -72,9 +73,9 @@ func (a *Annotator) init() error {
switch hinting { switch hinting {
default: default:
a.context.SetHinting(freetype.NoHinting) a.context.SetHinting(font.HintingNone)
case "full": case "full":
a.context.SetHinting(freetype.FullHinting) a.context.SetHinting(font.HintingFull)
} }
return nil return nil
@@ -203,7 +204,7 @@ func (a *Annotator) DrawInfoBox() error {
pt := freetype.Pt(left, top) pt := freetype.Pt(left, top)
for _, s := range strings { for _, s := range strings {
_, _ = a.context.DrawString(s, pt) _, _ = a.context.DrawString(s, pt)
pt.Y += a.context.PointToFix32(size * spacing) pt.Y += a.context.PointToFixed(size * spacing)
} }
return nil return nil