From b7b3e60601461a8ec879953b13dd74fbd8ff7e9f Mon Sep 17 00:00:00 2001
From: x <powturbo@gmail.com>
Date: Thu, 23 Mar 2023 11:29:37 +0100
Subject: [PATCH] TurboPFor: general purpose compressors

---
 lib/iccodec.c | 119 ++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/lib/iccodec.c b/lib/iccodec.c
index d5d449d..2c5cc70 100644
--- a/lib/iccodec.c
+++ b/lib/iccodec.c
@@ -24,16 +24,19 @@
 //  TurboPFor - "general purpose compression codec: lz, entropy coding, bwt,... "
 //------------------- LZ compression --------------------------------------------------
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "include_/conf.h"
 #include "include_/transpose.h"
 #include "include_/bitutil.h"
 #include "include_/vint.h"
 #include "include_/iccodec.h"
+#include "include_/trle.h"
 
   #ifdef _BITSHUFFLE
-#include "bitshuffle/src/bitshuffle.h"
+#include "ext/bitshuffle/src/bitshuffle.h"
     #ifndef LZ4
-#include "bitshuffle/lz4/lz4.h"
+#include "ext/bitshuffle/lz4/lz4.h"
     #endif
   #endif
 
@@ -47,7 +50,7 @@ int lzidget(char *scmd) {
   int i;
   for(i = 0; _codstr[i]; i++)
     if(!strcasecmp(scmd, _codstr[i])) break;
-  if(!_codstr[i]) { printf("compressor '%s' not implemented\n", scmd); exit(-1); }
+  if(!_codstr[i]) die("compressor '%s' not implemented\n", scmd);
   return i;
 }
   #ifdef _LZTURBO
@@ -78,7 +81,7 @@ int bwtx, forcelzp;
 #include "ext/zlib/zlib.h" //#include <zlib.h>
   #endif
 
