dockerfile/openalpr-base
1
0
Fork 0
mirror of https://github.com/kerberos-io/openalpr-base.git synced 2025-10-07 01:42:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use stringstream to build regex rather than concatenating a string

Browse Source
This commit is contained in:
Matt Hill
2015-07-07 19:40:26 -04:00
parent a437ff90a8
commit 51bc9fb8d1
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/openalpr/postprocess/regexrule.cpp
View File

@@ -17,6 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <sstream>
#include "regexrule.h" #include "regexrule.h"
using namespace std; using namespace std;
@@ -39,6 +41,7 @@ namespace alpr
return; return;
} }
std::stringstream regexval;
string::iterator utf_iterator = pattern.begin(); string::iterator utf_iterator = pattern.begin();
numchars = 0; numchars = 0;
while (utf_iterator < pattern.end()) while (utf_iterator < pattern.end())
@@ -47,9 +50,10 @@ namespace alpr
string utf_character = utf8chr(cp); string utf_character = utf8chr(cp);
if (utf_character == "[") if (utf_character == "[")
{ {
this->regex = this->regex + "["; regexval << "[";
while (utf_character != "]" ) while (utf_character != "]" )
{ {
@@ -58,28 +62,28 @@ namespace alpr
int cp = utf8::next(utf_iterator, pattern.end()); int cp = utf8::next(utf_iterator, pattern.end());
utf_character = utf8chr(cp); utf_character = utf8chr(cp);
this->regex = this->regex + utf_character; regexval << utf_character;
} }
} }
else if (utf_character == "\\") else if (utf_character == "\\")
{ {
// Don't add "\" characters to our character count // Don't add "\" characters to our character count
this->regex = this->regex + utf_character; regexval << utf_character;
continue; continue;
} }
else if (utf_character == "?") else if (utf_character == "?")
{ {
this->regex = this->regex + '.'; regexval << ".";
this->skipPositions.push_back(numchars); this->skipPositions.push_back(numchars);
} }
else if (utf_character == "@") else if (utf_character == "@")
{ {
this->regex = this->regex + "\\p{Alpha}"; regexval << "\\" << "p" << "{Alpha}";
} }
else if (utf_character == "#") else if (utf_character == "#")
{ {
this->regex = this->regex + "\\p{Digit}"; regexval << "\\" << "p" << "{Digit}";
} }
else if ((utf_character == "*") || (utf_character == "+")) else if ((utf_character == "*") || (utf_character == "+"))
{ {
@@ -87,12 +91,13 @@ namespace alpr
} }
else else
{ {
this->regex = this->regex + utf_character; regexval << utf_character;
} }
numchars++; numchars++;
} }
this->regex = regexval.str();
// Onigurama is not thread safe when compiling regex. Using a mutex to ensure that // Onigurama is not thread safe when compiling regex. Using a mutex to ensure that
// we don't crash // we don't crash
regexrule_mutex_m.lock(); regexrule_mutex_m.lock();