diff --git a/draw2dbase/flattener.go b/draw2dbase/flattener.go index c62d1bc..ed3dadc 100644 --- a/draw2dbase/flattener.go +++ b/draw2dbase/flattener.go @@ -4,7 +4,7 @@ package draw2dbase import ( - "github.com/llgcode/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d" ) // Liner receive segment definition diff --git a/draw2dbase/stack_gc.go b/draw2dbase/stack_gc.go index 7f53511..8ea8e5b 100644 --- a/draw2dbase/stack_gc.go +++ b/draw2dbase/stack_gc.go @@ -8,9 +8,9 @@ import ( "image" "image/color" - "github.com/llgcode/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d" - "github.com/golang/freetype/truetype" + "git.fromouter.space/crunchy-rocks/freetype/truetype" ) var DefaultFontData = draw2d.FontData{Name: "luxi", Family: draw2d.FontFamilySans, Style: draw2d.FontStyleNormal} @@ -47,7 +47,6 @@ func (cs *ContextStack) GetFontName() string { return fmt.Sprintf("%s:%d:%d:%9.2f", fontData.Name, fontData.Family, fontData.Style, cs.FontSize) } - /** * Create a new Graphic context from an image */ diff --git a/draw2dbase/stroker.go b/draw2dbase/stroker.go index 640b228..d484c84 100644 --- a/draw2dbase/stroker.go +++ b/draw2dbase/stroker.go @@ -6,7 +6,7 @@ package draw2dbase import ( "math" - "github.com/llgcode/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d" ) type LineStroker struct { diff --git a/draw2dbase/text.go b/draw2dbase/text.go index 22b7acf..31f6432 100644 --- a/draw2dbase/text.go +++ b/draw2dbase/text.go @@ -1,6 +1,6 @@ package draw2dbase -import "github.com/llgcode/draw2d" +import "git.fromouter.space/crunchy-rocks/draw2d" // GlyphCache manage a cache of glyphs type GlyphCache interface { @@ -13,11 +13,10 @@ type GlyphCacheImp struct { glyphs map[string]map[rune]*Glyph } - // NewGlyphCache initializes a GlyphCache func NewGlyphCache() *GlyphCacheImp { glyphs := make(map[string]map[rune]*Glyph) - return &GlyphCacheImp { + return &GlyphCacheImp{ glyphs: glyphs, } } diff --git a/draw2dgl/gc.go b/draw2dgl/gc.go index c744ee6..051a341 100644 --- a/draw2dgl/gc.go +++ b/draw2dgl/gc.go @@ -8,12 +8,12 @@ import ( "math" "runtime" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dbase" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dimg" "github.com/go-gl/gl/v2.1/gl" "github.com/golang/freetype/raster" "github.com/golang/freetype/truetype" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dbase" - "github.com/llgcode/draw2d/draw2dimg" "golang.org/x/image/font" "golang.org/x/image/math/fixed" diff --git a/draw2dgl/text.go b/draw2dgl/text.go index 79cd8c8..1d5171f 100644 --- a/draw2dgl/text.go +++ b/draw2dgl/text.go @@ -1,8 +1,8 @@ package draw2dgl import ( - "github.com/golang/freetype/truetype" - "github.com/llgcode/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/freetype/truetype" "golang.org/x/image/math/fixed" ) diff --git a/draw2dimg/curve_limit_test.go b/draw2dimg/curve_limit_test.go index 26ecdb0..60c1aa5 100644 --- a/draw2dimg/curve_limit_test.go +++ b/draw2dimg/curve_limit_test.go @@ -2,13 +2,14 @@ package draw2dimg import ( "fmt" - "github.com/golang/freetype/truetype" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dkit" - "golang.org/x/image/font/gofont/goregular" "image" "image/color" "testing" + + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/freetype/truetype" + "golang.org/x/image/font/gofont/goregular" ) // font generated from icomoon.io and converted to go byte slice diff --git a/draw2dimg/ftgc.go b/draw2dimg/ftgc.go index c07e1da..f3721c6 100644 --- a/draw2dimg/ftgc.go +++ b/draw2dimg/ftgc.go @@ -9,11 +9,12 @@ import ( "log" "math" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dbase" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dbase" + "git.fromouter.space/crunchy-rocks/emoji" - "github.com/golang/freetype/raster" - "github.com/golang/freetype/truetype" + "git.fromouter.space/crunchy-rocks/freetype/raster" + "git.fromouter.space/crunchy-rocks/freetype/truetype" "golang.org/x/image/draw" "golang.org/x/image/font" @@ -54,7 +55,6 @@ const ( // NewGraphicContext creates a new Graphic context from an image. func NewGraphicContext(img draw.Image) *GraphicContext { - var painter Painter switch selectImage := img.(type) { case *image.RGBA: diff --git a/draw2dimg/ftpath.go b/draw2dimg/ftpath.go index 785fc31..d100178 100644 --- a/draw2dimg/ftpath.go +++ b/draw2dimg/ftpath.go @@ -4,7 +4,7 @@ package draw2dimg import ( - "github.com/golang/freetype/raster" + "git.fromouter.space/crunchy-rocks/freetype/raster" "golang.org/x/image/math/fixed" ) diff --git a/draw2dimg/text.go b/draw2dimg/text.go index 2fe2493..324107f 100644 --- a/draw2dimg/text.go +++ b/draw2dimg/text.go @@ -1,8 +1,8 @@ package draw2dimg import ( - "github.com/golang/freetype/truetype" - "github.com/llgcode/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/freetype/truetype" "golang.org/x/image/math/fixed" ) diff --git a/draw2dpdf/gc.go b/draw2dpdf/gc.go index c14610a..2cec5f4 100644 --- a/draw2dpdf/gc.go +++ b/draw2dpdf/gc.go @@ -14,7 +14,7 @@ import ( "os" "strconv" - "github.com/golang/freetype/truetype" + "git.fromouter.space/crunchy-rocks/freetype/truetype" "github.com/jung-kurt/gofpdf" "github.com/llgcode/draw2d" diff --git a/draw2dsvg/converters.go b/draw2dsvg/converters.go index b4440a1..742808c 100644 --- a/draw2dsvg/converters.go +++ b/draw2dsvg/converters.go @@ -7,13 +7,14 @@ import ( "bytes" "encoding/base64" "fmt" - "github.com/llgcode/draw2d" "image" "image/color" "image/png" "math" "strconv" "strings" + + "git.fromouter.space/crunchy-rocks/draw2d" ) func toSvgRGBA(c color.Color) string { diff --git a/draw2dsvg/gc.go b/draw2dsvg/gc.go index 806b664..2dd60ff 100644 --- a/draw2dsvg/gc.go +++ b/draw2dsvg/gc.go @@ -4,16 +4,17 @@ package draw2dsvg import ( - "github.com/golang/freetype/truetype" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dbase" - "golang.org/x/image/font" - "golang.org/x/image/math/fixed" "image" "log" "math" "strconv" "strings" + + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dbase" + "git.fromouter.space/crunchy-rocks/freetype/truetype" + "golang.org/x/image/font" + "golang.org/x/image/math/fixed" ) type drawType int diff --git a/draw2dsvg/samples_test.go b/draw2dsvg/samples_test.go index aec6573..d7dd917 100644 --- a/draw2dsvg/samples_test.go +++ b/draw2dsvg/samples_test.go @@ -7,16 +7,16 @@ package draw2dsvg_test import ( "testing" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/samples/android" - "github.com/llgcode/draw2d/samples/frameimage" - "github.com/llgcode/draw2d/samples/geometry" - "github.com/llgcode/draw2d/samples/gopher" - "github.com/llgcode/draw2d/samples/gopher2" - "github.com/llgcode/draw2d/samples/helloworld" - "github.com/llgcode/draw2d/samples/line" - "github.com/llgcode/draw2d/samples/linecapjoin" - "github.com/llgcode/draw2d/samples/postscript" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/samples/android" + "git.fromouter.space/crunchy-rocks/draw2d/samples/frameimage" + "git.fromouter.space/crunchy-rocks/draw2d/samples/geometry" + "git.fromouter.space/crunchy-rocks/draw2d/samples/gopher" + "git.fromouter.space/crunchy-rocks/draw2d/samples/gopher2" + "git.fromouter.space/crunchy-rocks/draw2d/samples/helloworld" + "git.fromouter.space/crunchy-rocks/draw2d/samples/line" + "git.fromouter.space/crunchy-rocks/draw2d/samples/linecapjoin" + "git.fromouter.space/crunchy-rocks/draw2d/samples/postscript" ) func TestSampleAndroid(t *testing.T) { diff --git a/draw2dsvg/test_test.go b/draw2dsvg/test_test.go index d1bd328..445558f 100644 --- a/draw2dsvg/test_test.go +++ b/draw2dsvg/test_test.go @@ -9,8 +9,8 @@ package draw2dsvg_test import ( "testing" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dsvg" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dsvg" ) type sample func(gc draw2d.GraphicContext, ext string) (string, error) diff --git a/draw2dsvg/text.go b/draw2dsvg/text.go index 30959ae..00ede15 100644 --- a/draw2dsvg/text.go +++ b/draw2dsvg/text.go @@ -2,8 +2,8 @@ package draw2dsvg import ( - "github.com/golang/freetype/truetype" - "github.com/llgcode/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/freetype/truetype" "golang.org/x/image/math/fixed" ) diff --git a/font.go b/font.go index f5c9a04..f15b2d1 100644 --- a/font.go +++ b/font.go @@ -8,8 +8,9 @@ import ( "log" "path/filepath" - "github.com/golang/freetype/truetype" "sync" + + "git.fromouter.space/crunchy-rocks/freetype/truetype" ) // FontStyle defines bold and italic styles for the font diff --git a/samples/android/android.go b/samples/android/android.go index 3d96c88..3dcdc72 100644 --- a/samples/android/android.go +++ b/samples/android/android.go @@ -8,9 +8,9 @@ import ( "image/color" "math" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dkit" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws a droid and returns the filename. This should only be diff --git a/samples/appengine/server.go b/samples/appengine/server.go index ff44895..2d3e40c 100644 --- a/samples/appengine/server.go +++ b/samples/appengine/server.go @@ -9,9 +9,9 @@ import ( "image/png" "net/http" - "github.com/llgcode/draw2d/draw2dimg" - "github.com/llgcode/draw2d/draw2dpdf" - "github.com/llgcode/draw2d/samples/android" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dimg" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dpdf" + "git.fromouter.space/crunchy-rocks/draw2d/samples/android" "appengine" ) diff --git a/samples/frameimage/frameimage.go b/samples/frameimage/frameimage.go index b584db0..aa0cff0 100644 --- a/samples/frameimage/frameimage.go +++ b/samples/frameimage/frameimage.go @@ -7,10 +7,10 @@ package frameimage import ( "math" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dimg" - "github.com/llgcode/draw2d/draw2dkit" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dimg" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws the image frame and returns the filename. diff --git a/samples/geometry/geometry.go b/samples/geometry/geometry.go index 05d9bdb..15371d2 100644 --- a/samples/geometry/geometry.go +++ b/samples/geometry/geometry.go @@ -9,10 +9,10 @@ import ( "image/color" "math" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dkit" - "github.com/llgcode/draw2d/samples" - "github.com/llgcode/draw2d/samples/gopher2" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d/samples/gopher2" ) // Main draws geometry and returns the filename. This should only be diff --git a/samples/gopher/gopher.go b/samples/gopher/gopher.go index f24bf6f..dffc6c6 100644 --- a/samples/gopher/gopher.go +++ b/samples/gopher/gopher.go @@ -8,8 +8,8 @@ package gopher import ( "image/color" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws a left hand and ear of a gopher. Afterwards it returns diff --git a/samples/gopher2/gopher2.go b/samples/gopher2/gopher2.go index 3327cb4..0567b65 100644 --- a/samples/gopher2/gopher2.go +++ b/samples/gopher2/gopher2.go @@ -10,9 +10,9 @@ import ( "image/color" "math" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dkit" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws a rotated face of the gopher. Afterwards it returns diff --git a/samples/helloworld/helloworld.go b/samples/helloworld/helloworld.go index af5b47e..ae8712d 100644 --- a/samples/helloworld/helloworld.go +++ b/samples/helloworld/helloworld.go @@ -9,9 +9,9 @@ import ( "fmt" "image" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dkit" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws "Hello World" and returns the filename. This should only be diff --git a/samples/helloworldgl/helloworldgl.go b/samples/helloworldgl/helloworldgl.go index be89db5..ee057ad 100644 --- a/samples/helloworldgl/helloworldgl.go +++ b/samples/helloworldgl/helloworldgl.go @@ -6,11 +6,11 @@ import ( "log" "runtime" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dgl" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" "github.com/go-gl/gl/v2.1/gl" "github.com/go-gl/glfw/v3.1/glfw" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dgl" - "github.com/llgcode/draw2d/draw2dkit" ) var ( diff --git a/samples/line/line.go b/samples/line/line.go index f106cc4..c0df4db 100644 --- a/samples/line/line.go +++ b/samples/line/line.go @@ -7,9 +7,9 @@ package line import ( "image/color" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dkit" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws vertically spaced lines and returns the filename. diff --git a/samples/linecapjoin/linecapjoin.go b/samples/linecapjoin/linecapjoin.go index 38e80e8..f1240c2 100644 --- a/samples/linecapjoin/linecapjoin.go +++ b/samples/linecapjoin/linecapjoin.go @@ -7,8 +7,8 @@ package linecapjoin import ( "image/color" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws the different line caps and joins. diff --git a/samples/postscript/postscript.go b/samples/postscript/postscript.go index f1d88c1..39f4c42 100644 --- a/samples/postscript/postscript.go +++ b/samples/postscript/postscript.go @@ -8,8 +8,8 @@ import ( "github.com/llgcode/ps" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/samples" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/samples" ) // Main draws the tiger diff --git a/samples/postscriptgl/postscriptgl.go b/samples/postscriptgl/postscriptgl.go index 9e75adb..c5ecb22 100644 --- a/samples/postscriptgl/postscriptgl.go +++ b/samples/postscriptgl/postscriptgl.go @@ -10,9 +10,9 @@ import ( "strings" "time" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dgl" "github.com/go-gl/gl/v2.1/gl" "github.com/go-gl/glfw/v3.1/glfw" - "github.com/llgcode/draw2d/draw2dgl" "github.com/llgcode/ps" ) diff --git a/samples_test.go b/samples_test.go index fe22f06..7afc177 100644 --- a/samples_test.go +++ b/samples_test.go @@ -5,16 +5,16 @@ package draw2d_test import ( "testing" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/samples/android" - "github.com/llgcode/draw2d/samples/frameimage" - "github.com/llgcode/draw2d/samples/geometry" - "github.com/llgcode/draw2d/samples/gopher" - "github.com/llgcode/draw2d/samples/gopher2" - "github.com/llgcode/draw2d/samples/helloworld" - "github.com/llgcode/draw2d/samples/line" - "github.com/llgcode/draw2d/samples/linecapjoin" - "github.com/llgcode/draw2d/samples/postscript" + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/samples/android" + "git.fromouter.space/crunchy-rocks/draw2d/samples/frameimage" + "git.fromouter.space/crunchy-rocks/draw2d/samples/geometry" + "git.fromouter.space/crunchy-rocks/draw2d/samples/gopher" + "git.fromouter.space/crunchy-rocks/draw2d/samples/gopher2" + "git.fromouter.space/crunchy-rocks/draw2d/samples/helloworld" + "git.fromouter.space/crunchy-rocks/draw2d/samples/line" + "git.fromouter.space/crunchy-rocks/draw2d/samples/linecapjoin" + "git.fromouter.space/crunchy-rocks/draw2d/samples/postscript" ) func TestSampleAndroid(t *testing.T) { diff --git a/sync_test.go b/sync_test.go index 8580a81..80bc492 100644 --- a/sync_test.go +++ b/sync_test.go @@ -4,11 +4,12 @@ package draw2d_test import ( "fmt" - "github.com/llgcode/draw2d" - "github.com/llgcode/draw2d/draw2dimg" - "github.com/llgcode/draw2d/draw2dkit" "image" "testing" + + "git.fromouter.space/crunchy-rocks/draw2d" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dimg" + "git.fromouter.space/crunchy-rocks/draw2d/draw2dkit" ) func TestSync(t *testing.T) {