-size_t codecenc(unsigned char *in, size_t inlen, unsigned char *out, unsigned outsize, int codid, int codlev, char *codprm) { 
+size_t codecenc(unsigned char *in, size_t inlen, unsigned char *out, unsigned outsize, int codid, int codlev, unsigned char *codprm) { 
   if(!inlen) return 0;
   switch(codid) {
       #ifdef _LZTURBO
@@ -175,7 +178,7 @@ size_t codecenc(unsigned char *in, size_t inlen, unsigned char *out, unsigned ou
   return 0;
 }
 
-size_t codecdec(unsigned char *in, size_t inlen, unsigned char *out, unsigned outlen, int codid, int codlev, char *codprm) { 
+size_t codecdec(unsigned char *in, size_t inlen, unsigned char *out, unsigned outlen, int codid, int codlev, unsigned char *codprm) { 
   if(!outlen) return 0;
   switch(codid) {
       #ifdef _LZTURBO
@@ -255,7 +258,7 @@ size_t codecdec(unsigned char *in, size_t inlen, unsigned char *out, unsigned ou
 
 //------------------------------------------------ TurboByte (SIMD Varint) -> codec (lz, entropy coding, bwt...) ----------------------------
 //-- TurboByte -> codec
-unsigned lzv8enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lzv8enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = 0;
   switch(esize) {
     case 1: clen = inlen; memcpy(tmp, in, inlen); break;
@@ -267,7 +270,7 @@ unsigned lzv8enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned
   return codecenc(tmp, clen, out+4, outsize, codid, codlev, codprm)+4;
 }
 
-unsigned lzv8dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lzv8dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = ctou32(in); 
   codecdec(in+4, inlen-4, tmp, clen, codid, codlev, codprm);
   switch(esize) {
@@ -280,7 +283,7 @@ unsigned lzv8dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned
 }
 
 // TurboByte xor -> codec
-unsigned lzv8xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) { // TurboVByte
+unsigned lzv8xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) { // TurboVByte
   unsigned clen=0; 
     switch(esize) {
     case 1: clen = inlen; memcpy(tmp, in, inlen); break;
@@ -292,7 +295,7 @@ unsigned lzv8xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
   return codecenc(tmp, clen, out+4, outsize, codid, codlev, codprm)+4;
 }
 
-unsigned v8lzxdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lzv8xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = ctou32(in); codecdec(in+4, inlen-4, tmp, clen, codid, codlev, codprm);
   switch(esize) {
     case 1: memcpy(out, tmp, outlen);   break;
@@ -304,7 +307,7 @@ unsigned v8lzxdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
 }
 
 // TurboByte zigzag -> codec
-unsigned lzv8zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lzv8zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = 0;
   switch(esize) {
     case 1: clen = inlen; memcpy(tmp, in, inlen); break;
@@ -316,7 +319,7 @@ unsigned lzv8zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
   return codecenc(tmp, clen, out+4, outsize, codid, codlev, codprm)+4;
 }
 
-unsigned lzv8zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lzv8zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = ctou32(in); codecdec(in+4, inlen-4, tmp, clen, codid, codlev, codprm);
   switch(esize) {
     case 1: memcpy( out, tmp, outlen);   break;
@@ -329,7 +332,7 @@ unsigned lzv8zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
 //-------------------------------------------- Byte transpose -> codec (lz, entropy coding, bwt,...) ------------------------------------------------------------------------
 
 //-- transpose -> codec
-unsigned lztpenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztpenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICCBEG;
     tpenc(ip, iplen, tmp, esize);
     unsigned clen = ctou32(op) = codecenc(tmp, iplen, op+4, outsize, codid, codlev, codprm);        //AC(clen > 0 && clen <= iplen, "#lztpenc %u ", clen);
@@ -337,7 +340,7 @@ unsigned lztpenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned
   ICCEND;
   return op - out;
 }
-unsigned lztpdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztpdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICDBEG;
     unsigned iplen = ctou32(ip); 
     codecdec(ip+4, iplen, tmp, oplen, codid, codlev, codprm);
@@ -348,7 +351,7 @@ unsigned lztpdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned
 }
 
 //-- xor -> transpose -> codec
-unsigned lztpxenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) { // XOR
+unsigned lztpxenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) { // XOR
   ICCBEG;
     tpxenc(ip, iplen, tmp, esize);
     unsigned clen = ctou32(op) = codecenc(tmp, iplen, op+4, outsize, codid, codlev, codprm);
@@ -357,7 +360,7 @@ unsigned lztpxenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
   return op - out;
 }
 
-unsigned lztpxdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztpxdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICDBEG;
     unsigned iplen = ctou32(ip); 
     codecdec(ip+4, iplen, tmp, oplen, codid, codlev, codprm);
@@ -368,7 +371,7 @@ unsigned lztpxdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
 }
 
 //-- zigzag -> transpose -> codec
-unsigned lztpzenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) { // Zigzag
+unsigned lztpzenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) { // Zigzag
   ICCBEG;
     tpzenc(ip, iplen, tmp, esize);
     unsigned clen = ctou32(op) = codecenc(tmp, iplen, op+4, outsize, codid, codlev, codprm);
@@ -377,7 +380,7 @@ unsigned lztpzenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
   return op - out;
 }
 
-unsigned lztpzdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztpzdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICDBEG;
     unsigned iplen = ctou32(ip); 
     codecdec(ip+4, iplen, tmp, oplen, codid, codlev, codprm);
@@ -389,7 +392,7 @@ unsigned lztpzdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
 //----------------------------------------------- tp4 : Nibble transpose -> codec --------------------------------
 
 //-- transpose Nibble -> codec
-unsigned lztp4enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztp4enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICCBEG;
     tp4enc(ip, iplen, tmp, esize);
     unsigned clen = ctou32(op) = codecenc(tmp, iplen, op+4, outsize, codid, codlev, codprm);
@@ -398,7 +401,7 @@ unsigned lztp4enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
   return op - out;
 }
 
-unsigned lztpd4ec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztpd4ec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICDBEG;
     unsigned iplen = ctou32(ip); 
     codecdec(ip+4, iplen, tmp, oplen, codid, codlev, codprm);
@@ -409,7 +412,7 @@ unsigned lztpd4ec(unsigned char *in, unsigned inlen, unsigned char *out, unsigne
 }
 
 //-- xor -> transpose Nibble -> codec
-unsigned lztp4xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) { //XOR
+unsigned lztp4xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) { //XOR
   ICCBEG;
     tp4xenc(ip, iplen, tmp, esize);
     unsigned clen = ctou32(op) = codecenc(tmp, iplen, op+4, outsize, codid, codlev, codprm);
@@ -418,7 +421,7 @@ unsigned lztp4xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsign
   return op - out;
 }
 
-unsigned lztp4xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztp4xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICDBEG;
     unsigned iplen = ctou32(ip); 
     codecdec(ip+4, iplen, tmp, oplen, codid, codlev, codprm);
@@ -429,7 +432,7 @@ unsigned lztp4xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 }
 
 //-- zigzag delta -> transpose Nibble -> codec
