OSDN Git Service
(root)
/
otptools
/
otptools.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5ec5c21
)
fix get_png_geom
author
hylom
<hylom@hylom.net>
Wed, 27 Jun 2012 08:22:54 +0000
(17:22 +0900)
committer
hylom
<hylom@hylom.net>
Wed, 27 Jun 2012 08:22:54 +0000
(17:22 +0900)
markupper.py
patch
|
blob
|
history
diff --git
a/markupper.py
b/markupper.py
index
f3060b0
..
779b2de
100644
(file)
--- a/
markupper.py
+++ b/
markupper.py
@@
-481,7
+481,9
@@
class Markupper(object):
if (ext == 'JPG') or (ext == 'jpg'):
(w, h) = getjpggeom.get_jpeg_geometory(filepath)
return (w, h)
-
+ else:
+ desc = deterfile.file(filepath)
+
try:
m = re.match(r"([0-9]+)\s*x\s*([0-9]+)", desc[1])
except IndexError: