Skip to content

Commit be1a680

Browse files
oneplus1000oneplus1000
committed
clean io/util
1 parent d6ac6c0 commit be1a680

File tree

9 files changed

+29
-33
lines changed

9 files changed

+29
-33
lines changed

‎embedfont_obj.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gopdf
33
import (
44
"fmt"
55
"io"
6-
"io/ioutil"
6+
"os"
77
)
88

99
// EmbedFontObj is an embedded font object.
@@ -23,7 +23,7 @@ func (e *EmbedFontObj) protection() *PDFProtection {
2323
}
2424

2525
func (e *EmbedFontObj) write(w io.Writer, objID int) error {
26-
b, err := ioutil.ReadFile(e.zfontpath)
26+
b, err := os.ReadFile(e.zfontpath)
2727
if err != nil {
2828
return err
2929
}

‎examples/mask-image/example.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package main
22

33
import (
4-
"io/ioutil"
54
"log"
65
"os"
76
"path/filepath"
@@ -34,7 +33,7 @@ func main() {
3433
}
3534

3635
//image bytes
37-
b, err := ioutil.ReadFile(resourcesPath + "/gopher01.jpg")
36+
b, err := os.ReadFile(resourcesPath + "/gopher01.jpg")
3837
if err != nil {
3938
log.Panic(err.Error())
4039
}

‎fontmaker/core/fontmaker.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"compress/zlib"
77
"errors"
88
"fmt"
9-
"io/ioutil"
109
"os"
1110
"path/filepath"
1211
"strconv"
@@ -65,7 +64,7 @@ func (f *FontMaker) MakeFont(fontpath string, mappath string, encode string, out
6564
var buff bytes.Buffer
6665
gzipwriter := zlib.NewWriter(&buff)
6766

68-
fontbytes, err := ioutil.ReadFile(fontpath)
67+
fontbytes, err := os.ReadFile(fontpath)
6968
if err != nil {
7069
return err
7170
}
@@ -75,7 +74,7 @@ func (f *FontMaker) MakeFont(fontpath string, mappath string, encode string, out
7574
return err
7675
}
7776
gzipwriter.Close()
78-
err = ioutil.WriteFile(outfolderpath+"/"+gzfilename, buff.Bytes(), 0644)
77+
err = os.WriteFile(outfolderpath+"/"+gzfilename, buff.Bytes(), 0644)
7978
if err != nil {
8079
return err
8180
}
@@ -202,7 +201,7 @@ func (f *FontMaker) MakeDefinitionFile(gofontname string, mappath string, export
202201
str += "\treturn me.family\n"
203202
str += "}\n"
204203

205-
err = ioutil.WriteFile(exportfile, []byte(str), 0666)
204+
err = os.WriteFile(exportfile, []byte(str), 0666)
206205
if err != nil {
207206
return "", err
208207
}
@@ -375,7 +374,7 @@ func (f *FontMaker) GetInfoFromTrueType(fontpath string, fontmaps []FontMap) (Tt
375374

376375
info := NewTtfInfo()
377376

378-
fileContent, err := ioutil.ReadFile(fontpath)
377+
fileContent, err := os.ReadFile(fontpath)
379378
if err != nil {
380379
return nil, err
381380
}

‎fontmaker/core/ttfparser.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"encoding/binary"
88
"errors"
99
"io"
10-
"io/ioutil"
1110
"os"
1211
"regexp"
1312
"strconv"
@@ -204,7 +203,7 @@ func (t *TTFParser) SetUseKerning(use bool) {
204203

205204
// Parse parse
206205
func (t *TTFParser) Parse(filepath string) error {
207-
data, err := ioutil.ReadFile(filepath)
206+
data, err := os.ReadFile(filepath)
208207
if err != nil {
209208
return err
210209
}
@@ -213,7 +212,7 @@ func (t *TTFParser) Parse(filepath string) error {
213212

214213
// ParseByReader parse by io.reader
215214
func (t *TTFParser) ParseByReader(rd io.Reader) error {
216-
fontData, err := ioutil.ReadAll(rd)
215+
fontData, err := io.ReadAll(rd)
217216
if err != nil {
218217
return err
219218
}

‎gopdf.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"image"
99
"image/png"
1010
"io"
11-
"io/ioutil"
1211
"log"
1312
"math"
1413
"os"
@@ -949,7 +948,7 @@ func (gp *GoPdf) SetCharSpacing(charSpacing float64) error {
949948

950949
// WritePdf : write pdf file
951950
func (gp *GoPdf) WritePdf(pdfPath string) error {
952-
return ioutil.WriteFile(pdfPath, gp.GetBytesPdf(), 0644)
951+
return os.WriteFile(pdfPath, gp.GetBytesPdf(), 0644)
953952
}
954953

955954
// WriteTo implements the io.WriterTo interface and can
@@ -1600,7 +1599,7 @@ func (gp *GoPdf) AddTTFFontWithOption(family string, ttfpath string, option TtfO
16001599
if _, err := os.Stat(ttfpath); os.IsNotExist(err) {
16011600
return err
16021601
}
1603-
data, err := ioutil.ReadFile(ttfpath)
1602+
data, err := os.ReadFile(ttfpath)
16041603
if err != nil {
16051604
return err
16061605
}

‎gopdf_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package gopdf
33
import (
44
"bytes"
55
"errors"
6-
"io/ioutil"
6+
"io"
77
"log"
88
"os"
99
"testing"
@@ -32,7 +32,7 @@ func BenchmarkPdfWithImageHolder(b *testing.B) {
3232
return
3333
}
3434

35-
bytesOfImg, err := ioutil.ReadFile("./test/res/chilli.jpg")
35+
bytesOfImg, err := os.ReadFile("./test/res/chilli.jpg")
3636
if err != nil {
3737
b.Error(err)
3838
return
@@ -63,7 +63,7 @@ func TestPdfWithImageHolder(t *testing.T) {
6363
pdf := setupDefaultA4PDF(t)
6464
pdf.AddPage()
6565

66-
bytesOfImg, err := ioutil.ReadFile("./test/res/PNG_transparency_demonstration_1.png")
66+
bytesOfImg, err := os.ReadFile("./test/res/PNG_transparency_demonstration_1.png")
6767
if err != nil {
6868
t.Error(err)
6969
return
@@ -101,7 +101,7 @@ func TestRetrievingNumberOfPdfPage(t *testing.T) {
101101
}
102102
pdf.AddPage()
103103

104-
bytesOfImg, err := ioutil.ReadFile("./test/res/gopher01.jpg")
104+
bytesOfImg, err := os.ReadFile("./test/res/gopher01.jpg")
105105
if err != nil {
106106
t.Error(err)
107107
return
@@ -149,7 +149,7 @@ func TestImageCrop(t *testing.T) {
149149

150150
pdf.AddPage()
151151

152-
bytesOfImg, err := ioutil.ReadFile("./test/res/gopher01.jpg")
152+
bytesOfImg, err := os.ReadFile("./test/res/gopher01.jpg")
153153
if err != nil {
154154
t.Error(err)
155155
return
@@ -210,7 +210,7 @@ func BenchmarkAddTTFFontByReader(b *testing.B) {
210210
}
211211
defer ttf.Close()
212212

213-
fontData, err := ioutil.ReadAll(ttf)
213+
fontData, err := io.ReadAll(ttf)
214214
if err != nil {
215215
b.Error(err)
216216
return
@@ -253,7 +253,7 @@ func BenchmarkAddTTFFontData(b *testing.B) {
253253
}
254254
defer ttf.Close()
255255

256-
fontData, err := ioutil.ReadAll(ttf)
256+
fontData, err := io.ReadAll(ttf)
257257
if err != nil {
258258
b.Error(err)
259259
return
@@ -276,7 +276,7 @@ func TestReuseFontData(t *testing.T) {
276276
}
277277
defer ttf.Close()
278278

279-
fontData, err := ioutil.ReadAll(ttf)
279+
fontData, err := io.ReadAll(ttf)
280280
if err != nil {
281281
t.Error(err)
282282
return
@@ -543,7 +543,7 @@ func TestClearValue(t *testing.T) {
543543
return
544544
}
545545

546-
bytesOfImg, err := ioutil.ReadFile("./test/res/PNG_transparency_demonstration_1.png")
546+
bytesOfImg, err := os.ReadFile("./test/res/PNG_transparency_demonstration_1.png")
547547
if err != nil {
548548
t.Error(err)
549549
return

‎image_holder.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/md5"
66
"fmt"
77
"io"
8-
"io/ioutil"
8+
"os"
99
)
1010

1111
// ImageHolder hold image data
@@ -50,7 +50,7 @@ func newImageBuff(b []byte) (*imageBuff, error) {
5050
func newImageBuffByPath(path string) (*imageBuff, error) {
5151
var i imageBuff
5252
i.id = path
53-
b, err := ioutil.ReadFile(path)
53+
b, err := os.ReadFile(path)
5454
if err != nil {
5555
return nil, err
5656
}
@@ -60,7 +60,7 @@ func newImageBuffByPath(path string) (*imageBuff, error) {
6060

6161
func newImageBuffByReader(r io.Reader) (*imageBuff, error) {
6262

63-
b, err := ioutil.ReadAll(r)
63+
b, err := io.ReadAll(r)
6464
if err != nil {
6565
return nil, err
6666
}

‎image_obj.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"bytes"
55
"fmt"
66
"image"
7+
78
// Packages image/jpeg and image/png are not used explicitly in the code below,
89
// but are imported for their initialization side-effect, which allows
910
// image.Decode to understand JPEG formatted images.
1011
_ "image/jpeg"
1112
_ "image/png"
1213
"io"
13-
"io/ioutil"
1414
"log"
1515
"os"
1616
)
@@ -135,7 +135,7 @@ func (i *ImageObj) SetImagePath(path string) error {
135135
// SetImage set image
136136
func (i *ImageObj) SetImage(r io.Reader) error {
137137

138-
data, err := ioutil.ReadAll(r)
138+
data, err := io.ReadAll(r)
139139
if err != nil {
140140
return err
141141
}

‎image_obj_parse.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"image"
1010
"image/color"
1111
"io"
12-
"io/ioutil"
12+
"os"
1313
"strings"
1414
)
1515

@@ -125,7 +125,7 @@ func haveSMask(imginfo imgInfo) bool {
125125
}
126126

127127
func parseImgByPath(path string) (imgInfo, error) {
128-
data, err := ioutil.ReadFile(path)
128+
data, err := os.ReadFile(path)
129129
if err != nil {
130130
return imgInfo{}, err
131131
}
@@ -149,7 +149,7 @@ func parseImg(raw *bytes.Reader) (imgInfo, error) {
149149
return info, err
150150
}
151151
raw.Seek(0, 0)
152-
info.data, err = ioutil.ReadAll(raw)
152+
info.data, err = io.ReadAll(raw)
153153
if err != nil {
154154
return info, err
155155
}
@@ -380,7 +380,7 @@ func parsePng(f *bytes.Reader, info *imgInfo, imgConfig image.Config) error {
380380
return err
381381
}
382382
defer zipReader.Close()
383-
afterZipData, err := ioutil.ReadAll(zipReader)
383+
afterZipData, err := io.ReadAll(zipReader)
384384
if err != nil {
385385
return err
386386
}

0 commit comments

Comments
 (0)