-unsigned lztp4zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztp4zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICCBEG;
     tp4zenc(ip, iplen, tmp, esize);
     unsigned clen = ctou32(op) = codecenc(tmp, iplen, op+4, outsize, codid, codlev, codprm);
@@ -438,7 +441,7 @@ unsigned lztp4zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsign
   return op - out;
 }
 
-unsigned lztp4zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm, unsigned bsize) {
+unsigned lztp4zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm, unsigned bsize) {
   ICDBEG;
     unsigned iplen = ctou32(ip); 
     codecdec(ip+4, iplen, tmp, oplen, codid, codlev, codprm);
@@ -526,7 +529,7 @@ unsigned tprlezdec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 }
 
 //-- transpose -> rle -> codec  (usually entropy coder )
-unsigned lztprleenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) { // Zigzag rle
+unsigned lztprleenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) { // Zigzag rle
   tpenc(in, inlen, out, esize);
   unsigned clen = trlec(out, inlen, tmp); 
   if(clen >= inlen) { clen = inlen; memcpy(tmp,out,inlen); }
@@ -534,16 +537,16 @@ unsigned lztprleenc(unsigned char *in, unsigned inlen, unsigned char *out, unsig
   return codecenc(tmp, clen, out+4, outsize, codid, codlev, codprm)+4;
 }
 
-unsigned lztprledec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztprledec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = ctou32(in); 
   codecdec(in+4, inlen-4, out, clen, codid, codlev, codprm); 
-  clen >= outlen?memcpy(tmp, out, outlen):trled(out, clen, tmp, outlen);
+  if(clen >= outlen) memcpy(tmp, out, outlen); else trled(out, clen, tmp, outlen);
   tpdec(tmp, outlen, out, esize);
   return inlen;
 }
 
 //-- xor -> transpose -> rle -> codec
-unsigned lztprlexenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) { // Zigzag rle
+unsigned lztprlexenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) { // Zigzag rle
   tpxenc(in, inlen, out, esize);
   unsigned clen = trlec(out, inlen, tmp); 
   if(clen >= inlen) { clen = inlen; memcpy(tmp,out,inlen); }
@@ -551,15 +554,15 @@ unsigned lztprlexenc(unsigned char *in, unsigned inlen, unsigned char *out, unsi
   return codecenc(tmp, clen, out+4, outsize, codid, codlev, codprm)+4;
 }
 
-unsigned lztprlexdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztprlexdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = ctou32(in); codecdec(in+4, inlen-4, out, clen, codid, codlev, codprm); 
-  clen >= outlen?memcpy(tmp, out, outlen):trled(out, clen, tmp, outlen);
+  if(clen >= outlen) memcpy(tmp, out, outlen); else trled(out, clen, tmp, outlen);
   tpxdec(tmp, outlen, out, esize);
   return inlen;
 }
 
 //-- zigzag delta -> transpose -> rle -> codec
