diff --git a/iccodec.c b/iccodec.c index 1ee5dd9..1f6962b 100644 --- a/iccodec.c +++ b/iccodec.c @@ -1,6 +1,6 @@ /** Copyright (C) powturbo 2015-2023 - GPL v2 License + SPDX-License-Identifier: GPL v2 License This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,7 +30,6 @@ #include "include_/vint.h" #include "include_/iccodec.h" - #ifdef _BITSHUFFLE #include "bitshuffle/src/bitshuffle.h" #ifndef LZ4 @@ -66,6 +65,7 @@ int lzidget(char *scmd) { #ifdef _TURBORC #include "ext/Turbo-Range-Coder/turborc.h" +int bwtx, forcelzp; #endif #ifdef _ZSTD @@ -122,7 +122,7 @@ size_t codecenc(unsigned char *in, size_t inlen, unsigned char *out, unsigned ou case 1 : return ec==2?rccssenc(in, inlen, out, 5,6):rccsenc(in, inlen, out); case 2 : return ec==2?rcssenc( in, inlen, out, 5,6):rcsenc( in, inlen, out); //#define bwtflag(z) (z==2?BWT_BWT16:0) | (xprep8?BWT_PREP8:0) | forcelzp | (verbose?BWT_VERBOSE:0) | xsort <<14 | itmax <<10 | lenmin - case 20: return rcbwtenc(in,inlen,out,bwtlev,0, 1); + case 20: return rcbwtsenc(in,inlen,out,bwtlev,0, 1); } } #endif @@ -207,7 +207,7 @@ size_t codecdec(unsigned char *in, size_t inlen, unsigned char *out, unsigned ou switch(codlev) { case 1 : return ec==2?rccssdec(in, outlen, out, 5,6):rccsdec(in, outlen, out); case 2 : return ec==2?rcssdec( in, outlen, out, 5,6):rcsdec( in, outlen, out); - case 20: inlen==outlen?memcpy(out,in,outlen):rcbwtdec(in,outlen,out,bwtlev, 0); return 0; + case 20: inlen==outlen?memcpy(out,in,outlen):rcbwtsdec(in,outlen,out,bwtlev, 0); return 0; // case 2 : return turborcndec( in, outlen, out); } }