Changeset 9ee2ce3 for thirdparty/SZ/sz/src/Huffman.c

Timestamp:

09/28/18 16:32:55 (6 years ago)

Author:

Hal Finkel <hfinkel@…>

Branches:

master, pympi

Children:

e6aa0eb

Parents:

abca157

git-author:

Hal Finkel <hfinkel@…> (09/28/18 16:32:55)

git-committer:

Hal Finkel <hfinkel@…> (09/28/18 16:32:55)

Message:

importing new SZ files

File:

• thirdparty/SZ/sz/src/Huffman.c (modified) (4 diffs)

thirdparty/SZ/sz/src/Huffman.c

@@ -652 +652 @@
 void encode_withTree(HuffmanTree* huffmanTree, int *s, size_t length, unsigned char **out, size_t *outSize)
 {
-        size_t i, nodeCount = 0;
+        size_t i; 
+        int nodeCount = 0;
         unsigned char *treeBytes, buffer[4];
         
         init(huffmanTree, s, length);
         for (i = 0; i < huffmanTree->stateNum; i++)
-                if (huffmanTree->code[i]) nodeCount++;
+                if (huffmanTree->code[i]) nodeCount++; 
         nodeCount = nodeCount*2-1;
         unsigned int treeByteSize = convert_HuffTree_to_bytes_anyStates(huffmanTree,nodeCount, &treeBytes);
@@ -664 +665 @@
         intToBytes_bigEndian(buffer, nodeCount);
         memcpy(*out, buffer, 4);
-        memcpy(*out+4, treeBytes, treeByteSize);
+        intToBytes_bigEndian(buffer, huffmanTree->stateNum/2); //real number of intervals
+        memcpy(*out+4, buffer, 4);
+        memcpy(*out+8, treeBytes, treeByteSize);
         free(treeBytes);
         size_t enCodeSize = 0;
-        encode(huffmanTree, s, length, *out+4+treeByteSize, &enCodeSize);
-        *outSize = 4+treeByteSize+enCodeSize;
+        encode(huffmanTree, s, length, *out+8+treeByteSize, &enCodeSize);
+        *outSize = 8+treeByteSize+enCodeSize;
         
         //unsigned short state[length];
@@ -683 +686 @@
         size_t encodeStartIndex;
         size_t nodeCount = bytesToInt_bigEndian(s);
-        node root = reconstruct_HuffTree_from_bytes_anyStates(huffmanTree,s+4, nodeCount);
+        node root = reconstruct_HuffTree_from_bytes_anyStates(huffmanTree,s+8, nodeCount);
         
         //sdi: Debug
@@ -702 +705 @@
         else
                 encodeStartIndex = 1+3*nodeCount*sizeof(unsigned int)+nodeCount*sizeof(unsigned char);
-        decode(s+4+encodeStartIndex, targetLength, root, out);
+        decode(s+8+encodeStartIndex, targetLength, root, out);
 }