Skip to content

Commit cba2b2b

Browse files
committed
fix latest commit (didn't work for large streams that weren't held in memory); fixes #109
1 parent 97c84fe commit cba2b2b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

precomp.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -7881,7 +7881,7 @@ void write_ftempout_if_not_present(long long byte_count, bool in_memory, bool le
78817881
}
78827882
}
78837883

7884-
recursion_result recursion_compress(long long compressed_bytes, long long decompressed_bytes, bool deflate_type) {
7884+
recursion_result recursion_compress(long long compressed_bytes, long long decompressed_bytes, bool deflate_type, bool in_memory) {
78857885
FILE* recursion_fout;
78867886
recursion_result tmp_r;
78877887
tmp_r.success = false;
@@ -7898,7 +7898,7 @@ recursion_result recursion_compress(long long compressed_bytes, long long decomp
78987898
}
78997899

79007900
if (deflate_type) {
7901-
write_ftempout_if_not_present(decompressed_bytes, true);
7901+
write_ftempout_if_not_present(decompressed_bytes, in_memory);
79027902
}
79037903

79047904
recursion_push();
@@ -8001,7 +8001,7 @@ recursion_result recursion_compress(long long compressed_bytes, long long decomp
80018001
return tmp_r;
80028002
}
80038003
recursion_result recursion_write_file_and_compress(const recompress_deflate_result& rdres) {
8004-
recursion_result r = recursion_compress(rdres.compressed_stream_size, rdres.uncompressed_stream_size, true);
8004+
recursion_result r = recursion_compress(rdres.compressed_stream_size, rdres.uncompressed_stream_size, true, rdres.uncompressed_in_memory);
80058005
return r;
80068006
}
80078007

precomp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ class zLibMTF{
131131
struct recompress_deflate_result;
132132

133133
void write_ftempout_if_not_present(long long byte_count, bool in_memory, bool leave_open = false);
134-
recursion_result recursion_compress(long long compressed_bytes, long long decompressed_bytes, bool deflate_type = false);
134+
recursion_result recursion_compress(long long compressed_bytes, long long decompressed_bytes, bool deflate_type = false, bool in_memory = true);
135135
recursion_result recursion_decompress(long long recursion_data_length);
136136
recursion_result recursion_write_file_and_compress(const recompress_deflate_result&);
137137

0 commit comments

Comments
 (0)