From 4a336f674c1b7c2d01e2a4c013c7671d10f857fb Mon Sep 17 00:00:00 2001
From: sago35 <sago35@gmail.com>
Date: Sun, 20 Feb 2022 15:16:52 +0900
Subject: [PATCH] image: fix interface

---
 examples/ili9341/slideshow/main.go | 6 ++++--
 image/jpeg/reader.go               | 4 ++--
 image/png/reader.go                | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/examples/ili9341/slideshow/main.go b/examples/ili9341/slideshow/main.go
index e98df00..6e30afe 100644
--- a/examples/ili9341/slideshow/main.go
+++ b/examples/ili9341/slideshow/main.go
@@ -72,7 +72,8 @@ func drawPng(display *ili9341.Device) error {
 		}
 	})
 
-	return png.Decode(p)
+	_, err := png.Decode(p)
+	return err
 }
 
 func drawJpeg(display *ili9341.Device) error {
@@ -84,7 +85,8 @@ func drawJpeg(display *ili9341.Device) error {
 		}
 	})
 
-	return jpeg.Decode(p)
+	_, err := jpeg.Decode(p)
+	return err
 }
 
 func errorMessage(err error) {
diff --git a/image/jpeg/reader.go b/image/jpeg/reader.go
index 553abff..ddf6643 100644
--- a/image/jpeg/reader.go
+++ b/image/jpeg/reader.go
@@ -773,10 +773,10 @@ func (d *decoder) convertToRGB() (image.Image, error) {
 
 // Decode reads a JPEG image from r. Different from the standard package, the
 // decoded result will be received by the callback set by SetCallback().
-func Decode(r io.Reader) error {
+func Decode(r io.Reader) (image.Image, error) {
 	var d decoder
 	_, err := d.decode(r, false)
-	return err
+	return nil, err
 }
 
 // DecodeConfig returns the color model and dimensions of a JPEG image without
diff --git a/image/png/reader.go b/image/png/reader.go
index 2b6af06..9e7c31d 100644
--- a/image/png/reader.go
+++ b/image/png/reader.go
@@ -965,7 +965,7 @@ func (d *decoder) checkHeader() error {
 
 // Decode reads a PNG image from r. Different from the standard package, the
 // decoded result will be received by the callback set by SetCallback().
-func Decode(r io.Reader) error {
+func Decode(r io.Reader) (image.Image, error) {
 	d := &decoder{
 		r:   r,
 		crc: crc32.NewIEEE(),
@@ -974,17 +974,17 @@ func Decode(r io.Reader) error {
 		if err == io.EOF {
 			err = io.ErrUnexpectedEOF
 		}
-		return err
+		return nil, err
 	}
 	for d.stage != dsSeenIEND {
 		if err := d.parseChunk(); err != nil {
 			if err == io.EOF {
 				err = io.ErrUnexpectedEOF
 			}
-			return err
+			return nil, err
 		}
 	}
-	return nil
+	return nil, nil
 }
 
 // DecodeConfig returns the color model and dimensions of a PNG image without