update all vendored dependencies

vendor/github.com/rwcarlsen/goexif/exif/exif.go

@@ -27,24 +27,6 @@ const (
 	interopPointer = 0xA005
 )
 
-// A decodeError is returned when the image cannot be decoded as a tiff image.
-type decodeError struct {
-	cause error
-}
-
-func (de decodeError) Error() string {
-	return fmt.Sprintf("exif: decode failed (%v) ", de.cause.Error())
-}
-
-// IsShortReadTagValueError identifies a ErrShortReadTagValue error.
-func IsShortReadTagValueError(err error) bool {
-	de, ok := err.(decodeError)
-	if ok {
-		return de.cause == tiff.ErrShortReadTagValue
-	}
-	return false
-}
-
 // A TagNotPresentError is returned when the requested field is not
 // present in the EXIF.
 type TagNotPresentError FieldName
@@ -267,13 +249,13 @@ func Decode(r io.Reader) (*Exif, error) {
 	}
 
 	if err != nil {
-		return nil, decodeError{cause: err}
+		return nil, fmt.Errorf("exif: decode failed (%v) ", err)
 	}
 
 	er.Seek(0, 0)
 	raw, err := ioutil.ReadAll(er)
 	if err != nil {
-		return nil, decodeError{cause: err}
+		return nil, fmt.Errorf("exif: decode failed (%v) ", err)
 	}
 
 	// build an exif structure from the tiff
@@ -573,15 +555,11 @@ func newAppSec(marker byte, r io.Reader) (*appSec, error) {
 			continue
 		}
 
-		dataLenBytes := make([]byte, 2)
-		for k,_ := range dataLenBytes {
-			c, err := br.ReadByte()
-			if err != nil {
-				return nil, err
-			}
-			dataLenBytes[k] = c
+		dataLenBytes, err := br.Peek(2)
+		if err != nil {
+			return nil, err
 		}
-		dataLen = int(binary.BigEndian.Uint16(dataLenBytes)) - 2
+		dataLen = int(binary.BigEndian.Uint16(dataLenBytes))
 	}
 
 	// read section data
@@ -595,6 +573,7 @@ func newAppSec(marker byte, r io.Reader) (*appSec, error) {
 		}
 		app.data = append(app.data, s[:n]...)
 	}
+	app.data = app.data[2:] // exclude dataLenBytes
 	return app, nil
 }
 

vendor/github.com/rwcarlsen/goexif/exif/fields.go

@@ -87,8 +87,6 @@ const (
 	Sharpness                            = "Sharpness"
 	DeviceSettingDescription             = "DeviceSettingDescription"
 	SubjectDistanceRange                 = "SubjectDistanceRange"
-	LensMake                             = "LensMake"
-	LensModel                            = "LensModel"
 )
 
 // thumbnail fields
@@ -239,8 +237,6 @@ var exifFields = map[uint16]FieldName{
 	0xA40A: Sharpness,
 	0xA40B: DeviceSettingDescription,
 	0xA40C: SubjectDistanceRange,
-	0xA433: LensMake,
-	0xA434: LensModel,
 }
 
 var gpsFields = map[uint16]FieldName{

vendor/github.com/rwcarlsen/goexif/exif/regen_regress.go

@@ -1,79 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/rwcarlsen/goexif/exif"
-	"github.com/rwcarlsen/goexif/tiff"
-)
-
-func main() {
-	flag.Parse()
-	fname := flag.Arg(0)
-
-	dst, err := os.Create(fname)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer dst.Close()
-
-	dir, err := os.Open("samples")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer dir.Close()
-
-	names, err := dir.Readdirnames(0)
-	if err != nil {
-		log.Fatal(err)
-	}
-	for i, name := range names {
-		names[i] = filepath.Join("samples", name)
-	}
-	makeExpected(names, dst)
-}
-
-func makeExpected(files []string, w io.Writer) {
-	fmt.Fprintf(w, "package exif\n\n")
-	fmt.Fprintf(w, "var regressExpected = map[string]map[FieldName]string{\n")
-
-	for _, name := range files {
-		f, err := os.Open(name)
-		if err != nil {
-			continue
-		}
-
-		x, err := exif.Decode(f)
-		if err != nil {
-			f.Close()
-			continue
-		}
-
-		fmt.Fprintf(w, "\"%v\": map[FieldName]string{\n", filepath.Base(name))
-		x.Walk(&regresswalk{w})
-		fmt.Fprintf(w, "},\n")
-		f.Close()
-	}
-	fmt.Fprintf(w, "}")
-}
-
-type regresswalk struct {
-	wr io.Writer
-}
-
-func (w *regresswalk) Walk(name exif.FieldName, tag *tiff.Tag) error {
-	if strings.HasPrefix(string(name), exif.UnknownPrefix) {
-		fmt.Fprintf(w.wr, "\"%v\": `%v`,\n", name, tag.String())
-	} else {
-		fmt.Fprintf(w.wr, "%v: `%v`,\n", name, tag.String())
-	}
-	return nil
-}

vendor/github.com/rwcarlsen/goexif/tiff/tag.go

@@ -25,8 +25,6 @@ const (
 	OtherVal
 )
 
-var ErrShortReadTagValue = errors.New("tiff: short read of tag value")
-
 var formatNames = map[Format]string{
 	IntVal:    "int",
 	FloatVal:  "float",
@@ -154,7 +152,7 @@ func DecodeTag(r ReadAtReader, order binary.ByteOrder) (*Tag, error) {
 		if err != nil {
 			return t, errors.New("tiff: tag value read failed: " + err.Error())
 		} else if n != int64(valLen) {
-			return t, ErrShortReadTagValue
+			return t, errors.New("tiff: short read of tag value")
 		}
 		t.Val = buff.Bytes()