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

ifd_enumerate.go: Stop exporting ParseIfd()

Browse Source
This commit is contained in:
Dustin Oprea 2020-05-19 03:41:06 -04:00
parent 3cdb59fd80
commit 1b9bb61b5f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
v2/ifd_enumerate.go
View File

@ -276,9 +276,9 @@ func (ie *IfdEnumerate) parseTag(fqIfdPath string, tagPosition int, bp *bytePars
// TagVisitorFn is called for each tag when enumerating through the EXIF. // TagVisitorFn is called for each tag when enumerating through the EXIF.
type TagVisitorFn func(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error) type TagVisitorFn func(fqIfdPath string, ifdIndex int, ite *IfdTagEntry) (err error)
// ParseIfd decodes the IFD block that we're currently sitting on the first // parseIfd decodes the IFD block that we're currently sitting on the first
// byte of. // byte of.
func (ie *IfdEnumerate) ParseIfd(fqIfdPath string, ifdIndex int, bp *byteParser, visitor TagVisitorFn, doDescend bool) (nextIfdOffset uint32, entries []*IfdTagEntry, thumbnailData []byte, err error) { func (ie *IfdEnumerate) parseIfd(fqIfdPath string, ifdIndex int, bp *byteParser, visitor TagVisitorFn, doDescend bool) (nextIfdOffset uint32, entries []*IfdTagEntry, thumbnailData []byte, err error) {
defer func() { defer func() {
if state := recover(); state != nil { if state := recover(); state != nil {
err = log.Wrap(state.(error)) err = log.Wrap(state.(error))
@ -476,7 +476,7 @@ func (ie *IfdEnumerate) scan(ifdName string, ifdOffset uint32, visitor TagVisito
log.Panic(err) log.Panic(err)
} }
nextIfdOffset, _, _, err := ie.ParseIfd(fqIfdPath, ifdIndex, bp, visitor, true) nextIfdOffset, _, _, err := ie.parseIfd(fqIfdPath, ifdIndex, bp, visitor, true)
log.PanicIf(err) log.PanicIf(err)
currentOffset := bp.CurrentOffset() currentOffset := bp.CurrentOffset()
@ -1126,7 +1126,7 @@ func (ie *IfdEnumerate) Collect(rootIfdOffset uint32) (index IfdIndex, err error
log.Panic(err) log.Panic(err)
} }
nextIfdOffset, entries, thumbnailData, err := ie.ParseIfd(fqIfdPath, currentIndex, bp, nil, false) nextIfdOffset, entries, thumbnailData, err := ie.parseIfd(fqIfdPath, currentIndex, bp, nil, false)
log.PanicIf(err) log.PanicIf(err)
currentOffset := bp.CurrentOffset() currentOffset := bp.CurrentOffset()
@ -1318,7 +1318,7 @@ func ParseOneIfd(ifdMapping *IfdMapping, tagIndex *TagIndex, fqIfdPath, ifdPath
log.Panic(err) log.Panic(err)
} }
nextIfdOffset, entries, _, err = ie.ParseIfd(fqIfdPath, 0, bp, visitor, true) nextIfdOffset, entries, _, err = ie.parseIfd(fqIfdPath, 0, bp, visitor, true)
log.PanicIf(err) log.PanicIf(err)
return nextIfdOffset, entries, nil return nextIfdOffset, entries, nil