mirror of https://github.com/dsoprea/go-exif.git
type: Renamed ValueString() to ResolveAsString().
parent
54e4cb73eb
commit
f4cb06d79d
|
@ -118,7 +118,7 @@ visitor := func(indexedIfdName string, tagId uint16, tagType exif.TagType, value
|
|||
valueString = fmt.Sprintf("%v", value)
|
||||
}
|
||||
} else {
|
||||
valueString, err = tagType.ValueString(valueContext, true)
|
||||
valueString, err = tagType.ResolveAsString(valueContext, true)
|
||||
log.PanicIf(err)
|
||||
}
|
||||
|
||||
|
|
|
@ -85,7 +85,7 @@ func main() {
|
|||
valueString = fmt.Sprintf("%v", value)
|
||||
}
|
||||
} else {
|
||||
valueString, err = tagType.ValueString(valueContext, true)
|
||||
valueString, err = tagType.ResolveAsString(valueContext, true)
|
||||
log.PanicIf(err)
|
||||
}
|
||||
|
||||
|
|
|
@ -99,7 +99,7 @@ func TestVisit(t *testing.T) {
|
|||
valueString = fmt.Sprintf("%v", value)
|
||||
}
|
||||
} else {
|
||||
valueString, err = tagType.ValueString(valueContext, true)
|
||||
valueString, err = tagType.ResolveAsString(valueContext, true)
|
||||
log.PanicIf(err)
|
||||
}
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ func (ite IfdTagEntry) ValueString(byteOrder binary.ByteOrder, addressableData [
|
|||
} else {
|
||||
tt := NewTagType(ite.TagType, byteOrder)
|
||||
|
||||
value, err = tt.ValueString(vc, false)
|
||||
value, err = tt.ResolveAsString(vc, false)
|
||||
log.PanicIf(err)
|
||||
}
|
||||
|
||||
|
|
7
type.go
7
type.go
|
@ -555,7 +555,7 @@ func (tt TagType) ReadSignedRationalValues(valueContext ValueContext) (value []S
|
|||
return value, nil
|
||||
}
|
||||
|
||||
// ValueString resolves the given value and returns a flat string.
|
||||
// ResolveAsString resolves the given value and returns a flat string.
|
||||
//
|
||||
// Where the type is not ASCII, `justFirst` indicates whether to just stringify
|
||||
// the first item in the slice (or return an empty string if the slice is
|
||||
|
@ -564,10 +564,7 @@ func (tt TagType) ReadSignedRationalValues(valueContext ValueContext) (value []S
|
|||
// Since this method lacks the information to process unknown-type tags (e.g.
|
||||
// byte-order, tag-ID, IFD type), it will return an error if attempted. See
|
||||
// `UndefinedValue()`.
|
||||
|
||||
// TODO(dustin): !! Rename to ResolveAsString()
|
||||
|
||||
func (tt TagType) ValueString(valueContext ValueContext, justFirst bool) (value string, err error) {
|
||||
func (tt TagType) ResolveAsString(valueContext ValueContext, justFirst bool) (value string, err error) {
|
||||
defer func() {
|
||||
if state := recover(); state != nil {
|
||||
err = log.Wrap(state.(error))
|
||||
|
|
Loading…
Reference in New Issue