GOMODULES
/
go-exif
mirror of https://github.com/dsoprea/go-exif.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Eliminate unnecessary byte-order code verbosity

pull/28/head
Dustin Oprea 2019-12-29 21:20:40 -05:00
parent e5cdeb0aa4
commit e6b94637a3
2 changed files with 12 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ifd_enumerate.go
View File

@ -87,11 +87,7 @@ func (ife *IfdTagEnumerator) getUint16() (value uint16, raw []byte, err error) {
offset += n
}
if ife.byteOrder == binary.BigEndian {
value = binary.BigEndian.Uint16(raw)
} else {
value = binary.LittleEndian.Uint16(raw)
}
value = ife.byteOrder.Uint16(raw)
return value, raw, nil
}
@ -117,11 +113,7 @@ func (ife *IfdTagEnumerator) getUint32() (value uint32, raw []byte, err error) {
offset += n
}
if ife.byteOrder == binary.BigEndian {
value = binary.BigEndian.Uint32(raw)
} else {
value = binary.LittleEndian.Uint32(raw)
}
value = ife.byteOrder.Uint32(raw)
return value, raw, nil
}

47
type_encode.go
View File

@ -81,12 +81,7 @@ func (ve *ValueEncoder) encodeShorts(value []uint16) (ed EncodedData, err error)
ed.Encoded = make([]byte, ed.UnitCount*2)
for i := uint32(0); i < ed.UnitCount; i++ {
// TODO(dustin): We have a ton of duplication in how we handle the byte-orders and the inherent risk of accidentally doing something inconsistently. Move this to reusable code.
if ve.byteOrder == binary.BigEndian {
binary.BigEndian.PutUint16(ed.Encoded[i*2:(i+1)*2], value[i])
} else {
binary.LittleEndian.PutUint16(ed.Encoded[i*2:(i+1)*2], value[i])
}
ve.byteOrder.PutUint16(ed.Encoded[i*2:(i+1)*2], value[i])
}
ed.Type = TypeShort
@ -105,11 +100,7 @@ func (ve *ValueEncoder) encodeLongs(value []uint32) (ed EncodedData, err error)
ed.Encoded = make([]byte, ed.UnitCount*4)
for i := uint32(0); i < ed.UnitCount; i++ {
if ve.byteOrder == binary.BigEndian {
binary.BigEndian.PutUint32(ed.Encoded[i*4:(i+1)*4], value[i])
} else {
binary.LittleEndian.PutUint32(ed.Encoded[i*4:(i+1)*4], value[i])
}
ve.byteOrder.PutUint32(ed.Encoded[i*4:(i+1)*4], value[i])
}
ed.Type = TypeLong
@ -128,13 +119,8 @@ func (ve *ValueEncoder) encodeRationals(value []Rational) (ed EncodedData, err e
ed.Encoded = make([]byte, ed.UnitCount*8)
for i := uint32(0); i < ed.UnitCount; i++ {
if ve.byteOrder == binary.BigEndian {
binary.BigEndian.PutUint32(ed.Encoded[i*8+0:i*8+4], value[i].Numerator)
binary.BigEndian.PutUint32(ed.Encoded[i*8+4:i*8+8], value[i].Denominator)
} else {
binary.LittleEndian.PutUint32(ed.Encoded[i*8+0:i*8+4], value[i].Numerator)
binary.LittleEndian.PutUint32(ed.Encoded[i*8+4:i*8+8], value[i].Denominator)
}
ve.byteOrder.PutUint32(ed.Encoded[i*8+0:i*8+4], value[i].Numerator)
ve.byteOrder.PutUint32(ed.Encoded[i*8+4:i*8+8], value[i].Denominator)
}
ed.Type = TypeRational
@ -154,13 +140,8 @@ func (ve *ValueEncoder) encodeSignedLongs(value []int32) (ed EncodedData, err er
b := bytes.NewBuffer(make([]byte, 0, 8*ed.UnitCount))
for i := uint32(0); i < ed.UnitCount; i++ {
if ve.byteOrder == binary.BigEndian {
err := binary.Write(b, binary.BigEndian, value[i])
log.PanicIf(err)
} else {
err := binary.Write(b, binary.LittleEndian, value[i])
log.PanicIf(err)
}
err := binary.Write(b, ve.byteOrder, value[i])
log.PanicIf(err)
}
ed.Type = TypeSignedLong
@ -181,19 +162,11 @@ func (ve *ValueEncoder) encodeSignedRationals(value []SignedRational) (ed Encode
b := bytes.NewBuffer(make([]byte, 0, 8*ed.UnitCount))
for i := uint32(0); i < ed.UnitCount; i++ {
if ve.byteOrder == binary.BigEndian {
err := binary.Write(b, binary.BigEndian, value[i].Numerator)
log.PanicIf(err)
err := binary.Write(b, ve.byteOrder, value[i].Numerator)
log.PanicIf(err)
err = binary.Write(b, binary.BigEndian, value[i].Denominator)
log.PanicIf(err)
} else {
err := binary.Write(b, binary.LittleEndian, value[i].Numerator)
log.PanicIf(err)
err = binary.Write(b, binary.LittleEndian, value[i].Denominator)
log.PanicIf(err)
}
err = binary.Write(b, ve.byteOrder, value[i].Denominator)
log.PanicIf(err)
}
ed.Type = TypeSignedRational