-unsigned lztprlezenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) { // Zigzag rle
+unsigned lztprlezenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) { // Zigzag rle
   tpzenc(in, inlen, out, esize);
   unsigned clen = trlec(out, inlen, tmp); 
   if(clen >= inlen) { clen = inlen; memcpy(tmp,out,inlen); }
@@ -567,23 +570,23 @@ unsigned lztprlezenc(unsigned char *in, unsigned inlen, unsigned char *out, unsi
   return codecenc(tmp, clen, out+4, outsize, codid, codlev, codprm)+4;
 }
 
-unsigned lztprlezdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztprlezdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned clen = ctou32(in); 
   codecdec(in+4, inlen-4, out, clen, codid, codlev, codprm); 
-  clen >= outlen?memcpy(tmp, out, outlen):trled(out, clen, tmp, outlen);
+  if(clen >= outlen) memcpy(tmp, out, outlen); else trled(out, clen, tmp, outlen);
   tpzdec(tmp, outlen, out, esize);
   return inlen;
 }
 
 //------------------------------------------------------- 2D -------------------------------------------------
 // transpose 2D -> transpose (byte/Nibble) -> codec
-unsigned lztpd2enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, char *codprm) { 
+unsigned lztpd2enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, unsigned char *codprm) { 
   tp2denc(     in,  x, y,  out, esize);                            
   TPENC(       out, inlen, tmp, esize);                            
   return codecenc(tmp, inlen, out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd2dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen,  unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, char *codprm) { //printf("#2D[%u,%u]", x, y);
+unsigned lztpd2dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen,  unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, unsigned char *codprm) { //printf("#2D[%u,%u]", x, y);
   codecdec(  in,  inlen,  out, outlen, codid, codlev, codprm); 
   TPDEC(  out, outlen, tmp, esize); 
   tp2ddec(tmp, x, y,   out, esize); 
@@ -591,13 +594,13 @@ unsigned lztpd2dec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 }
 
 // transpose 2D -> xor -> transpose (byte/Nibble) -> codec
-unsigned lztpd2xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, char *codprm) { 
+unsigned lztpd2xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, unsigned char *codprm) { 
   tp2denc( in,  x, y,  out, esize);
   tpxenc(  out, inlen, tmp, esize);
   return codecenc(tmp, inlen, out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd2xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, char *codprm) {
+unsigned lztpd2xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in,  inlen,  out, outlen, codid, codlev, codprm);
   tpxdec(  out, outlen, tmp, esize);
   tp2ddec(tmp, x, y,   out, esize);
@@ -605,13 +608,13 @@ unsigned lztpd2xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsig
 }
 
 // transpose 2D -> zigzag -> transpose (byte/Nibble) -> codec
