Skip to content

Commit a3839fb

Browse files
committed
Change receiver to pointer
1 parent e1e86eb commit a3839fb

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

kadai2/tanaka0325/imgconv/cmd/imgconv/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func main() {
5252
onExit(err)
5353
}
5454
} else {
55-
fmt.Printf("%[1]s.%[2]s => %[1]s.%[3]s\n", param.File.Path, param.FromExt, param.ToExt)
55+
fmt.Printf("%[1]s.%[2]s => %[1]s.%[3]s\n", param.File.GetPath(), param.FromExt, param.ToExt)
5656
}
5757
}
5858
}

kadai2/tanaka0325/imgconv/file.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ import (
88
type OpenCreator interface {
99
Open() (io.ReadCloser, error)
1010
Create() (io.WriteCloser, error)
11+
GetPath() string
1112
}
1213

1314
type File struct {
1415
Path string
1516
}
1617

17-
func (f File) Open() (io.ReadCloser, error) { return os.Open(f.Path) }
18-
func (f File) Create() (io.WriteCloser, error) { return os.Create(f.Path) }
18+
func (f *File) Open() (io.ReadCloser, error) { return os.Open(f.Path) }
19+
func (f *File) Create() (io.WriteCloser, error) { return os.Create(f.Path) }
20+
func (f *File) GetPath() string { return f.Path }
1921

20-
func NewFile(p string) File {
21-
return File{Path: p}
22+
func NewFile(p string) *File {
23+
return &File{Path: p}
2224
}

kadai2/tanaka0325/imgconv/image.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -29,52 +29,52 @@ type Image struct{}
2929
// ImagePng is type for png format.
3030
type ImagePNG Image
3131

32-
func (ip ImagePNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
32+
func (ip *ImagePNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
3333

34-
func (ip ImagePNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
34+
func (ip *ImagePNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
3535

3636
// ImageJPEG is type for jpeg format.
3737
type ImageJPEG Image
3838

39-
func (ip ImageJPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
39+
func (ip *ImageJPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
4040

41-
func (ip ImageJPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
41+
func (ip *ImageJPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
4242

4343
// ImageGIF is type for gif format.
4444
type ImageGIF Image
4545

46-
func (ip ImageGIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
46+
func (ip *ImageGIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
4747

48-
func (ip ImageGIF) Encode(w io.Writer, i image.Image) error {
48+
func (ip *ImageGIF) Encode(w io.Writer, i image.Image) error {
4949
return gif.Encode(w, i, &gif.Options{NumColors: 256})
5050
}
5151

5252
// ImageBMP is type for bmp format.
5353
type ImageBMP Image
5454

55-
func (ip ImageBMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
55+
func (ip *ImageBMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
5656

57-
func (ip ImageBMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
57+
func (ip *ImageBMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
5858

5959
// ImageTIFF is type for tiff format.
6060
type ImageTIFF Image
6161

62-
func (ip ImageTIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
62+
func (ip *ImageTIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
6363

64-
func (ip ImageTIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
64+
func (ip *ImageTIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
6565

6666
func NewImage(ext string) DecodeEncoder {
6767
switch ext {
6868
case "png":
69-
return ImagePNG{}
69+
return &ImagePNG{}
7070
case "jpg", "jpeg":
71-
return ImageJPEG{}
71+
return &ImageJPEG{}
7272
case "gif":
73-
return ImageGIF{}
73+
return &ImageGIF{}
7474
case "bmp":
75-
return ImageBMP{}
75+
return &ImageBMP{}
7676
case "tiff", "tif":
77-
return ImageTIFF{}
77+
return &ImageTIFF{}
7878
}
7979

8080
return nil

kadai2/tanaka0325/imgconv/imgconv.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package imgconv
33

44
type ConvertParam struct {
5-
File File
5+
File OpenCreator
66
BeforeImage Decoder
77
AfterImage Encoder
88
FromExt string

0 commit comments

Comments
 (0)