GOMODULES/go-exif
1
0
Fork 0
mirror of https://github.com/dsoprea/go-exif.git synced 2025-05-31 11:41:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

exif: Renamed ErrNotExif to ErrNoExif.

Browse Source
This commit is contained in:
Dustin Oprea 2018-06-13 05:51:28 -04:00
parent dcd8d23b07
commit 235b1a5936
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
exif.go
View File

@ -52,7 +52,7 @@ var (
) )
var ( var (
ErrNotExif = errors.New("not exif data") ErrNoExif = errors.New("no exif data")
ErrExifHeaderError = errors.New("exif header error") ErrExifHeaderError = errors.New("exif header error")
) )
@ -76,13 +76,13 @@ func SearchAndExtractExif(data []byte) (rawExif []byte, err error) {
if _, err := ParseExifHeader(data[i:]); err == nil { if _, err := ParseExifHeader(data[i:]); err == nil {
foundAt = i foundAt = i
break break
} else if log.Is(err, ErrNotExif) == false { } else if log.Is(err, ErrNoExif) == false {
log.Panic(err) log.Panic(err)
} }
} }
if foundAt == -1 { if foundAt == -1 {
log.Panicf("EXIF start not found") log.Panic(ErrNoExif)
} }
return data[foundAt:], nil return data[foundAt:], nil
@ -127,7 +127,7 @@ func (eh ExifHeader) String() string {
// ParseExifHeader parses the bytes at the very top of the header. // ParseExifHeader parses the bytes at the very top of the header.
// //
// This will panic with ErrNotExif on any data errors so that we can double as // This will panic with ErrNoExif on any data errors so that we can double as
// an EXIF-detection routine. // an EXIF-detection routine.
func ParseExifHeader(data []byte) (eh ExifHeader, err error) { func ParseExifHeader(data []byte) (eh ExifHeader, err error) {
defer func() { defer func() {
@ -146,14 +146,14 @@ func ParseExifHeader(data []byte) (eh ExifHeader, err error) {
byteOrder, found := ByteOrderLookup[byteOrderBytes] byteOrder, found := ByteOrderLookup[byteOrderBytes]
if found == false { if found == false {
exifLogger.Warningf(nil, "EXIF byte-order not recognized: [%v]", byteOrderBytes) exifLogger.Warningf(nil, "EXIF byte-order not recognized: [%v]", byteOrderBytes)
log.Panic(ErrNotExif) log.Panic(ErrNoExif)
} }
fixedBytes := [2]byte { data[2], data[3] } fixedBytes := [2]byte { data[2], data[3] }
expectedFixedBytes := ExifFixedBytesLookup[byteOrder] expectedFixedBytes := ExifFixedBytesLookup[byteOrder]
if fixedBytes != expectedFixedBytes { if fixedBytes != expectedFixedBytes {
exifLogger.Warningf(nil, "EXIF header fixed-bytes should be [%v] but are: [%v]", expectedFixedBytes, fixedBytes) exifLogger.Warningf(nil, "EXIF header fixed-bytes should be [%v] but are: [%v]", expectedFixedBytes, fixedBytes)
log.Panic(ErrNotExif) log.Panic(ErrNoExif)
} }
firstIfdOffset := byteOrder.Uint32(data[4:8]) firstIfdOffset := byteOrder.Uint32(data[4:8])

2
exif_test.go
View File

@ -42,7 +42,7 @@ func TestVisit(t *testing.T) {
if _, err := ParseExifHeader(data[i:]); err == nil { if _, err := ParseExifHeader(data[i:]); err == nil {
foundAt = i foundAt = i
break break
} else if log.Is(err, ErrNotExif) == false { } else if log.Is(err, ErrNoExif) == false {
log.Panic(err) log.Panic(err)
} }
} }

8
ifd_enumerate.go
View File

@ -1175,6 +1175,8 @@ func FindIfdFromRootIfd(rootIfd *Ifd, ifdDesignation string) (ifd *Ifd, err erro
case "ifd0": case "ifd0":
// We're already on it. // We're already on it.
return ifd, nil
case "ifd1": case "ifd1":
if ifd.NextIfd == nil { if ifd.NextIfd == nil {
log.Panicf("IFD1 not found") log.Panicf("IFD1 not found")
@ -1205,10 +1207,12 @@ func FindIfdFromRootIfd(rootIfd *Ifd, ifdDesignation string) (ifd *Ifd, err erro
} }
candidates := make([]string, len(IfdDesignations)) candidates := make([]string, len(IfdDesignations))
i := 0
for key, _ := range IfdDesignations { for key, _ := range IfdDesignations {
candidates = append(candidates, key) candidates[i] = key
i++
} }
log.Panicf("IFD designation not valid. Use: %s\n", strings.Join(candidates, ", ")) log.Panicf("IFD designation [%s] not valid. Use: %s\n", ifdDesignation, strings.Join(candidates, ", "))
return nil, nil return nil, nil
} }