Clang tidy changes from sync

Author: Ray Smith

ccutil/unicharcompress.cpp

@@ -20,8 +20,8 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "unicharcompress.h"
-#include <memory>
 #include <algorithm>
+#include <memory>
 #include "tprintf.h"
 
 namespace tesseract {

classify/intmatcher.cpp

@@ -846,9 +846,9 @@ int IntegerMatcher::UpdateTablesForFeature(
             M3 = ~M3;
           A3 >>= mult_trunc_shift_bits_;
           M3 >>= mult_trunc_shift_bits_;
-          if ((unsigned)A3 > evidence_mult_mask_)
+          if (static_cast<uint32_t>(A3) > evidence_mult_mask_)
             A3 = evidence_mult_mask_;
-          if ((unsigned)M3 > evidence_mult_mask_)
+          if (static_cast<uint32_t>(M3) > evidence_mult_mask_)
             M3 = evidence_mult_mask_;
 
           A4 = (A3 * A3) + (M3 * M3);

training/lstmtraining.cpp

@@ -58,7 +58,8 @@ INT_PARAM_FLAG(max_iterations, 0, "If set, exit after this many iterations");
 STRING_PARAM_FLAG(traineddata, "",
                   "Combined Dawgs/Unicharset/Recoder for language model");
 STRING_PARAM_FLAG(old_traineddata, "",
-                  "Previous traineddata arg when changing the character set");
+                  "When changing the character set, this specifies the old"
+                  " character set that is to be replaced");
 
 // Number of training images to train between calls to MaintainCheckpoints.
 const int kNumPagesPerBatch = 100;