Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • thirdparty/SZ/sz/src/szd_int64.c

    r2c47b73 r9ee2ce3  
    1616#include "szd_int64.h" 
    1717#include "Huffman.h" 
     18#include "utility.h" 
    1819 
    1920/** 
     
    3536        if(cmpSize!=4+8+4+MetaDataByteLength && cmpSize!=4+8+8+MetaDataByteLength) 
    3637        { 
    37                 int isZlib = isZlibFormat(cmpBytes[0], cmpBytes[1]); 
    38                 if(isZlib) 
     38                confparams_dec->losslessCompressor = is_lossless_compressed_data(cmpBytes, cmpSize); 
     39                if(confparams_dec->losslessCompressor!=-1) 
    3940                        confparams_dec->szMode = SZ_BEST_COMPRESSION; 
    4041                else 
     
    4950                        if(targetUncompressSize<MIN_ZLIB_DEC_ALLOMEM_BYTES) //Considering the minimum size 
    5051                                targetUncompressSize = MIN_ZLIB_DEC_ALLOMEM_BYTES;  
    51                         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 
     52                        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 
    5253                        //szTmpBytes = (unsigned char*)malloc(sizeof(unsigned char)*tmpSize); 
    5354                        //memcpy(szTmpBytes, tmpBytes, tmpSize); 
Note: See TracChangeset for help on using the changeset viewer.