From f4cb06d79d104e524192120e12b24965aa055e0b Mon Sep 17 00:00:00 2001 From: Dustin Oprea Date: Wed, 2 May 2018 02:21:06 -0400 Subject: [PATCH] type: Renamed ValueString() to ResolveAsString(). --- README.md | 2 +- exif-read-tool/main.go | 2 +- exif_test.go | 2 +- ifd_tag_entry.go | 2 +- type.go | 7 ++----- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3a2f809..3dd6cee 100644 --- a/README.md +++ b/README.md @@ -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) } diff --git a/exif-read-tool/main.go b/exif-read-tool/main.go index 7e6e812..ce4a79f 100644 --- a/exif-read-tool/main.go +++ b/exif-read-tool/main.go @@ -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) } diff --git a/exif_test.go b/exif_test.go index d74f99d..82efb10 100644 --- a/exif_test.go +++ b/exif_test.go @@ -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) } diff --git a/ifd_tag_entry.go b/ifd_tag_entry.go index 1107cd1..0891d11 100644 --- a/ifd_tag_entry.go +++ b/ifd_tag_entry.go @@ -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) } diff --git a/type.go b/type.go index 87e3e3e..020e7ad 100644 --- a/type.go +++ b/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))