refactor: separate file ios into fio package

fumiama · fumiama · commit 58ff0dc668e0 · 2026-03-29T17:48:08.000+08:00
diff --git a/context.go b/context.go
@@ -16,6 +16,7 @@ import (
 	"strings"
 	"unsafe"
 
+	"github.com/FloatTech/gg/fio"
 	"github.com/golang/freetype/raster"
 	"golang.org/x/image/draw"
 	"golang.org/x/image/font"
@@ -270,14 +271,14 @@ func (dc *Context) H() int {
 //
 // 将图像编码为 PNG 并将其写入磁盘。
 func (dc *Context) SavePNG(path string) error {
-	return SavePNG(path, dc.im)
+	return fio.SavePNG(path, dc.im)
 }
 
 // SaveJPG encodes the image as a JPG and writes it to disk.
 //
 // 将图像编码为 JPG 并将其写入磁盘。
 func (dc *Context) SaveJPG(path string, quality int) error {
-	return SaveJPG(path, dc.im, quality)
+	return fio.SaveJPG(path, dc.im, quality)
 }
 
 // EncodePNG encodes the image as a PNG and writes it to the provided io.Writer.
@@ -921,7 +922,7 @@ func (dc *Context) DrawRegularPolygon(n int, x, y, r, rotation float64) {
 
 // 加载指定路径的图像并设定像素坐标
 func (dc *Context) LoadImage(path string, x, y int) error {
-	img, err := LoadImage(path) //添加图片
+	img, err := fio.LoadImage(path) //添加图片
 	if err != nil {
 		return err
 	}
diff --git a/context_test.go b/context_test.go
@@ -3,6 +3,8 @@ package gg
 import (
 	"math/rand"
 	"testing"
+
+	"github.com/FloatTech/gg/fio"
 )
 
 func checkHash(t *testing.T, dc *Context, expected string) {
@@ -13,7 +15,7 @@ func checkHash(t *testing.T, dc *Context, expected string) {
 }
 
 func saveImage(dc *Context, name string) error {
-	return SavePNG(name+".png", dc.Image())
+	return fio.SavePNG(name+".png", dc.Image())
 }
 
 func TestBlank(t *testing.T) {
diff --git a/effects_test.go b/effects_test.go
@@ -1,9 +1,13 @@
 package gg
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/FloatTech/gg/fio"
+)
 
 func TestBrightness(t *testing.T) {
-	im, err := LoadPNG("examples/gopher.png")
+	im, err := fio.LoadPNG("examples/gopher.png")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -14,7 +18,7 @@ func TestBrightness(t *testing.T) {
 }
 
 func TestContrast(t *testing.T) {
-	im, err := LoadPNG("examples/gopher.png")
+	im, err := fio.LoadPNG("examples/gopher.png")
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/examples/concat_test.go b/examples/concat_test.go
@@ -5,15 +5,16 @@ import (
 	"testing"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 )
 
 func TestConcat(t *testing.T) {
-	im1, err := gg.LoadPNG("james-webb.png")
+	im1, err := fio.LoadPNG("james-webb.png")
 	if err != nil {
 		panic(err)
 	}
 
-	im2, err := gg.LoadPNG("gopher.png")
+	im2, err := fio.LoadPNG("gopher.png")
 	if err != nil {
 		panic(err)
 	}
diff --git a/examples/ellipse_test.go b/examples/ellipse_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 )
 
 func TestEllipse(t *testing.T) {
@@ -17,7 +18,7 @@ func TestEllipse(t *testing.T) {
 		dc.Fill()
 		dc.Pop()
 	}
-	if im, err := gg.LoadImage("gopher.png"); err == nil {
+	if im, err := fio.LoadImage("gopher.png"); err == nil {
 		dc.DrawImageAnchored(im, S/2, S/2, 0.5, 0.5)
 	}
 	dc.SavePNG(GetFileName() + ".png")
diff --git a/examples/mask_test.go b/examples/mask_test.go
@@ -5,10 +5,11 @@ import (
 	"testing"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 )
 
 func TestMask(t *testing.T) {
-	im, err := gg.LoadImage("james-webb.png")
+	im, err := fio.LoadImage("james-webb.png")
 	if err != nil {
 		log.Fatal(err)
 	}
diff --git a/examples/pattern-fill_test.go b/examples/pattern-fill_test.go
@@ -4,10 +4,11 @@ import (
 	"testing"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 )
 
 func TestPF(t *testing.T) {
-	im, err := gg.LoadPNG("james-webb.png")
+	im, err := fio.LoadPNG("james-webb.png")
 	if err != nil {
 		panic(err)
 	}
diff --git a/examples/rotated-image_test.go b/examples/rotated-image_test.go
@@ -4,12 +4,13 @@ import (
 	"testing"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 )
 
 func TestRIM(t *testing.T) {
 	const W = 400
 	const H = 500
-	im, err := gg.LoadPNG("gopher.png")
+	im, err := fio.LoadPNG("gopher.png")
 	if err != nil {
 		panic(err)
 	}
diff --git a/examples/tiling_test.go b/examples/tiling_test.go
@@ -4,12 +4,13 @@ import (
 	"testing"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 )
 
 func TestTiling(t *testing.T) {
 	const NX = 4
 	const NY = 3
-	im, err := gg.LoadPNG("gopher.png")
+	im, err := fio.LoadPNG("gopher.png")
 	if err != nil {
 		panic(err)
 	}
diff --git a/factory/img.go b/factory/img.go
@@ -13,6 +13,7 @@ import (
 	"strings"
 
 	"github.com/FloatTech/gg"
+	"github.com/FloatTech/gg/fio"
 	"github.com/disintegration/imaging"
 )
 
@@ -28,7 +29,7 @@ func Load(path string) (img image.Image, err error) {
 		_ = res.Body.Close()
 		return
 	}
-	return gg.LoadImage(path)
+	return fio.LoadImage(path)
 }
 
 // Parse 解析图片数据流
diff --git a/fio/general.go b/fio/general.go
@@ -0,0 +1,18 @@
+package fio
+
+import (
+	"bufio"
+	"image"
+	"os"
+)
+
+// 加载指定路径的图像
+func LoadImage(path string) (image.Image, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	im, _, err := image.Decode(bufio.NewReader(file))
+	return im, err
+}
diff --git a/fio/jpg.go b/fio/jpg.go
@@ -0,0 +1,30 @@
+package fio
+
+import (
+	"bufio"
+	"image"
+	"image/jpeg"
+	"os"
+)
+
+// 加载指定路径的 JPG 图像
+func LoadJPG(path string) (image.Image, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	return jpeg.Decode(bufio.NewReader(file))
+}
+
+// 保存 JPG 图像
+func SaveJPG(path string, im image.Image, quality int) error {
+	file, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	return jpeg.Encode(file, im, &jpeg.Options{
+		Quality: quality, // 质量百分比
+	})
+}
diff --git a/fio/png.go b/fio/png.go
@@ -0,0 +1,28 @@
+package fio
+
+import (
+	"bufio"
+	"image"
+	"image/png"
+	"os"
+)
+
+// 加载指定路径的 PNG 图像
+func LoadPNG(path string) (image.Image, error) {
+	file, err := os.Open(path)
+	if err != nil {
+		return nil, err
+	}
+	defer file.Close()
+	return png.Decode(bufio.NewReader(file))
+}
+
+// 保存 PNG 图像
+func SavePNG(path string, im image.Image) error {
+	file, err := os.Create(path)
+	if err != nil {
+		return err
+	}
+	defer file.Close()
+	return png.Encode(file, im)
+}
diff --git a/util.go b/util.go
@@ -1,13 +1,10 @@
 package gg
 
 import (
-	"bufio"
 	"fmt"
 	"image"
 	"image/color"
 	"image/draw"
-	"image/jpeg"
-	"image/png"
 	"math"
 	"os"
 	"strings"
@@ -29,59 +26,6 @@ func Degrees(radians float64) float64 {
 	return radians * 180 / math.Pi
 }
 
-// 加载指定路径的图像
-func LoadImage(path string) (image.Image, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	im, _, err := image.Decode(bufio.NewReader(file))
-	return im, err
-}
-
-// 加载指定路径的 JPG 图像
-func LoadJPG(path string) (image.Image, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return jpeg.Decode(bufio.NewReader(file))
-}
-
-// 保存 JPG 图像
-func SaveJPG(path string, im image.Image, quality int) error {
-	file, err := os.Create(path)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-	return jpeg.Encode(file, im, &jpeg.Options{
-		Quality: quality, // 质量百分比
-	})
-}
-
-// 加载指定路径的 PNG 图像
-func LoadPNG(path string) (image.Image, error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return png.Decode(bufio.NewReader(file))
-}
-
-// 保存 PNG 图像
-func SavePNG(path string, im image.Image) error {
-	file, err := os.Create(path)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-	return png.Encode(file, im)
-}
-
 // image.Image 转为 image.RGBA
 func ImageToRGBA(src image.Image) *image.RGBA {
 	return imageToRGBA(src)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@ package gg`
`3`	`3`	`import (`
`4`	`4`	`"math/rand"`
`5`	`5`	`"testing"`
	`6`	`+`
	`7`	`+ "github.com/FloatTech/gg/fio"`
`6`	`8`	`)`
`7`	`9`
`8`	`10`	`func checkHash(t testing.T, dc Context, expected string) {`
`@@ -13,7 +15,7 @@ func checkHash(t testing.T, dc Context, expected string) {`
`13`	`15`	`}`
`14`	`16`
`15`	`17`	`func saveImage(dc *Context, name string) error {`
`16`		`- return SavePNG(name+".png", dc.Image())`
	`18`	`+ return fio.SavePNG(name+".png", dc.Image())`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`func TestBlank(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,16 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/FloatTech/gg"`
	`8`	`+ "github.com/FloatTech/gg/fio"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func TestConcat(t *testing.T) {`
`11`		`- im1, err := gg.LoadPNG("james-webb.png")`
	`12`	`+ im1, err := fio.LoadPNG("james-webb.png")`
`12`	`13`	`if err != nil {`
`13`	`14`	`panic(err)`
`14`	`15`	`}`
`15`	`16`
`16`		`- im2, err := gg.LoadPNG("gopher.png")`
	`17`	`+ im2, err := fio.LoadPNG("gopher.png")`
`17`	`18`	`if err != nil {`
`18`	`19`	`panic(err)`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/FloatTech/gg"`
	`7`	`+ "github.com/FloatTech/gg/fio"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func TestEllipse(t *testing.T) {`
`@@ -17,7 +18,7 @@ func TestEllipse(t *testing.T) {`
`17`	`18`	`dc.Fill()`
`18`	`19`	`dc.Pop()`
`19`	`20`	`}`
`20`		`- if im, err := gg.LoadImage("gopher.png"); err == nil {`
	`21`	`+ if im, err := fio.LoadImage("gopher.png"); err == nil {`
`21`	`22`	`dc.DrawImageAnchored(im, S/2, S/2, 0.5, 0.5)`
`22`	`23`	`}`
`23`	`24`	`dc.SavePNG(GetFileName() + ".png")`
Original file line number	Diff line number	Diff line change
`@@ -5,10 +5,11 @@ import (`
`5`	`5`	`"testing"`
`6`	`6`
`7`	`7`	`"github.com/FloatTech/gg"`
	`8`	`+ "github.com/FloatTech/gg/fio"`
`8`	`9`	`)`
`9`	`10`
`10`	`11`	`func TestMask(t *testing.T) {`
`11`		`- im, err := gg.LoadImage("james-webb.png")`
	`12`	`+ im, err := fio.LoadImage("james-webb.png")`
`12`	`13`	`if err != nil {`
`13`	`14`	`log.Fatal(err)`
`14`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,10 +4,11 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/FloatTech/gg"`
	`7`	`+ "github.com/FloatTech/gg/fio"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func TestPF(t *testing.T) {`
`10`		`- im, err := gg.LoadPNG("james-webb.png")`
	`11`	`+ im, err := fio.LoadPNG("james-webb.png")`
`11`	`12`	`if err != nil {`
`12`	`13`	`panic(err)`
`13`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,13 @@ import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`	`6`	`"github.com/FloatTech/gg"`
	`7`	`+ "github.com/FloatTech/gg/fio"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`func TestRIM(t *testing.T) {`
`10`	`11`	`const W = 400`
`11`	`12`	`const H = 500`
`12`		`- im, err := gg.LoadPNG("gopher.png")`
	`13`	`+ im, err := fio.LoadPNG("gopher.png")`
`13`	`14`	`if err != nil {`
`14`	`15`	`panic(err)`
`15`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ import (`
`13`	`13`	`"strings"`
`14`	`14`
`15`	`15`	`"github.com/FloatTech/gg"`
	`16`	`+ "github.com/FloatTech/gg/fio"`
`16`	`17`	`"github.com/disintegration/imaging"`
`17`	`18`	`)`
`18`	`19`
`@@ -28,7 +29,7 @@ func Load(path string) (img image.Image, err error) {`
`28`	`29`	`_ = res.Body.Close()`
`29`	`30`	`return`
`30`	`31`	`}`
`31`		`- return gg.LoadImage(path)`
	`32`	`+ return fio.LoadImage(path)`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`// Parse 解析图片数据流`