GOMODULES
/
go-exif
mirror of https://github.com/dsoprea/go-exif.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ifd_builder: AddChildIb now validates not previously added.

pull/3/head
Dustin Oprea 2018-04-23 21:59:42 -04:00
parent 4bea09dc78
commit 1107496d3c
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ifd_builder.go
View File

@ -21,7 +21,6 @@ var (
// TODO(dustin): !! Make sure we either replace existing IFDs or validate that the IFD doesn't already exist. // TODO(dustin): !! Make sure we either replace existing IFDs or validate that the IFD doesn't already exist.
// TODO(dustin): !! Add test for NewIfdBuilderWithExistingIfd.
type builderTag struct { type builderTag struct {
@ -573,6 +572,7 @@ func (ib *IfdBuilder) Add(bt builderTag) (err error) {
return nil return nil
} }
// AddChildIb adds a tag that branches to a new IFD.
func (ib *IfdBuilder) AddChildIb(childIb *IfdBuilder) (err error) { func (ib *IfdBuilder) AddChildIb(childIb *IfdBuilder) (err error) {
defer func() { defer func() {
if state := recover(); state != nil { if state := recover(); state != nil {
@ -586,6 +586,15 @@ func (ib *IfdBuilder) AddChildIb(childIb *IfdBuilder) (err error) {
log.Panicf("Child IFD does not have the same byte-order: [%s] != [%s]", childIb.byteOrder, ib.byteOrder) log.Panicf("Child IFD does not have the same byte-order: [%s] != [%s]", childIb.byteOrder, ib.byteOrder)
} }
// Since no standard IFDs supports occuring more than once, check that a
// tag of this type has not been previously added. Note that we just search
// the current IFD and *not every* IFD.
for _, bt := range childIb.tags {
if bt.tagId == childIb.ifdTagId {
log.Panicf("child-IFD previously added: [%s]", childIb.ifdName)
}
}
bt := builderTag{ bt := builderTag{
ifdName: childIb.ifdName, ifdName: childIb.ifdName,
tagId: childIb.ifdTagId, tagId: childIb.ifdTagId,