phundrak/lzw-assignment
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Phuntsok Drak-pa 2018-04-21 20:28:42 +02:00
parent 18871b0d13
commit 84808fd4e3
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compress.cc
View File

@ -43,12 +43,11 @@ const uvec lzw_compress(const ustring &t_text, dict_t &t_dictionary) {
printf("\rprogress: %zu / %zu", ++progress, t_text.size()); printf("\rprogress: %zu / %zu", ++progress, t_text.size());
#endif #endif
if (/* len > LENGTH_MAX || */ t_dictionary.size() >= DICT_MAX ) { if (/* len > LENGTH_MAX || */ t_dictionary.size() >= DICT_MAX) {
res.push_back(static_cast<uint32_t>(w)); res.push_back(static_cast<uint32_t>(w));
w = c; w = c;
len = 0; len = 0;
} else if (const auto &[exists, pos] = dico(t_dictionary, w, c); } else if (const auto &[exists, pos] = dico(t_dictionary, w, c); exists) {
exists) {
w = pos; w = pos;
} else { } else {
res.push_back(static_cast<uint32_t>(w)); res.push_back(static_cast<uint32_t>(w));
@ -76,14 +75,6 @@ void compress(const std::string &t_in_file, const char *t_out_file) {
std::ifstream input_file{t_in_file}; std::ifstream input_file{t_in_file};
// Fichier de sortie // Fichier de sortie
// FILE *out = nullptr;
// if (t_out_file) {
// out = fopen(t_out_file, "wb");
// } else {
// std::string out_name{t_in_file};
// out_name.append(".lzw");
// out = fopen(out_name.c_str(), "wb");
// }
FILE *out = (t_out_file) FILE *out = (t_out_file)
? fopen(t_out_file, "wb") ? fopen(t_out_file, "wb")
: fopen(std::string{t_out_file, ".lzw"}.c_str(), "wb"); : fopen(std::string{t_out_file, ".lzw"}.c_str(), "wb");