-unsigned lztpd2zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, char *codprm) { 
+unsigned lztpd2zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, unsigned char *codprm) { 
   tp2denc(      in,  x, y, out, esize);
   tpzenc(       out, inlen, tmp, esize);
   return codecenc(tmp, inlen, out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd2zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, char *codprm) {
+unsigned lztpd2zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, int codid, int codlev, unsigned char *codprm) {
   codecdec( in,  inlen, out, outlen, codid, codlev, codprm);
   tpzdec(  out, outlen, tmp, esize); //  bitzdec(tmp, outlen, esize);
   tp2ddec(tmp, x, y,   out, esize);
@@ -620,13 +623,13 @@ unsigned lztpd2zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsig
 
 //--------------------------------------------------------- 3D ------------------------------------------------------------
 // transpose 3D -> transpose (byte/Nibble) -> codec
-unsigned lztpd3enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd3enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   tp3denc(     in, x, y, z, out, esize);
   TPENC(      out, inlen,  tmp, esize);
   return codecenc(tmp, inlen,  out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd3dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize,  unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd3dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize,  unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in,  inlen,   out, outlen, codid, codlev, codprm);
   TPDEC(  out, outlen,  tmp, esize);
   tp3ddec(tmp, x, y, z, out, esize);
@@ -634,13 +637,13 @@ unsigned lztpd3dec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 }
 
 // transpose 3D -> xor -> transpose (byte/Nibble) -> codec 
-unsigned lztpd3xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd3xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   tp3denc(     in, x, y, z, out, esize);//  bitxenc(     tmp, inlen,  out, esize);
   tpxenc(     out, inlen,  tmp, esize);
   return codecenc(tmp, inlen,  out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd3xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen,  unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd3xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen,  unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in,  inlen,   out, outlen, codid, codlev, codprm);
   tpxdec( out, outlen,  tmp, esize);//  bitxdec(tmp, outlen,       esize);
   tp3ddec(tmp, x, y, z, out, esize);
@@ -648,13 +651,13 @@ unsigned lztpd3xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsig
 }
 
 // transpose 3D -> zigzag -> transpose (byte/Nibble) -> codec
-unsigned lztpd3zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd3zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   tp3denc(     in,  x, y, z, out, esize);//  bitzenc(     tmp, inlen,   out, esize);
   tpzenc(     out, inlen,   tmp, esize);
   return codecenc(tmp, inlen,   out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd3zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd3zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in, inlen,  out, outlen, codid, codlev, codprm);
   tpzdec(   out, outlen, tmp, esize);//  bitzdec(tmp, outlen, esize);
   tp3ddec(tmp, x, y, z, out, esize);
@@ -663,13 +666,13 @@ unsigned lztpd3zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsig
 
 //--------------------------------------------------------- 4D ------------------------------------------------------------
 // transpose 4D -> transpose (byte/Nibble) -> codec
-unsigned lztpd4enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd4enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   tp4denc(     in, w, x, y, z, out, esize);
   TPENC(       out, inlen,     tmp, esize);
   return codecenc(tmp, inlen,     out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd4dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize,  unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd4dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize,  unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in,  inlen,      out, outlen, codid, codlev, codprm);
   TPDEC(  out, outlen,     tmp, esize);
   tp4ddec(tmp, w, x, y, z, out, esize);
@@ -677,13 +680,13 @@ unsigned lztpd4dec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 }
 
 // transpose 4D -> xor -> transpose (byte/Nibble) -> codec
-unsigned lztpd4xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd4xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   tp4denc( in, w, x, y, z, out, esize);
   tpxenc( out, inlen,      tmp, esize);
   return codecenc(tmp, inlen,  out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd4xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd4xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in,  inlen,      out, outlen, codid, codlev, codprm);
   tpxdec(   out, outlen,     tmp, esize);
   tp4ddec(tmp, w, x, y, z, out, esize);
@@ -691,13 +694,13 @@ unsigned lztpd4xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsig
 }
 
 // transpose 4D -> zigzag -> transpose (byte/Nibble) -> codec
-unsigned lztpd4zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd4zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   tp4denc(     in, w, x, y, z, out, esize);
   tpzenc(     out, inlen,      tmp, esize);
   return codecenc(tmp, inlen,  out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztpd4zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen,  unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, char *codprm) {
+unsigned lztpd4zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen,  unsigned esize, unsigned char *tmp, unsigned w, unsigned x, unsigned y, unsigned z, int codid, int codlev, unsigned char *codprm) {
   codecdec(  in,  inlen,     out, outlen, codid, codlev, codprm);
   tpzdec(   out, outlen,     tmp, esize);
   tp4ddec(tmp, w, x, y, z, out, esize);
@@ -716,25 +719,25 @@ static void bitunshuffle(uint8_t *in, unsigned n, uint8_t *out, unsigned esize)
 }
   
 //-- bitshuffle -> codec
