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 | a4212632b2e6f71b97d64785a20d276fa41af602 (patch) | |
| tree | 90eccb6c0c9c1bff4ee7a431ec9799803ebea670 | |
| parent | b4c1d0cbb92d6bbc165ffb3eb6f74d3fdaa8d806 (diff) | |
| download | troggle-a4212632b2e6f71b97d64785a20d276fa41af602.tar.gz troggle-a4212632b2e6f71b97d64785a20d276fa41af602.tar.bz2 troggle-a4212632b2e6f71b97d64785a20d276fa41af602.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>
|