godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-15 13:51:40 +00:00
Code Releases Wiki Activity

Compression::compress properly returns compressed size

Browse Source 
selective pick from cbbcf72703
This commit is contained in:
Fabio Alessandrelli
2017-04-07 01:29:02 +02:00
parent aa167fa04b
commit 3044d0aed3
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/io/compression.cpp
View File

@@ -104,19 +104,21 @@ int Compression::get_max_compressed_buffer_size(int p_src_size, Mode p_mode) {
ERR_FAIL_V(-1); ERR_FAIL_V(-1);
} }
void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode) { int Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode) {
switch (p_mode) { switch (p_mode) {
case MODE_FASTLZ: { case MODE_FASTLZ: {
int ret_size=0;
if (p_dst_max_size < 16) { if (p_dst_max_size < 16) {
uint8_t dst[16]; uint8_t dst[16];
fastlz_decompress(p_src, p_src_size, dst, 16); ret_size = fastlz_decompress(p_src, p_src_size, dst, 16);
copymem(p_dst, dst, p_dst_max_size); copymem(p_dst, dst, p_dst_max_size);
} else { } else {
fastlz_decompress(p_src, p_src_size, p_dst, p_dst_max_size); ret_size = fastlz_decompress(p_src, p_src_size, p_dst, p_dst_max_size);
} }
return; return ret_size;
} break; } break;
case MODE_DEFLATE: { case MODE_DEFLATE: {
@@ -127,7 +129,7 @@ void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *
strm.avail_in = 0; strm.avail_in = 0;
strm.next_in = Z_NULL; strm.next_in = Z_NULL;
int err = inflateInit(&strm); int err = inflateInit(&strm);
ERR_FAIL_COND(err != Z_OK); ERR_FAIL_COND_V(err != Z_OK, -1);
strm.avail_in = p_src_size; strm.avail_in = p_src_size;
strm.avail_out = p_dst_max_size; strm.avail_out = p_dst_max_size;
@@ -135,11 +137,12 @@ void Compression::decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *
strm.next_out = p_dst; strm.next_out = p_dst;
err = inflate(&strm, Z_FINISH); err = inflate(&strm, Z_FINISH);
int total = strm.total_out;
inflateEnd(&strm); inflateEnd(&strm);
ERR_FAIL_COND(err != Z_STREAM_END); ERR_FAIL_COND_V(err != Z_STREAM_END, -1);
return; return total;
} break; } break;
} }
ERR_FAIL(); ERR_FAIL_V(-1);
} }

2
core/io/compression.h
View File

@@ -41,7 +41,7 @@ public:
static int compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_FASTLZ); static int compress(uint8_t *p_dst, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_FASTLZ);
static int get_max_compressed_buffer_size(int p_src_size, Mode p_mode = MODE_FASTLZ); static int get_max_compressed_buffer_size(int p_src_size, Mode p_mode = MODE_FASTLZ);
static void decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_FASTLZ); static int decompress(uint8_t *p_dst, int p_dst_max_size, const uint8_t *p_src, int p_src_size, Mode p_mode = MODE_FASTLZ);
Compression(); Compression();
}; };