From 0c670ca7c239033e599c2c89d82d7c9c7a31f60a Mon Sep 17 00:00:00 2001 From: Dustin Oprea Date: Sat, 11 Jan 2020 02:28:42 -0500 Subject: [PATCH] ifd_tag_entry.go: Renamed RawBytes() to GetRawBytes() It used to be a simple getter but now it does stuff. --- v2/ifd_builder.go | 2 +- v2/ifd_builder_test.go | 4 ++-- v2/ifd_enumerate.go | 4 ++-- v2/ifd_enumerate_test.go | 2 +- v2/ifd_tag_entry.go | 2 +- v2/ifd_tag_entry_test.go | 4 ++-- v2/utility.go | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/v2/ifd_builder.go b/v2/ifd_builder.go index c5f2429..431bfed 100644 --- a/v2/ifd_builder.go +++ b/v2/ifd_builder.go @@ -1112,7 +1112,7 @@ func (ib *IfdBuilder) AddTagsFromExisting(ifd *Ifd, includeTagIds []uint16, excl } else { // Non-IFD tag. - rawBytes, err := ite.RawBytes() + rawBytes, err := ite.GetRawBytes() log.PanicIf(err) value := NewIfdBuilderTagValueFromBytes(rawBytes) diff --git a/v2/ifd_builder_test.go b/v2/ifd_builder_test.go index e2766cf..da5e8b3 100644 --- a/v2/ifd_builder_test.go +++ b/v2/ifd_builder_test.go @@ -1488,10 +1488,10 @@ func TestIfdBuilder_CreateIfdBuilderFromExistingChain_RealData(t *testing.T) { t.Fatalf("Tag-type not as expected: %d != %d ITE=%s", recoveredIte.TagType(), originalIte.TagType(), recoveredIte) } - originalValueBytes, err := originalIte.RawBytes() + originalValueBytes, err := originalIte.GetRawBytes() log.PanicIf(err) - recoveredValueBytes, err := recoveredIte.RawBytes() + recoveredValueBytes, err := recoveredIte.GetRawBytes() log.PanicIf(err) if bytes.Compare(recoveredValueBytes, originalValueBytes) != 0 { diff --git a/v2/ifd_enumerate.go b/v2/ifd_enumerate.go index 1a11086..c562a6e 100644 --- a/v2/ifd_enumerate.go +++ b/v2/ifd_enumerate.go @@ -310,7 +310,7 @@ func (ie *IfdEnumerate) parseThumbnail(offsetIte, lengthIte *IfdTagEntry) (thumb offsetIte.updateTagType(exifcommon.TypeByte) offsetIte.updateUnitCount(length) - thumbnailData, err = offsetIte.RawBytes() + thumbnailData, err = offsetIte.GetRawBytes() log.PanicIf(err) return thumbnailData, nil @@ -769,7 +769,7 @@ func (ifd *Ifd) GpsInfo() (gi *GpsInfo, err error) { // 2.2.0.0 format. ifdEnumerateLogger.Warningf(nil, "No GPS version tag (0x%04x) found.", TagGpsVersionId) } else { - versionBytes, err := tags[0].RawBytes() + versionBytes, err := tags[0].GetRawBytes() log.PanicIf(err) hit := false diff --git a/v2/ifd_enumerate_test.go b/v2/ifd_enumerate_test.go index 0c19e73..c5db824 100644 --- a/v2/ifd_enumerate_test.go +++ b/v2/ifd_enumerate_test.go @@ -47,7 +47,7 @@ func TestIfdTagEntry_RawBytes_RealData(t *testing.T) { t.Fatalf("Tag not found.") } - decodedBytes, err := ite.RawBytes() + decodedBytes, err := ite.GetRawBytes() log.PanicIf(err) expected := []byte("Canon EOS 5D Mark III") diff --git a/v2/ifd_tag_entry.go b/v2/ifd_tag_entry.go index 2146ef2..7693765 100644 --- a/v2/ifd_tag_entry.go +++ b/v2/ifd_tag_entry.go @@ -104,7 +104,7 @@ func (ite *IfdTagEntry) valueOffset_() uint32 { } // RawBytes renders a specific list of bytes from the value in this tag. -func (ite *IfdTagEntry) RawBytes() (rawBytes []byte, err error) { +func (ite *IfdTagEntry) GetRawBytes() (rawBytes []byte, err error) { valueContext := ite.getValueContext() if ite.TagType() == exifcommon.TypeUndefined { diff --git a/v2/ifd_tag_entry_test.go b/v2/ifd_tag_entry_test.go index 66def67..12b1b01 100644 --- a/v2/ifd_tag_entry_test.go +++ b/v2/ifd_tag_entry_test.go @@ -25,7 +25,7 @@ func TestIfdTagEntry_RawBytes_Allocated(t *testing.T) { addressableBytes, exifcommon.TestDefaultByteOrder) - value, err := ite.RawBytes() + value, err := ite.GetRawBytes() log.PanicIf(err) if bytes.Compare(value, data) != 0 { @@ -56,7 +56,7 @@ func TestIfdTagEntry_RawBytes_Embedded(t *testing.T) { nil, exifcommon.TestDefaultByteOrder) - value, err := ite.RawBytes() + value, err := ite.GetRawBytes() log.PanicIf(err) if bytes.Compare(value, data) != 0 { diff --git a/v2/utility.go b/v2/utility.go index 04b7361..aef5dac 100644 --- a/v2/utility.go +++ b/v2/utility.go @@ -126,7 +126,7 @@ func GetFlatExifData(exifData []byte) (exifTags []ExifTag, err error) { tagName = it.Name } - valueBytes, err := ite.RawBytes() + valueBytes, err := ite.GetRawBytes() log.PanicIf(err) value, err := ite.Value()