diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 23:14:35 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 23:14:35 -0300 |
| commit | 0a717ffee270b3d2761aaae6a42c06d999a5b823 (patch) | |
| tree | a52dd64a8c76e24f4734f917af3a124f4dea6d4b /core/io | |
| parent | 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b (diff) | |
| parent | 81757d2e977d959e6b0bc26f9fa990417ca91de9 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
modules/multiscript/register_types.cpp
platform/android/java/src/com/android/godot/GodotLib.java
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/compression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/io/compression.cpp b/core/io/compression.cpp index 67ba5de0fa..ea2f5d2d9c 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -55,7 +55,7 @@ int Compression::compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size,M strm.zfree = zipio_free; strm.opaque = Z_NULL; int err = deflateInit(&strm,Z_DEFAULT_COMPRESSION); - if (err==Z_OK) + if (err!=Z_OK) return -1; strm.avail_in=p_src_size; @@ -93,7 +93,7 @@ int Compression::get_max_compressed_buffer_size(int p_src_size,Mode p_mode){ strm.zfree = zipio_free; strm.opaque = Z_NULL; int err = deflateInit(&strm,Z_DEFAULT_COMPRESSION); - if (err==Z_OK) + if (err!=Z_OK) return -1; int aout = deflateBound(&strm,p_src_size); deflateEnd(&strm); |