Blame astrometry-0.75-Fix-EXIF-Python3.patch
|
 |
2a3c8fd |
diff -Naur astrometry.net-0.75/util/EXIF.py astrometry.net-0.75.fixed/util/EXIF.py
|
|
|
2a3c8fd |
--- astrometry.net-0.75/util/EXIF.py 2018-07-13 21:48:16.000000000 +0200
|
|
|
2a3c8fd |
+++ astrometry.net-0.75.fixed/util/EXIF.py 2018-07-14 17:50:13.893638750 +0200
|
|
|
2a3c8fd |
@@ -1180,7 +1180,7 @@
|
|
|
2a3c8fd |
# extract multibyte integer in Intel format (big endian)
|
|
|
2a3c8fd |
def s2n_intel(str):
|
|
|
2a3c8fd |
x = 0
|
|
|
2a3c8fd |
- y = 0L
|
|
|
2a3c8fd |
+ y = 0
|
|
|
2a3c8fd |
for c in str:
|
|
|
2a3c8fd |
x = x | (ord(c) << y)
|
|
|
2a3c8fd |
y = y + 8
|
|
|
2a3c8fd |
@@ -1261,7 +1261,7 @@
|
|
|
2a3c8fd |
val=s2n_motorola(slice)
|
|
|
2a3c8fd |
# Sign extension ?
|
|
|
2a3c8fd |
if signed:
|
|
|
2a3c8fd |
- msb=1L << (8*length-1)
|
|
|
2a3c8fd |
+ msb=1 << (8*length-1)
|
|
|
2a3c8fd |
if val & msb:
|
|
|
2a3c8fd |
val=val-(msb << 1)
|
|
|
2a3c8fd |
return val
|
|
|
2a3c8fd |
@@ -1517,7 +1517,7 @@
|
|
|
2a3c8fd |
elif note.values[0:7] == [78, 105, 107, 111, 110, 0, 2]:
|
|
|
2a3c8fd |
if self.debug:
|
|
|
2a3c8fd |
print("Looks like a labeled type 2 Nikon MakerNote")
|
|
|
2a3c8fd |
- if note.values[12:14] != [0, 42] and note.values[12:14] != [42L, 0L]:
|
|
|
2a3c8fd |
+ if note.values[12:14] != [0, 42] and note.values[12:14] != [42, 0]:
|
|
|
2a3c8fd |
raise ValueError("Missing marker tag '42' in MakerNote.")
|
|
|
2a3c8fd |
# skip the Makernote label and the TIFF header
|
|
|
2a3c8fd |
self.dump_IFD(note.field_offset+10+8, 'MakerNote',
|