Tweaks

Author: flanglet

src/app/Kanzi.cpp

@@ -269,7 +269,7 @@ void printHeader(Printer& log, int verbose, bool& showHeader)
                  log.println(ss.str(), verbose > 0)
 
 
-bool toInt(string& s, int& res)
+static bool toInt(string& s, int& res)
 {
    // Check that all characters are valid
    for (size_t i = 0; i < s.length(); i++) {

src/entropy/TPAQPredictor.hpp

@@ -422,7 +422,7 @@ namespace kanzi
            _binCount += ((_c4 >> 7) & 1);
 
            // Select Neural Net
-           _mixer = &_mixers[(_matchLen != 0) ? (_c4 & _mixersMask) + 1 : _c4 & _mixersMask];
+           _mixer = &_mixers[(_c4 & _mixersMask) | ((_matchLen == 0) ? 0 : 1)];
 
            // Add contexts to NN
            _ctx0 = (_c4 & 0xFF) << 8;