mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-24 03:23:04 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Remove unneeded test for nullptr

Browse Source 
IntSimdMatrix::GetFastestMultiplier never returns a nullptr.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-11-30 19:58:37 +01:00
parent e2419b1968
commit b73370aac9
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arch/intsimdmatrix.cpp
View File

@ -29,7 +29,7 @@ namespace tesseract {
// available type for the current architecture. // available type for the current architecture.
/* static */ /* static */
IntSimdMatrix* IntSimdMatrix::GetFastestMultiplier() { IntSimdMatrix* IntSimdMatrix::GetFastestMultiplier() {
IntSimdMatrix* multiplier = nullptr; IntSimdMatrix* multiplier;
if (SIMDDetect::IsAVX2Available()) { if (SIMDDetect::IsAVX2Available()) {
multiplier = new IntSimdMatrixAVX2(); multiplier = new IntSimdMatrixAVX2();
} else if (SIMDDetect::IsSSEAvailable()) { } else if (SIMDDetect::IsSSEAvailable()) {

6
src/lstm/networkio.cpp
View File

@ -987,11 +987,7 @@ void NetworkIO::ClipVector(int t, float range) {
int NetworkIO::GetPadding(int num_features) { int NetworkIO::GetPadding(int num_features) {
if (multiplier_ == nullptr) if (multiplier_ == nullptr)
multiplier_ = IntSimdMatrix::GetFastestMultiplier(); multiplier_ = IntSimdMatrix::GetFastestMultiplier();
int pad = 0; return multiplier_->RoundInputs(num_features) - num_features;
if (multiplier_ != nullptr) {
pad = multiplier_->RoundInputs(num_features) - num_features;
}
return pad;
} }
} // namespace tesseract. } // namespace tesseract.

4
src/lstm/weightmatrix.cpp
View File

@ -169,7 +169,7 @@ void WeightMatrix::ConvertToInt() {
wf_.Resize(1, 1, 0.0); wf_.Resize(1, 1, 0.0);
int_mode_ = true; int_mode_ = true;
multiplier_.reset(IntSimdMatrix::GetFastestMultiplier()); multiplier_.reset(IntSimdMatrix::GetFastestMultiplier());
if (multiplier_ != nullptr) multiplier_->Init(wi_); multiplier_->Init(wi_);
} }
// Allocates any needed memory for running Backward, and zeroes the deltas, // Allocates any needed memory for running Backward, and zeroes the deltas,
@ -222,7 +222,7 @@ bool WeightMatrix::DeSerialize(bool training, TFile* fp) {
if (!wi_.DeSerialize(fp)) return false; if (!wi_.DeSerialize(fp)) return false;
if (!scales_.DeSerialize(fp)) return false; if (!scales_.DeSerialize(fp)) return false;
multiplier_.reset(IntSimdMatrix::GetFastestMultiplier()); multiplier_.reset(IntSimdMatrix::GetFastestMultiplier());
if (multiplier_ != nullptr) multiplier_->Init(wi_); multiplier_->Init(wi_);
} else { } else {
if (!wf_.DeSerialize(fp)) return false; if (!wf_.DeSerialize(fp)) return false;
if (training) { if (training) {