Skip to content

Commit c7aa25b

Browse files
committed
Rename struct of images
1 parent 3470497 commit c7aa25b

File tree

1 file changed

+24
-24
lines changed

1 file changed

+24
-24
lines changed

Diff for: kadai2/tanaka0325/imgconv/image.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -25,54 +25,54 @@ type DecodeEncoder interface {
2525
}
2626

2727
// ImagePng is type for png format.
28-
type ImagePNG struct{}
28+
type PNG struct{}
2929

30-
func (ImagePNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
30+
func (PNG) Decode(r io.Reader) (image.Image, error) { return png.Decode(r) }
3131

32-
func (ImagePNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
32+
func (PNG) Encode(w io.Writer, i image.Image) error { return png.Encode(w, i) }
3333

34-
// ImageJPEG is type for jpeg format.
35-
type ImageJPEG struct{}
34+
// JPEG is type for jpeg format.
35+
type JPEG struct{}
3636

37-
func (ImageJPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
37+
func (JPEG) Decode(r io.Reader) (image.Image, error) { return jpeg.Decode(r) }
3838

39-
func (ImageJPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
39+
func (JPEG) Encode(w io.Writer, i image.Image) error { return jpeg.Encode(w, i, nil) }
4040

41-
// ImageGIF is type for gif format.
42-
type ImageGIF struct{}
41+
// GIF is type for gif format.
42+
type GIF struct{}
4343

44-
func (ImageGIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
44+
func (GIF) Decode(r io.Reader) (image.Image, error) { return gif.Decode(r) }
4545

46-
func (ImageGIF) Encode(w io.Writer, i image.Image) error {
46+
func (GIF) Encode(w io.Writer, i image.Image) error {
4747
return gif.Encode(w, i, &gif.Options{NumColors: 256})
4848
}
4949

50-
// ImageBMP is type for bmp format.
51-
type ImageBMP struct{}
50+
// BMP is type for bmp format.
51+
type BMP struct{}
5252

53-
func (ImageBMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
53+
func (BMP) Decode(r io.Reader) (image.Image, error) { return bmp.Decode(r) }
5454

55-
func (ImageBMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
55+
func (BMP) Encode(w io.Writer, i image.Image) error { return bmp.Encode(w, i) }
5656

57-
// ImageTIFF is type for tiff format.
58-
type ImageTIFF struct{}
57+
// TIFF is type for tiff format.
58+
type TIFF struct{}
5959

60-
func (ImageTIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
60+
func (TIFF) Decode(r io.Reader) (image.Image, error) { return tiff.Decode(r) }
6161

62-
func (ImageTIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
62+
func (TIFF) Encode(w io.Writer, i image.Image) error { return tiff.Encode(w, i, nil) }
6363

6464
func NewImage(ext string) DecodeEncoder {
6565
switch ext {
6666
case "png":
67-
return ImagePNG{}
67+
return PNG{}
6868
case "jpg", "jpeg":
69-
return ImageJPEG{}
69+
return JPEG{}
7070
case "gif":
71-
return ImageGIF{}
71+
return GIF{}
7272
case "bmp":
73-
return ImageBMP{}
73+
return BMP{}
7474
case "tiff", "tif":
75-
return ImageTIFF{}
75+
return TIFF{}
7676
}
7777

7878
return nil

0 commit comments

Comments
 (0)