diff options
author | 2015-12-13 11:23:55 +0100 | |
---|---|---|
committer | 2015-12-13 11:23:55 +0100 | |
commit | 4e580a77b9da9b78aba1fec8e44b1de5a4a14aaf (patch) | |
tree | df0e1d28daa79b9151088498a933cd1fc37c9c07 /src/lib/util/huffman.cpp | |
parent | 1cda42b22e591965ee69561fcf52272bd991b3b2 (diff) | |
parent | 14d5966a379e9783ba724750a5f84a72af62cadc (diff) |
Merge pull request #9 from mamedev/master
Sync to base master
Diffstat (limited to 'src/lib/util/huffman.cpp')
-rw-r--r-- | src/lib/util/huffman.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/util/huffman.cpp b/src/lib/util/huffman.cpp index 9205264f9eb..8aa32bd3b4d 100644 --- a/src/lib/util/huffman.cpp +++ b/src/lib/util/huffman.cpp @@ -563,7 +563,7 @@ int huffman_context_base::build_tree(UINT32 totaldata, UINT32 totalweight) // create new node node_t &newnode = m_huffnode[nextalloc++]; - newnode.m_parent = NULL; + newnode.m_parent = nullptr; node0.m_parent = node1.m_parent = &newnode; newnode.m_weight = node0.m_weight + node1.m_weight; @@ -591,7 +591,7 @@ int huffman_context_base::build_tree(UINT32 totaldata, UINT32 totalweight) if (node.m_weight > 0) { // determine the number of bits for this node - for (node_t *curnode = &node; curnode->m_parent != NULL; curnode = curnode->m_parent) + for (node_t *curnode = &node; curnode->m_parent != nullptr; curnode = curnode->m_parent) node.m_numbits++; if (node.m_numbits == 0) node.m_numbits = 1; |