mirror of https://github.com/dsoprea/go-exif.git
ifd_tag_entry.go: Renamed RawBytes() to GetRawBytes()
It used to be a simple getter but now it does stuff.for/master
parent
173d686dd9
commit
0c670ca7c2
|
@ -1112,7 +1112,7 @@ func (ib *IfdBuilder) AddTagsFromExisting(ifd *Ifd, includeTagIds []uint16, excl
|
||||||
} else {
|
} else {
|
||||||
// Non-IFD tag.
|
// Non-IFD tag.
|
||||||
|
|
||||||
rawBytes, err := ite.RawBytes()
|
rawBytes, err := ite.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
value := NewIfdBuilderTagValueFromBytes(rawBytes)
|
value := NewIfdBuilderTagValueFromBytes(rawBytes)
|
||||||
|
|
|
@ -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)
|
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)
|
log.PanicIf(err)
|
||||||
|
|
||||||
recoveredValueBytes, err := recoveredIte.RawBytes()
|
recoveredValueBytes, err := recoveredIte.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
if bytes.Compare(recoveredValueBytes, originalValueBytes) != 0 {
|
if bytes.Compare(recoveredValueBytes, originalValueBytes) != 0 {
|
||||||
|
|
|
@ -310,7 +310,7 @@ func (ie *IfdEnumerate) parseThumbnail(offsetIte, lengthIte *IfdTagEntry) (thumb
|
||||||
offsetIte.updateTagType(exifcommon.TypeByte)
|
offsetIte.updateTagType(exifcommon.TypeByte)
|
||||||
offsetIte.updateUnitCount(length)
|
offsetIte.updateUnitCount(length)
|
||||||
|
|
||||||
thumbnailData, err = offsetIte.RawBytes()
|
thumbnailData, err = offsetIte.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
return thumbnailData, nil
|
return thumbnailData, nil
|
||||||
|
@ -769,7 +769,7 @@ func (ifd *Ifd) GpsInfo() (gi *GpsInfo, err error) {
|
||||||
// 2.2.0.0 format.
|
// 2.2.0.0 format.
|
||||||
ifdEnumerateLogger.Warningf(nil, "No GPS version tag (0x%04x) found.", TagGpsVersionId)
|
ifdEnumerateLogger.Warningf(nil, "No GPS version tag (0x%04x) found.", TagGpsVersionId)
|
||||||
} else {
|
} else {
|
||||||
versionBytes, err := tags[0].RawBytes()
|
versionBytes, err := tags[0].GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
hit := false
|
hit := false
|
||||||
|
|
|
@ -47,7 +47,7 @@ func TestIfdTagEntry_RawBytes_RealData(t *testing.T) {
|
||||||
t.Fatalf("Tag not found.")
|
t.Fatalf("Tag not found.")
|
||||||
}
|
}
|
||||||
|
|
||||||
decodedBytes, err := ite.RawBytes()
|
decodedBytes, err := ite.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
expected := []byte("Canon EOS 5D Mark III")
|
expected := []byte("Canon EOS 5D Mark III")
|
||||||
|
|
|
@ -104,7 +104,7 @@ func (ite *IfdTagEntry) valueOffset_() uint32 {
|
||||||
}
|
}
|
||||||
|
|
||||||
// RawBytes renders a specific list of bytes from the value in this tag.
|
// 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()
|
valueContext := ite.getValueContext()
|
||||||
|
|
||||||
if ite.TagType() == exifcommon.TypeUndefined {
|
if ite.TagType() == exifcommon.TypeUndefined {
|
||||||
|
|
|
@ -25,7 +25,7 @@ func TestIfdTagEntry_RawBytes_Allocated(t *testing.T) {
|
||||||
addressableBytes,
|
addressableBytes,
|
||||||
exifcommon.TestDefaultByteOrder)
|
exifcommon.TestDefaultByteOrder)
|
||||||
|
|
||||||
value, err := ite.RawBytes()
|
value, err := ite.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
if bytes.Compare(value, data) != 0 {
|
if bytes.Compare(value, data) != 0 {
|
||||||
|
@ -56,7 +56,7 @@ func TestIfdTagEntry_RawBytes_Embedded(t *testing.T) {
|
||||||
nil,
|
nil,
|
||||||
exifcommon.TestDefaultByteOrder)
|
exifcommon.TestDefaultByteOrder)
|
||||||
|
|
||||||
value, err := ite.RawBytes()
|
value, err := ite.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
if bytes.Compare(value, data) != 0 {
|
if bytes.Compare(value, data) != 0 {
|
||||||
|
|
|
@ -126,7 +126,7 @@ func GetFlatExifData(exifData []byte) (exifTags []ExifTag, err error) {
|
||||||
tagName = it.Name
|
tagName = it.Name
|
||||||
}
|
}
|
||||||
|
|
||||||
valueBytes, err := ite.RawBytes()
|
valueBytes, err := ite.GetRawBytes()
|
||||||
log.PanicIf(err)
|
log.PanicIf(err)
|
||||||
|
|
||||||
value, err := ite.Value()
|
value, err := ite.Value()
|
||||||
|
|
Loading…
Reference in New Issue