Projet

Général

Profil

0001-geolocate-lift-Pillow-version-limit-44633.patch

Valentin Deniaud, 13 août 2020 12:24

Télécharger (1,64 ko)

Voir les différences:

Subject: [PATCH] geolocate: lift Pillow version limit (#44633)

 wcs/wf/geolocate.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
wcs/wf/geolocate.py
20 20
try:
21 21
    from PIL import Image
22 22
    from PIL.ExifTags import TAGS, GPSTAGS
23
    from PIL.TiffImagePlugin import IFDRational
23 24
except ImportError:
24 25
    Image = None
25 26

  
......
197 198
                    lon_ref = gps_info[3]
198 199
                except KeyError:
199 200
                    lon_ref = 'E'
200
                lat = (1.0*lat[0][0]/lat[0][1] + 1.0*lat[1][0]/lat[1][1]/60 + 1.0*lat[2][0]/lat[2][1]/3600)
201
                lon = (1.0*lon[0][0]/lon[0][1] + 1.0*lon[1][0]/lon[1][1]/60 + 1.0*lon[2][0]/lon[2][1]/3600)
201
                if isinstance(lat[0], IFDRational):
202
                    lat = (1.0 * lat[0] + 1.0 * lat[1]/60 + 1.0 * lat[2]/3600)
203
                    lon = (1.0 * lon[0] + 1.0 * lon[1]/60 + 1.0 * lon[2]/3600)
204
                else:
205
                    # Pillow < 7.2 compat
206
                    lat = (1.0*lat[0][0]/lat[0][1] + 1.0*lat[1][0]/lat[1][1]/60 + 1.0*lat[2][0]/lat[2][1]/3600)
207
                    lon = (1.0*lon[0][0]/lon[0][1] + 1.0*lon[1][0]/lon[1][1]/60 + 1.0*lon[2][0]/lon[2][1]/3600)
202 208
                if lat_ref == 'S':
203 209
                    lat = -lat
204 210
                if lon_ref == 'W':
205
-