kylefang/AutoFileName
1
0
Fork 0
mirror of https://github.com/zhigang1992/AutoFileName.git synced 2026-01-12 22:45:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47 from codecarson/st3

Browse Source 
Update JPG dimension checking for Python3.
This commit is contained in:
Liam Cain
2013-11-27 10:00:17 -08:00
parent c3c08d4fea 46bc97ab90
commit 38f8d4b354
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
getimageinfo.py
View File

@@ -35,27 +35,28 @@ def getImageInfo(data):
height = int(h)
# handle JPEGs
# elif (size >= 2) and data[:2] == b'\377\330':
# jpeg = io.StringIO(olddata)
# print(bytes(ord(jpeg.read(1))))
# jpeg.read(2)
# b = jpeg.read(1)
# try:
# while (b and ord(b) != 0xDA):
# while (ord(b) != 0xFF): b = jpeg.read(1)
# while (ord(b) == 0xFF): b = jpeg.read(1)
# if (ord(b) >= 0xC0 and ord(b) <= 0xC3):
# jpeg.read(3)
# h, w = struct.unpack(">HH", jpeg.read(4))
# break
# else:
# jpeg.read(int(struct.unpack(">H", jpeg.read(2))[0])-2)
# b = jpeg.read(1)
# width = int(w)
# height = int(h)
# except struct.error:
# pass
# except ValueError:
# pass
elif (size >= 2) and data[:2] == b'\377\330':
jpeg = io.BytesIO(data)
jpeg.read(2)
b = jpeg.read(1)
try:
while (b != b''):
while (b != b'\xFF'): b = jpeg.read(1)
while (b == b'\xFF'): b = jpeg.read(1)
if (b >= b'\xC0' and b <= b'\xC3'):
jpeg.read(3)
h, w = struct.unpack(">HH", jpeg.read(4))
break
else:
jpeg.read(int(struct.unpack(">H", jpeg.read(2))[0])-2)
b = jpeg.read(1)
width = int(w)
height = int(h)
except struct.error:
pass
except ValueError:
pass
return width, height