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

Change Ifd.GpsInfo() to calculate Degrees, Mintutes, and Seconds as float64 instead of int

pull/23/head
Keith Woelke 2019-06-20 13:25:13 -07:00 committed by Dustin Oprea
parent 17eaca4233
commit 12b8993a44
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gps.go
View File

@ -14,11 +14,11 @@ var (
type GpsDegrees struct { type GpsDegrees struct {
Orientation byte Orientation byte
Degrees, Minutes, Seconds int Degrees, Minutes, Seconds float64
} }
func (d GpsDegrees) String() string { func (d GpsDegrees) String() string {
return fmt.Sprintf("Degrees<O=[%s] D=(%d) M=(%d) S=(%d)>", string([]byte{d.Orientation}), d.Degrees, d.Minutes, d.Seconds) return fmt.Sprintf("Degrees<O=[%s] D=(%g) M=(%g) S=(%g)>", string([]byte{d.Orientation}), d.Degrees, d.Minutes, d.Seconds)
} }
func (d GpsDegrees) Decimal() float64 { func (d GpsDegrees) Decimal() float64 {

12
ifd_enumerate.go
View File

@ -901,18 +901,18 @@ func (ifd *Ifd) GpsInfo() (gi *GpsInfo, err error) {
gi.Latitude = GpsDegrees{ gi.Latitude = GpsDegrees{
Orientation: latitudeRefValue.(string)[0], Orientation: latitudeRefValue.(string)[0],
Degrees: int(float64(latitudeRaw[0].Numerator) / float64(latitudeRaw[0].Denominator)), Degrees: float64(latitudeRaw[0].Numerator) / float64(latitudeRaw[0].Denominator),
Minutes: int(float64(latitudeRaw[1].Numerator) / float64(latitudeRaw[1].Denominator)), Minutes: float64(latitudeRaw[1].Numerator) / float64(latitudeRaw[1].Denominator),
Seconds: int(float64(latitudeRaw[2].Numerator) / float64(latitudeRaw[2].Denominator)), Seconds: float64(latitudeRaw[2].Numerator) / float64(latitudeRaw[2].Denominator),
} }
longitudeRaw := longitudeValue.([]Rational) longitudeRaw := longitudeValue.([]Rational)
gi.Longitude = GpsDegrees{ gi.Longitude = GpsDegrees{
Orientation: longitudeRefValue.(string)[0], Orientation: longitudeRefValue.(string)[0],
Degrees: int(float64(longitudeRaw[0].Numerator) / float64(longitudeRaw[0].Denominator)), Degrees: float64(longitudeRaw[0].Numerator) / float64(longitudeRaw[0].Denominator),
Minutes: int(float64(longitudeRaw[1].Numerator) / float64(longitudeRaw[1].Denominator)), Minutes: float64(longitudeRaw[1].Numerator) / float64(longitudeRaw[1].Denominator),
Seconds: int(float64(longitudeRaw[2].Numerator) / float64(longitudeRaw[2].Denominator)), Seconds: float64(longitudeRaw[2].Numerator) / float64(longitudeRaw[2].Denominator),
} }
// Parse altitude. // Parse altitude.