Merge pull request #8 from lucor/feature/hires

ico: update Decode to return the image with highest resolution

ico/reader.go

@@ -25,7 +25,14 @@ func Decode(r io.Reader) (image.Image, error) {
 	if err := d.decode(r); err != nil {
 		return nil, err
 	}
-	return d.images[0], nil
+	img := d.images[0]
+	// return the image with the highest resolution, if any
+	for i := 1; i < len(d.images); i++ {
+		if d.images[i].Bounds().Dx() > img.Bounds().Dx() {
+			img = d.images[i]
+		}
+	}
+	return img, nil
 }
 
 func DecodeAll(r io.Reader) ([]image.Image, error) {

ico/reader_test.go

@@ -51,3 +51,13 @@ func TestDecodeAll(t *testing.T) {
 		}
 	}
 }
+
+func TestDecodeHighestRes(t *testing.T) {
+	expectedWidth := 32
+	rd, err := os.Open("testdata/multi.ico")
+	assert.NoError(t, err)
+	defer rd.Close()
+	image, err := ico.Decode(rd)
+	assert.NoError(t, err)
+	assert.Equal(t, expectedWidth, image.Bounds().Dx())
+}