Push release to 1.1

Author: flanglet

cpp/src/app/BlockCompressor.cpp

@@ -145,7 +145,7 @@ int BlockCompressor::call()
 {
     bool printFlag = _verbosity > 1;
     stringstream ss;
-    ss << "Kanzi 1.0 (C) 2017,  Frederic Langlet";
+    ss << "Kanzi 1.1 (C) 2017,  Frederic Langlet";
     printOut(ss.str().c_str(), _verbosity >= 1);
     ss.str(string());
     ss << "Input file name set to '" << _inputName << "'";

cpp/src/app/BlockDecompressor.cpp

@@ -138,7 +138,7 @@ int BlockDecompressor::call()
 {
     bool printFlag = _verbosity > 1;
     stringstream ss;
-    ss << "Kanzi 1.0 (C) 2017,  Frederic Langlet";
+    ss << "Kanzi 1.1 (C) 2017,  Frederic Langlet";
     printOut(ss.str().c_str(), _verbosity >= 1);
     ss.str(string());
     ss << "Input file name set to '" << _inputName << "'";

cpp/src/entropy/TPAQPredictor.cpp

@@ -431,7 +431,7 @@ inline void TPAQPredictor::addMatchContext()
 {
     if (_c0 == ((_buffer[_matchPos & MASK2] & 0xFF) | 256) >> (8 - _bpos)) {
         // Add match length to NN inputs. Compute input based on run length
-        int p = (_matchLen < 32) ? _matchLen : 32 + ((_matchLen - 32) >> 2);
+        int p = (_matchLen <= 32) ? _matchLen : 32 + ((_matchLen - 32) >> 2);
 
         if (((_buffer[_matchPos & MASK2] >> (7 - _bpos)) & 1) == 0)
             p = -p;

go/src/kanzi/app/BlockCompressorTask.go

@@ -219,7 +219,7 @@ func BlockCompressor_main() {
 func (this *BlockCompressor) call() (int, uint64) {
 	var msg string
 	printFlag := this.verbosity > 1
-	bc_printOut("Kanzi 1.0 (C) 2017,  Frederic Langlet", this.verbosity >= 1)
+	bc_printOut("Kanzi 1.1 (C) 2017,  Frederic Langlet", this.verbosity >= 1)
 	bc_printOut("Input file name set to '"+this.inputName+"'", printFlag)
 	bc_printOut("Output file name set to '"+this.outputName+"'", printFlag)
 	msg = fmt.Sprintf("Block size set to %d bytes", this.blockSize)
@@ -231,7 +231,7 @@ func (this *BlockCompressor) call() (int, uint64) {
 	msg = fmt.Sprintf("Checksum set to %t", this.checksum)
 	bc_printOut(msg, printFlag)
 	w1 := "no"
-
+ 
 	if this.transform != "NONE" {
 		w1 = this.transform
 	}

go/src/kanzi/app/BlockDecompressorTask.go

@@ -183,7 +183,7 @@ func BlockDecompressor_main() {
 func (this *BlockDecompressor) call() (int, uint64) {
 	var msg string
 	printFlag := this.verbosity > 1
-	bd_printOut("Kanzi 1.0 (C) 2017,  Frederic Langlet", this.verbosity >= 1)
+	bd_printOut("Kanzi 1.1 (C) 2017,  Frederic Langlet", this.verbosity >= 1)
 	bd_printOut("Input file name set to '"+this.inputName+"'", printFlag)
 	bd_printOut("Output file name set to '"+this.outputName+"'", printFlag)
 	msg = fmt.Sprintf("Verbosity set to %v", this.verbosity)

go/src/kanzi/entropy/TPAQPredictor.go

@@ -473,7 +473,7 @@ func (this *TPAQPredictor) addMatchContext() {
 		// Add match length to NN inputs. Compute input based on run length
 		var p int
 
-		if this.matchLen < 32 {
+		if this.matchLen <= 32 {
 			p = this.matchLen
 		} else {
 			p = (32 + ((this.matchLen - 32) >> 2))

java/src/kanzi/app/BlockCompressor.java

@@ -173,7 +173,7 @@ public void run()
    public Integer call()
    { 
       boolean printFlag = this.verbosity > 1;
-      printOut("Kanzi 1.0 (C) 2017,  Frederic Langlet", this.verbosity >= 1);
+      printOut("Kanzi 1.1 (C) 2017,  Frederic Langlet", this.verbosity >= 1);
       printOut("Input file name set to '" + this.inputName + "'", printFlag);
       printOut("Output file name set to '" + this.outputName + "'", printFlag);
       printOut("Block size set to " + this.blockSize + " bytes", printFlag);

java/src/kanzi/app/BlockDecompressor.java

@@ -156,7 +156,7 @@ public void run()
    public Integer call()
    {
       boolean printFlag = this.verbosity > 1;
-      printOut("Kanzi 1.0 (C) 2017,  Frederic Langlet", this.verbosity >= 1);
+      printOut("Kanzi 1.1 (C) 2017,  Frederic Langlet", this.verbosity >= 1);
       printOut("Input file name set to '" + this.inputName + "'", printFlag);
       printOut("Output file name set to '" + this.outputName + "'", printFlag);
       printOut("Verbosity set to "+this.verbosity, printFlag);

java/src/kanzi/entropy/TPAQPredictor.java

@@ -467,7 +467,7 @@ private void addMatchContext()
       if (this.c0 == ((this.buffer[this.matchPos&MASK2] & 0xFF) | 256) >> (8-this.bpos))
       {
          // Add match length to NN inputs. Compute input based on run length
-         int p = (this.matchLen<32) ? this.matchLen : 32+((this.matchLen-32)>>2);
+         int p = (this.matchLen<=32) ? this.matchLen : 32+((this.matchLen-32)>>2);
 
          if (((this.buffer[this.matchPos&MASK2] >> (7-this.bpos)) & 1) == 0)
             p = -p;