Merge pull request #1957 from stweil/lgtm

Fix some warnings from static code analyzer LGTM
tesseract-ocr · Oct 6, 2018 · 1e4768c · 1e4768c
2 parents e78c33c + b26866b
commit 1e4768c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/src/ccutil/genericvector.h b/src/ccutil/genericvector.h
@@ -866,15 +866,14 @@ void GenericVector<T>::set_compare_callback(
 // Clear the array, calling the callback function if any.
 template <typename T>
 void GenericVector<T>::clear() {
-  if (size_reserved_ > 0) {
-    if (clear_cb_ != nullptr)
-      for (int i = 0; i < size_used_; ++i)
-        clear_cb_->Run(data_[i]);
-    delete[] data_;
-    data_ = nullptr;
-    size_used_ = 0;
-    size_reserved_ = 0;
+  if (size_reserved_ > 0 && clear_cb_ != nullptr) {
+    for (int i = 0; i < size_used_; ++i)
+      clear_cb_->Run(data_[i]);
   }
+  delete[] data_;
+  data_ = nullptr;
+  size_used_ = 0;
+  size_reserved_ = 0;
   delete clear_cb_;
   clear_cb_ = nullptr;
   delete compare_cb_;

diff --git a/src/classify/intproto.cpp b/src/classify/intproto.cpp
@@ -20,7 +20,7 @@
 -----------------------------------------------------------------------------*/
 
 #include <algorithm>
-#include <cmath>
+#include <cmath>           // for std::floor
 #include <cstdio>
 #include <cassert>
 
@@ -117,7 +117,7 @@ FILL_SPEC;
 #define CircularIncrement(i,r)  (((i) < (r) - 1)?((i)++):((i) = 0))
 
 /** macro for mapping floats to ints without bounds checking */
-#define MapParam(P,O,N)   (floor (((P) + (O)) * (N)))
+#define MapParam(P,O,N)   (std::floor(((P) + (O)) * (N)))
 
 /*---------------------------------------------------------------------------
             Private Function Prototypes
@@ -1205,11 +1205,11 @@ void FillPPCircularBits(uint32_t ParamTable[NUM_PP_BUCKETS][WERDS_PER_PP_VECTOR]
   if (Spread > 0.5)
     Spread = 0.5;
 
-  FirstBucket = (int) floor ((Center - Spread) * NUM_PP_BUCKETS);
+  FirstBucket = static_cast<int>(std::floor((Center - Spread) * NUM_PP_BUCKETS));
   if (FirstBucket < 0)
     FirstBucket += NUM_PP_BUCKETS;
 
-  LastBucket = (int) floor ((Center + Spread) * NUM_PP_BUCKETS);
+  LastBucket = static_cast<int>(std::floor((Center + Spread) * NUM_PP_BUCKETS));
   if (LastBucket >= NUM_PP_BUCKETS)
     LastBucket -= NUM_PP_BUCKETS;
   if (debug) tprintf("Circular fill from %d to %d", FirstBucket, LastBucket);
@@ -1243,11 +1243,11 @@ void FillPPLinearBits(uint32_t ParamTable[NUM_PP_BUCKETS][WERDS_PER_PP_VECTOR],
                       int Bit, float Center, float Spread, bool debug) {
   int i, FirstBucket, LastBucket;
 
-  FirstBucket = (int) floor ((Center - Spread) * NUM_PP_BUCKETS);
+  FirstBucket = static_cast<int>(std::floor((Center - Spread) * NUM_PP_BUCKETS));
   if (FirstBucket < 0)
     FirstBucket = 0;
 
-  LastBucket = (int) floor ((Center + Spread) * NUM_PP_BUCKETS);
+  LastBucket = static_cast<int>(std::floor((Center + Spread) * NUM_PP_BUCKETS));
   if (LastBucket >= NUM_PP_BUCKETS)
     LastBucket = NUM_PP_BUCKETS - 1;
 
@@ -1736,7 +1736,7 @@ int TruncateParam(float Param, int Min, int Max, char *Id) {
               Id, Param, Max);
     Param = Max;
   }
-  return static_cast<int>(floor(Param));
+  return static_cast<int>(std::floor(Param));
 }                                /* TruncateParam */