github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

resources/image: Fix nilpointer for images with no Exif

Browse source 
E.g. PNG files.

Fixes #7688
This commit is contained in:
Bjørn Erik Pedersen 2020-09-14 17:19:30 +02:00
parent 214afe4c1b
commit cd00f7f966
4 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/image.go
View file

@ -71,11 +71,11 @@ type imageMeta struct {
Exif *exif.Exif Exif *exif.Exif
} }
func (i *imageResource) Exif() (*exif.Exif, error) { func (i *imageResource) Exif() *exif.Exif {
return i.root.getExif() return i.root.getExif()
} }
func (i *imageResource) getExif() (*exif.Exif, error) { func (i *imageResource) getExif() *exif.Exif {
i.metaInit.Do(func() { i.metaInit.Do(func() {
@ -131,10 +131,14 @@ func (i *imageResource) getExif() (*exif.Exif, error) {
}) })
if i.metaInitErr != nil { if i.metaInitErr != nil {
return nil, i.metaInitErr panic(fmt.Sprintf("metadata init failed: %s", i.metaInitErr))
} }
return i.meta.Exif, nil if i.meta == nil {
return nil
}
return i.meta.Exif
} }
func (i *imageResource) Clone() resource.Resource { func (i *imageResource) Clone() resource.Resource {

11
resources/image_test.go
View file

@ -321,6 +321,7 @@ func TestImageResize8BitPNG(t *testing.T) {
c.Assert(image.MediaType().Type(), qt.Equals, "image/png") c.Assert(image.MediaType().Type(), qt.Equals, "image/png")
c.Assert(image.RelPermalink(), qt.Equals, "/a/gohugoio.png") c.Assert(image.RelPermalink(), qt.Equals, "/a/gohugoio.png")
c.Assert(image.ResourceType(), qt.Equals, "image") c.Assert(image.ResourceType(), qt.Equals, "image")
c.Assert(image.Exif(), qt.IsNil)
resized, err := image.Resize("800x") resized, err := image.Resize("800x")
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
@ -337,12 +338,14 @@ func TestImageResizeInSubPath(t *testing.T) {
c.Assert(image.MediaType(), eq, media.PNGType) c.Assert(image.MediaType(), eq, media.PNGType)
c.Assert(image.RelPermalink(), qt.Equals, "/a/sub/gohugoio2.png") c.Assert(image.RelPermalink(), qt.Equals, "/a/sub/gohugoio2.png")
c.Assert(image.ResourceType(), qt.Equals, "image") c.Assert(image.ResourceType(), qt.Equals, "image")
c.Assert(image.Exif(), qt.IsNil)
resized, err := image.Resize("101x101") resized, err := image.Resize("101x101")
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(resized.MediaType().Type(), qt.Equals, "image/png") c.Assert(resized.MediaType().Type(), qt.Equals, "image/png")
c.Assert(resized.RelPermalink(), qt.Equals, "/a/sub/gohugoio2_hu0e1b9e4a4be4d6f86c7b37b9ccce3fbc_73886_101x101_resize_linear_2.png") c.Assert(resized.RelPermalink(), qt.Equals, "/a/sub/gohugoio2_hu0e1b9e4a4be4d6f86c7b37b9ccce3fbc_73886_101x101_resize_linear_2.png")
c.Assert(resized.Width(), qt.Equals, 101) c.Assert(resized.Width(), qt.Equals, 101)
c.Assert(resized.Exif(), qt.IsNil)
publishedImageFilename := filepath.Clean(resized.RelPermalink()) publishedImageFilename := filepath.Clean(resized.RelPermalink())
@ -387,8 +390,7 @@ func TestImageExif(t *testing.T) {
image := fetchResourceForSpec(spec, c, "sunset.jpg").(resource.Image) image := fetchResourceForSpec(spec, c, "sunset.jpg").(resource.Image)
getAndCheckExif := func(c *qt.C, image resource.Image) { getAndCheckExif := func(c *qt.C, image resource.Image) {
x, err := image.Exif() x := image.Exif()
c.Assert(err, qt.IsNil)
c.Assert(x, qt.Not(qt.IsNil)) c.Assert(x, qt.Not(qt.IsNil))
c.Assert(x.Date.Format("2006-01-02"), qt.Equals, "2017-10-27") c.Assert(x.Date.Format("2006-01-02"), qt.Equals, "2017-10-27")
@ -403,7 +405,7 @@ func TestImageExif(t *testing.T) {
c.Assert(ok, qt.Equals, true) c.Assert(ok, qt.Equals, true)
c.Assert(lensModel, qt.Equals, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM") c.Assert(lensModel, qt.Equals, "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM")
resized, _ := image.Resize("300x200") resized, _ := image.Resize("300x200")
x2, _ := resized.Exif() x2 := resized.Exif()
c.Assert(x2, eq, x) c.Assert(x2, eq, x)
} }
@ -426,8 +428,7 @@ func BenchmarkImageExif(b *testing.B) {
} }
getAndCheckExif := func(c *qt.C, image resource.Image) { getAndCheckExif := func(c *qt.C, image resource.Image) {
x, err := image.Exif() x := image.Exif()
c.Assert(err, qt.IsNil)
c.Assert(x, qt.Not(qt.IsNil)) c.Assert(x, qt.Not(qt.IsNil))
c.Assert(x.Long, qt.Equals, float64(-4.50846)) c.Assert(x.Long, qt.Equals, float64(-4.50846))

2
resources/resource/resourcetypes.go
View file

@ -58,7 +58,7 @@ type ImageOps interface {
Fit(spec string) (Image, error) Fit(spec string) (Image, error)
Resize(spec string) (Image, error) Resize(spec string) (Image, error)
Filter(filters ...interface{}) (Image, error) Filter(filters ...interface{}) (Image, error)
Exif() (*exif.Exif, error) Exif() *exif.Exif
} }
type ResourceTypeProvider interface { type ResourceTypeProvider interface {

2
resources/transform.go
View file

@ -183,7 +183,7 @@ func (r *resourceAdapter) Height() int {
return r.getImageOps().Height() return r.getImageOps().Height()
} }
func (r *resourceAdapter) Exif() (*exif.Exif, error) { func (r *resourceAdapter) Exif() *exif.Exif {
return r.getImageOps().Exif() return r.getImageOps().Exif()
} }