mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-24 18:58:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

text/v2: allow io.Reader for NewGoTextFaceSource

Browse Source 
This enables to pass fs.File to NewGoTextFaceSource.

Updates #2454
This commit is contained in:
Hajime Hoshi 2023-11-26 17:21:31 +09:00
parent 8291a98756
commit 8777d2c529
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
text/v2/gotextfacesource.go
View File

@ -74,8 +74,8 @@ type GoTextFaceSource struct {
m sync.Mutex m sync.Mutex
} }
func toFontResource(source io.ReadSeeker) (font.Resource, error) { func toFontResource(source io.Reader) (font.Resource, error) {
// font.Resource has io.ReaderAt in addition to io.ReadSeeker. // font.Resource has io.Seeker and io.ReaderAt in addition to io.Reader.
// If source has it, use it as it is. // If source has it, use it as it is.
if s, ok := source.(font.Resource); ok { if s, ok := source.(font.Resource); ok {
return s, nil return s, nil
@ -83,7 +83,7 @@ func toFontResource(source io.ReadSeeker) (font.Resource, error) {
// Read all the bytes and convert this to bytes.Reader. // Read all the bytes and convert this to bytes.Reader.
// This is a very rough solution, but it works. // This is a very rough solution, but it works.
// TODO: Implement io.ReaderAt in a more efficient way. // TODO: Implement io.ReaderAt in a more efficient way when source is io.Seeker.
bs, err := io.ReadAll(source) bs, err := io.ReadAll(source)
if err != nil { if err != nil {
return nil, err return nil, err
@ -93,7 +93,7 @@ func toFontResource(source io.ReadSeeker) (font.Resource, error) {
} }
// NewGoTextFaceSource parses an OpenType or TrueType font and returns a GoTextFaceSource object. // NewGoTextFaceSource parses an OpenType or TrueType font and returns a GoTextFaceSource object.
func NewGoTextFaceSource(source io.ReadSeeker) (*GoTextFaceSource, error) { func NewGoTextFaceSource(source io.Reader) (*GoTextFaceSource, error) {
src, err := toFontResource(source) src, err := toFontResource(source)
if err != nil { if err != nil {
return nil, err return nil, err
@ -119,7 +119,7 @@ func NewGoTextFaceSource(source io.ReadSeeker) (*GoTextFaceSource, error) {
} }
// NewGoTextFaceSourcesFromCollection parses an OpenType or TrueType font collection and returns a slice of GoTextFaceSource objects. // NewGoTextFaceSourcesFromCollection parses an OpenType or TrueType font collection and returns a slice of GoTextFaceSource objects.
func NewGoTextFaceSourcesFromCollection(source io.ReadSeeker) ([]*GoTextFaceSource, error) { func NewGoTextFaceSourcesFromCollection(source io.Reader) ([]*GoTextFaceSource, error) {
src, err := toFontResource(source) src, err := toFontResource(source)
if err != nil { if err != nil {
return nil, err return nil, err