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

type: Renamed ValueString() to ResolveAsString().

Browse Source
This commit is contained in:
Dustin Oprea 2018-05-02 02:21:06 -04:00
parent 54e4cb73eb
commit f4cb06d79d
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -118,7 +118,7 @@ visitor := func(indexedIfdName string, tagId uint16, tagType exif.TagType, value
valueString = fmt.Sprintf("%v", value) valueString = fmt.Sprintf("%v", value)
} }
} else { } else {
valueString, err = tagType.ValueString(valueContext, true) valueString, err = tagType.ResolveAsString(valueContext, true)
log.PanicIf(err) log.PanicIf(err)
} }

2
exif-read-tool/main.go
View File

@ -85,7 +85,7 @@ func main() {
valueString = fmt.Sprintf("%v", value) valueString = fmt.Sprintf("%v", value)
} }
} else { } else {
valueString, err = tagType.ValueString(valueContext, true) valueString, err = tagType.ResolveAsString(valueContext, true)
log.PanicIf(err) log.PanicIf(err)
} }

2
exif_test.go
View File

@ -99,7 +99,7 @@ func TestVisit(t *testing.T) {
valueString = fmt.Sprintf("%v", value) valueString = fmt.Sprintf("%v", value)
} }
} else { } else {
valueString, err = tagType.ValueString(valueContext, true) valueString, err = tagType.ResolveAsString(valueContext, true)
log.PanicIf(err) log.PanicIf(err)
} }

2
ifd_tag_entry.go
View File

@ -55,7 +55,7 @@ func (ite IfdTagEntry) ValueString(byteOrder binary.ByteOrder, addressableData [
} else { } else {
tt := NewTagType(ite.TagType, byteOrder) tt := NewTagType(ite.TagType, byteOrder)
value, err = tt.ValueString(vc, false) value, err = tt.ResolveAsString(vc, false)
log.PanicIf(err) log.PanicIf(err)
} }

7
type.go
View File

@ -555,7 +555,7 @@ func (tt TagType) ReadSignedRationalValues(valueContext ValueContext) (value []S
return value, nil 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 // 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 // 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. // 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 // byte-order, tag-ID, IFD type), it will return an error if attempted. See
// `UndefinedValue()`. // `UndefinedValue()`.
func (tt TagType) ResolveAsString(valueContext ValueContext, justFirst bool) (value string, err error) {
// TODO(dustin): !! Rename to ResolveAsString()
func (tt TagType) ValueString(valueContext ValueContext, justFirst bool) (value string, 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))