clyne/consteval-huffman
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Fix issues with last bits

Browse Source
This commit is contained in:
Clyne 2020-07-31 19:31:27 -04:00 committed by GitHub
parent 70bb15bd3c
commit 18fe8ea65d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
consteval_huffman.hpp
View File

@ -8,7 +8,7 @@
* Compresses given data at compile-time, while also providing utilities for decoding.
* @tparam data Expected to be a null-terminated `char` of data to be compressed.
*/
template<auto data>
template<const char *data>
class huffman_compress
{
using size_t = unsigned long int;
@ -122,7 +122,11 @@ private:
{
auto tree = build_node_tree();
size_t bytes = size();
int bits = 8 - output_size().second;
int bits;
if (auto bitscount = output_size().second; bitscount > 0)
bits = 8 - bitscount;
else
bits = 0, bytes--;
for (size_t i = std::char_traits<char>::length(data); i > 0; i--) {
auto leaf = std::find_if(tree.begin(), tree.begin() + tree_count(),
[c = data[i - 1]](auto& n) { return n.value == c; });
@ -183,7 +187,7 @@ public:
// Checks if another byte is available
operator bool() const {
return m_pos < (m_data.size() - 1) || m_bit >= (8 - m_data.lastbitscount());
return m_pos < (m_data.size() - 1) || m_bit > (8 - m_data.lastbitscount());
}
// Gets the current byte
int operator*() const { return m_current; }