diff --git a/examples/beziers.go b/.examples/beziers.go similarity index 100% rename from examples/beziers.go rename to .examples/beziers.go diff --git a/examples/circle.go b/.examples/circle.go similarity index 100% rename from examples/circle.go rename to .examples/circle.go diff --git a/examples/clip.go b/.examples/clip.go similarity index 100% rename from examples/clip.go rename to .examples/clip.go diff --git a/examples/concat.go b/.examples/concat.go similarity index 100% rename from examples/concat.go rename to .examples/concat.go diff --git a/examples/crisp.go b/.examples/crisp.go similarity index 100% rename from examples/crisp.go rename to .examples/crisp.go diff --git a/examples/cubic.go b/.examples/cubic.go similarity index 100% rename from examples/cubic.go rename to .examples/cubic.go diff --git a/examples/ellipse.go b/.examples/ellipse.go similarity index 100% rename from examples/ellipse.go rename to .examples/ellipse.go diff --git a/examples/gofont.go b/.examples/gofont.go similarity index 100% rename from examples/gofont.go rename to .examples/gofont.go diff --git a/examples/gradient-linear.go b/.examples/gradient-linear.go similarity index 100% rename from examples/gradient-linear.go rename to .examples/gradient-linear.go diff --git a/examples/gradient-radial.go b/.examples/gradient-radial.go similarity index 100% rename from examples/gradient-radial.go rename to .examples/gradient-radial.go diff --git a/examples/gradient-text.go b/.examples/gradient-text.go similarity index 100% rename from examples/gradient-text.go rename to .examples/gradient-text.go diff --git a/examples/invert-mask.go b/.examples/invert-mask.go similarity index 100% rename from examples/invert-mask.go rename to .examples/invert-mask.go diff --git a/examples/lines.go b/.examples/lines.go similarity index 100% rename from examples/lines.go rename to .examples/lines.go diff --git a/examples/linewidth.go b/.examples/linewidth.go similarity index 100% rename from examples/linewidth.go rename to .examples/linewidth.go diff --git a/examples/lorem.go b/.examples/lorem.go similarity index 100% rename from examples/lorem.go rename to .examples/lorem.go diff --git a/examples/mask.go b/.examples/mask.go similarity index 100% rename from examples/mask.go rename to .examples/mask.go diff --git a/examples/meme.go b/.examples/meme.go similarity index 100% rename from examples/meme.go rename to .examples/meme.go diff --git a/examples/openfill.go b/.examples/openfill.go similarity index 100% rename from examples/openfill.go rename to .examples/openfill.go diff --git a/examples/pattern-fill.go b/.examples/pattern-fill.go similarity index 100% rename from examples/pattern-fill.go rename to .examples/pattern-fill.go diff --git a/examples/quadratic.go b/.examples/quadratic.go similarity index 100% rename from examples/quadratic.go rename to .examples/quadratic.go diff --git a/examples/rotated-image.go b/.examples/rotated-image.go similarity index 100% rename from examples/rotated-image.go rename to .examples/rotated-image.go diff --git a/examples/rotated-text.go b/.examples/rotated-text.go similarity index 100% rename from examples/rotated-text.go rename to .examples/rotated-text.go diff --git a/examples/scatter.go b/.examples/scatter.go similarity index 100% rename from examples/scatter.go rename to .examples/scatter.go diff --git a/examples/sine.go b/.examples/sine.go similarity index 100% rename from examples/sine.go rename to .examples/sine.go diff --git a/examples/spiral.go b/.examples/spiral.go similarity index 100% rename from examples/spiral.go rename to .examples/spiral.go diff --git a/examples/star.go b/.examples/star.go similarity index 100% rename from examples/star.go rename to .examples/star.go diff --git a/examples/stars.go b/.examples/stars.go similarity index 100% rename from examples/stars.go rename to .examples/stars.go diff --git a/examples/text.go b/.examples/text.go similarity index 100% rename from examples/text.go rename to .examples/text.go diff --git a/examples/tiling.go b/.examples/tiling.go similarity index 100% rename from examples/tiling.go rename to .examples/tiling.go diff --git a/examples/unicode.go b/.examples/unicode.go similarity index 100% rename from examples/unicode.go rename to .examples/unicode.go diff --git a/examples/wrap.go b/.examples/wrap.go similarity index 100% rename from examples/wrap.go rename to .examples/wrap.go diff --git a/.gitignore b/.gitignore index 2fa80d6..ed26989 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ *.png +vendor/* +!vendor/modules.txt \ No newline at end of file diff --git a/build.pipeline b/build.pipeline new file mode 100644 index 0000000..7928d7e --- /dev/null +++ b/build.pipeline @@ -0,0 +1 @@ +goLibBuildPipeline('gg', true, 'ssh://git@github.com/cloudtrust/gg') diff --git a/context.go b/context.go index 2ca48a8..e8c546c 100644 --- a/context.go +++ b/context.go @@ -683,7 +683,7 @@ func (dc *Context) DrawImageAnchored(im image.Image, x, y int, ax, ay float64) { func (dc *Context) SetFontFace(fontFace font.Face) { dc.fontFace = fontFace - dc.fontHeight = float64(fontFace.Metrics().Height) / 64 + dc.fontHeight = (float64(fontFace.Metrics().Height) / 64) * 72 / 96 } func (dc *Context) LoadFontFace(path string, points float64) error { diff --git a/context_test.go b/context_test.go index 206816e..4366be4 100644 --- a/context_test.go +++ b/context_test.go @@ -11,7 +11,7 @@ import ( var save bool -func init() { +func main() { flag.BoolVar(&save, "save", false, "save PNG output for each test case") flag.Parse() } diff --git a/examples/baboon.png b/examples/baboon.png deleted file mode 100644 index 2b1499a..0000000 Binary files a/examples/baboon.png and /dev/null differ diff --git a/examples/gopher.png b/examples/gopher.png deleted file mode 100644 index c42e520..0000000 Binary files a/examples/gopher.png and /dev/null differ diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..9bf28df --- /dev/null +++ b/go.mod @@ -0,0 +1,10 @@ +module github.com/cloudtrust/gg + +go 1.24.0 + +toolchain go1.26.0 + +require ( + github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 + golang.org/x/image v0.36.0 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..3b477c3 --- /dev/null +++ b/go.sum @@ -0,0 +1,4 @@ +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= +github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= +golang.org/x/image v0.36.0 h1:Iknbfm1afbgtwPTmHnS2gTM/6PPZfH+z2EFuOkSbqwc= +golang.org/x/image v0.36.0/go.mod h1:YsWD2TyyGKiIX1kZlu9QfKIsQ4nAAK9bdgdrIsE7xy4= diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000..dc46824 --- /dev/null +++ b/renovate.json @@ -0,0 +1,3 @@ +{ + "extends": ["local>CLOUDTRUST/configuration-renovate-github:back"] +} diff --git a/vendor/modules.txt b/vendor/modules.txt new file mode 100644 index 0000000..f9cb5f6 --- /dev/null +++ b/vendor/modules.txt @@ -0,0 +1,11 @@ +# github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 +## explicit +github.com/golang/freetype/raster +github.com/golang/freetype/truetype +# golang.org/x/image v0.36.0 +## explicit; go 1.24.0 +golang.org/x/image/draw +golang.org/x/image/font +golang.org/x/image/font/basicfont +golang.org/x/image/math/f64 +golang.org/x/image/math/fixed