Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 3 insertions, 3 deletions

diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 70c45054f..685d415ff 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -37,7 +37,6 @@
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
-#include <cassert>
 #include <iostream>
 #include <zlib.h>
 
@@ -110,7 +109,8 @@ int inflateMemory(unsigned char *in, unsigned int inLength,
         }
 
         ret = inflate(&strm, Z_NO_FLUSH);
-        assert(ret != Z_STREAM_ERROR);
+        if (ret == Z_STREAM_ERROR)
+            return ret;
 
         switch (ret)
         {
@@ -140,7 +140,7 @@ int inflateMemory(unsigned char *in, unsigned int inLength,
         }
     }
     while (ret != Z_STREAM_END);
-    assert(strm.avail_in == 0);
+//    assert(strm.avail_in == 0);
 
     outLength = bufferSize - strm.avail_out;
     (void) inflateEnd(&strm);