Changeset 9ee2ce3 for thirdparty/SZ/sz/src/szd_uint32.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/szd_uint32.c (modified) (3 diffs)

thirdparty/SZ/sz/src/szd_uint32.c

@@ -16 +16 @@
 #include "szd_uint32.h"
 #include "Huffman.h"
+#include "utility.h"
 
 /**
@@ -35 +36 @@
         if(cmpSize!=4+4+4+MetaDataByteLength && cmpSize!=4+4+8+MetaDataByteLength)
         {
-                int isZlib = isZlibFormat(cmpBytes[0], cmpBytes[1]);
-                if(isZlib)
+                confparams_dec->losslessCompressor = is_lossless_compressed_data(cmpBytes, cmpSize);
+                if(confparams_dec->losslessCompressor!=-1)
                         confparams_dec->szMode = SZ_BEST_COMPRESSION;
                 else
@@ -49 +50 @@
                         if(targetUncompressSize<MIN_ZLIB_DEC_ALLOMEM_BYTES) //Considering the minimum size
                                 targetUncompressSize = MIN_ZLIB_DEC_ALLOMEM_BYTES; 
-                        tmpSize = zlib_uncompress5(cmpBytes, (unsigned long)cmpSize, &szTmpBytes, (unsigned long)targetUncompressSize+4+MetaDataByteLength+exe_params->SZ_SIZE_TYPE);//         (unsigned long)targetUncompressSize+8: consider the total length under lossless compression mode is actually 3+4+1+targetUncompressSize
+                        tmpSize = sz_lossless_decompress(confparams_dec->losslessCompressor, cmpBytes, (unsigned long)cmpSize, &szTmpBytes, (unsigned long)targetUncompressSize+4+MetaDataByteLength+exe_params->SZ_SIZE_TYPE);//               (unsigned long)targetUncompressSize+8: consider the total length under lossless compression mode is actually 3+4+1+targetUncompressSize
                         //szTmpBytes = (unsigned char*)malloc(sizeof(unsigned char)*tmpSize);
                         //memcpy(szTmpBytes, tmpBytes, tmpSize);