diff options
author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-15 03:56:11 +0100 |
---|---|---|
committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-15 03:56:11 +0100 |
commit | 7566faf77b488ce391917f5ae6aabb09842ed620 (patch) | |
tree | ce7c726f6593faa1ff51e1479f0e10ed6aa3396b | |
parent | f27d5988f0178a5077251fdb43335de3c35222b7 (diff) | |
download | troggle-7566faf77b488ce391917f5ae6aabb09842ed620.tar.gz troggle-7566faf77b488ce391917f5ae6aabb09842ed620.tar.bz2 troggle-7566faf77b488ce391917f5ae6aabb09842ed620.zip |
[svn] Make the workaround to avoid parsing interlaced pngs actually work (see issue # 14)
-rw-r--r-- | parsers/surveys.py | 7 | ||||
-rw-r--r-- | templates/base.html | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/parsers/surveys.py b/parsers/surveys.py index e2a502d..351e292 100644 --- a/parsers/surveys.py +++ b/parsers/surveys.py @@ -126,5 +126,8 @@ def parseSurveys(logfile=None): def isInterlacedPNG(filePath): #We need to check for interlaced PNGs because the thumbnail engine can't handle them (uses PIL)
file=Image.open(filePath)
- return file.info['interlace']
-
\ No newline at end of file + print filePath
+ if 'interlace' in file.info:
+ return file.info['interlace']
+ else:
+ return False
\ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 09e3017..5615a8e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -13,7 +13,7 @@ {% block head %}{% endblock %}
</head>
-<body>
+<body onLoad="contentHeight()">
<div id="header">
<h1>CUCC Expeditions to Austria: 1976 - 2009</h1>
|