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

Fix for type-embedded strings not being encoded to JSON correctly in earlier Go's

for/master
Dustin Oprea 2020-01-12 15:54:31 -05:00
parent 3b18b2295e
commit 25524615d1
4 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
v2/assets/exif_read.json
View File

@ -248,7 +248,9 @@
"tag_type_id": 7,
"tag_type_name": "UNDEFINED",
"unit_count": 4,
"value": {},
"value": {
"ExifVersion": "0230"
},
"value_string": "0230"
},
{
@ -461,7 +463,9 @@
"tag_type_id": 7,
"tag_type_name": "UNDEFINED",
"unit_count": 4,
"value": {},
"value": {
"FlashpixVersion": "0100"
},
"value_string": "0100"
},
{
@ -541,7 +545,9 @@
"tag_type_id": 7,
"tag_type_name": "UNDEFINED",
"unit_count": 4,
"value": {},
"value": {
"InteropVersion": "0100"
},
"value_string": "0100"
},
{

12
v2/undefined/exif_9000_exif_version.go
View File

@ -9,7 +9,7 @@ import (
)
type Tag9000ExifVersion struct {
string
ExifVersion string
}
func (Tag9000ExifVersion) EncoderName() string {
@ -17,7 +17,7 @@ func (Tag9000ExifVersion) EncoderName() string {
}
func (ev Tag9000ExifVersion) String() string {
return ev.string
return ev.ExifVersion
}
type Codec9000ExifVersion struct {
@ -35,7 +35,7 @@ func (Codec9000ExifVersion) Encode(value interface{}, byteOrder binary.ByteOrder
log.Panicf("can only encode a Tag9000ExifVersion")
}
return []byte(s.string), uint32(len(s.string)), nil
return []byte(s.ExifVersion), uint32(len(s.ExifVersion)), nil
}
func (Codec9000ExifVersion) Decode(valueContext *exifcommon.ValueContext) (value EncodeableValue, err error) {
@ -50,7 +50,11 @@ func (Codec9000ExifVersion) Decode(valueContext *exifcommon.ValueContext) (value
valueString, err := valueContext.ReadAsciiNoNul()
log.PanicIf(err)
return Tag9000ExifVersion{valueString}, nil
ev := Tag9000ExifVersion{
ExifVersion: valueString,
}
return ev, nil
}
func init() {

12
v2/undefined/exif_A000_flashpix_version.go
View File

@ -9,7 +9,7 @@ import (
)
type TagA000FlashpixVersion struct {
string
FlashpixVersion string
}
func (TagA000FlashpixVersion) EncoderName() string {
@ -17,7 +17,7 @@ func (TagA000FlashpixVersion) EncoderName() string {
}
func (fv TagA000FlashpixVersion) String() string {
return fv.string
return fv.FlashpixVersion
}
type CodecA000FlashpixVersion struct {
@ -35,7 +35,7 @@ func (CodecA000FlashpixVersion) Encode(value interface{}, byteOrder binary.ByteO
log.Panicf("can only encode a TagA000FlashpixVersion")
}
return []byte(s.string), uint32(len(s.string)), nil
return []byte(s.FlashpixVersion), uint32(len(s.FlashpixVersion)), nil
}
func (CodecA000FlashpixVersion) Decode(valueContext *exifcommon.ValueContext) (value EncodeableValue, err error) {
@ -50,7 +50,11 @@ func (CodecA000FlashpixVersion) Decode(valueContext *exifcommon.ValueContext) (v
valueString, err := valueContext.ReadAsciiNoNul()
log.PanicIf(err)
return TagA000FlashpixVersion{valueString}, nil
fv := TagA000FlashpixVersion{
FlashpixVersion: valueString,
}
return fv, nil
}
func init() {

12
v2/undefined/exif_iop_0002_interop_version.go
View File

@ -9,7 +9,7 @@ import (
)
type Tag0002InteropVersion struct {
string
InteropVersion string
}
func (Tag0002InteropVersion) EncoderName() string {
@ -17,7 +17,7 @@ func (Tag0002InteropVersion) EncoderName() string {
}
func (iv Tag0002InteropVersion) String() string {
return iv.string
return iv.InteropVersion
}
type Codec0002InteropVersion struct {
@ -35,7 +35,7 @@ func (Codec0002InteropVersion) Encode(value interface{}, byteOrder binary.ByteOr
log.Panicf("can only encode a Tag0002InteropVersion")
}
return []byte(s.string), uint32(len(s.string)), nil
return []byte(s.InteropVersion), uint32(len(s.InteropVersion)), nil
}
func (Codec0002InteropVersion) Decode(valueContext *exifcommon.ValueContext) (value EncodeableValue, err error) {
@ -50,7 +50,11 @@ func (Codec0002InteropVersion) Decode(valueContext *exifcommon.ValueContext) (va
valueString, err := valueContext.ReadAsciiNoNul()
log.PanicIf(err)
return Tag0002InteropVersion{valueString}, nil
iv := Tag0002InteropVersion{
InteropVersion: valueString,
}
return iv, nil
}
func init() {