diff options
| author | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-02-10 17:37:00 +0100 |
|---|---|---|
| committer | Stefan Dombrowski <stefan@uni-bonn.de> | 2011-02-10 17:37:00 +0100 |
| commit | 377d5160cbaa40a4a8e83dd35d74bec6aeb208e0 (patch) | |
| tree | 03389c16cc721007beb9c8a2d0c9b2fb5f2568ea /src/resources | |
| parent | f47665a5fe01bbafd7e9243e62d2c3c7d42920e3 (diff) | |
| parent | 27d3e801629cc952979f48bb507dae782bbab34a (diff) | |
| download | mana-377d5160cbaa40a4a8e83dd35d74bec6aeb208e0.tar.gz mana-377d5160cbaa40a4a8e83dd35d74bec6aeb208e0.tar.bz2 mana-377d5160cbaa40a4a8e83dd35d74bec6aeb208e0.tar.xz mana-377d5160cbaa40a4a8e83dd35d74bec6aeb208e0.zip | |
Merge branch '0.5'
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/mapreader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp index 28feaba8..07a1262c 100644 --- a/src/resources/mapreader.cpp +++ b/src/resources/mapreader.cpp @@ -275,7 +275,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) if (encoding == "base64") { - if (!compression.empty() && compression != "gzip") + if (!compression.empty() && compression != "gzip" && compression != "zlib") { logger->log("Warning: only gzip layer compression supported!"); return; @@ -311,7 +311,7 @@ void MapReader::readLayer(xmlNodePtr node, Map *map) if (binData) { - if (compression == "gzip") + if (compression == "gzip" || compression == "zlib") { // Inflate the gzipped layer data unsigned char *inflated; |