luisgulo/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

JPEG: Read files with invalid color data from the beginning #3843

Browse source 
Using a ReadSeeker is necessary to read images with invalid color
metadata from the beginning in order to avoid decoding errors.

Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-10-31 14:24:31 +01:00
parent 29be637d62
commit 86f16790ea
1 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
internal/thumb/open_jpeg.go
View file

@ -15,18 +15,28 @@ import (
)
// decodeImage opens an image and decodes its color metadata.
func decodeImage(reader io.Reader, logName string) (md *meta.Data, img image.Image, err error) {
func decodeImage(reader io.ReadSeeker, logName string) (metaData *meta.Data, img image.Image, err error) {
// Read color metadata.
md, imgStream, err := autometa.Load(reader)
metaData, imgReader, err := autometa.Load(reader)
if err != nil {
log.Warnf("thumb: %s in %s (read color metadata)", err, logName)
img, err = imaging.Decode(reader)
} else {
img, err = imaging.Decode(imgStream)
if err == nil {
img, err = imaging.Decode(imgReader)
return metaData, img, err
}
return md, img, err
// Log color metadata read error.
log.Warnf("thumb: %s in %s (read color metadata)", err, logName)
// Seek to the file start in order to avoid decoding errors,
// see https://github.com/photoprism/photoprism/issues/3843
if _, err = reader.Seek(0, io.SeekStart); err != nil {
log.Errorf("thumb: %s in %s (seek to file start)", err, logName)
}
// Decode image file.
img, err = imaging.Decode(reader)
return metaData, img, err
}
// OpenJpeg loads a JPEG image from disk, rotates it, and converts the color profile if necessary.