-unsigned lztp1enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztp1enc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   bitshuffle(in, inlen, tmp, esize);
   return codecenc(tmp, inlen, out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztp1dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztp1dec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   codecdec(in, inlen, tmp, outlen, codid, codlev, codprm);
   bitunshuffle(tmp, outlen, out, esize);
   return inlen;
 }
 
 //-- xor -> bitshuffle -> codec
-unsigned lztp1xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztp1xenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   bitxenc(in, inlen, out, esize);
   bitshuffle(out, inlen, tmp, esize);
   return codecenc(tmp, inlen, out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztp1xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztp1xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   codecdec(in, inlen, tmp, outlen, codid, codlev, codprm);
   bitunshuffle(tmp, outlen, out, esize);
   bitxdec(out, outlen, esize);
@@ -742,13 +745,13 @@ unsigned lztp1xdec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 }
 
 //-- zigzag delta -> bitshuffle -> codec 
-unsigned lztp1zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztp1zenc(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outsize, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   bitzenc(in, inlen, out, esize);                
   bitshuffle(out, inlen, tmp, esize);
   return codecenc(tmp, inlen, out, outsize, codid, codlev, codprm);
 }
 
-unsigned lztp1zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, char *codprm) {
+unsigned lztp1zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsigned outlen, unsigned esize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   codecdec(in, inlen, tmp, outlen, codid, codlev, codprm);
   bitunshuffle(tmp, outlen, out, esize);
   bitzdec(out, outlen, esize);
@@ -764,7 +767,7 @@ unsigned lztp1zdec(unsigned char *in, unsigned inlen, unsigned char *out, unsign
 #define INDEC  size_t inlen  = _inlen /sizeof( in[0]); { unsigned char *p_=_in+_inlen,  *_p = _in +(_inlen & ~(sizeof(in[0] )-1)); while(_p < p_) { *op++  = *_p++; } }
 #define OUTDEC size_t outlen = _outlen/sizeof(out[0]); { unsigned char *p_=_out+_outlen,*_p = _out+(_outlen& ~(sizeof(out[0])-1)); while(_p < p_) *_p++  = *ip++; }
 
-size_t vlccomp32(unsigned char *_in, size_t _inlen, unsigned char *out, size_t outsize, unsigned char *tmp, int codid, int codlev, char *codprm) { //bitgput32(bw,br, x); bitenormr(bw,br,op_);//bitdnormr(bw,br,bp); bitgget32(bw,br, x);
+size_t vlccomp32(unsigned char *_in, size_t _inlen, unsigned char *out, size_t outsize, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) { //bitgput32(bw,br, x); bitenormr(bw,br,op_);//bitdnormr(bw,br,bp); bitgget32(bw,br, x);
   unsigned char *op = out+4, *tp = tmp, *tmp_ = tmp+_inlen, *bp = tmp_;
   uint32_t      *in = (uint32_t *)_in, *ip;
   INDEC;
@@ -782,7 +785,7 @@ size_t vlccomp32(unsigned char *_in, size_t _inlen, unsigned char *out, size_t o
   e:return op - out;
 }
 
-size_t vlcdecomp32(unsigned char *in, size_t inlen, unsigned char *_out, size_t _outlen, unsigned char *tmp, int codid, int codlev, char *codprm) {
+size_t vlcdecomp32(unsigned char *in, size_t inlen, unsigned char *_out, size_t _outlen, unsigned char *tmp, int codid, int codlev, unsigned char *codprm) {
   unsigned char *ip = in+4, *bp = in+inlen, *tp = tmp;
   uint32_t      *out = (uint32_t *)_out, *op = out, x=0;
   if(inlen >= _outlen){ memcpy(_out, in, _outlen); return inlen; }