修复：scoreToTextLine方法索引越界问题

RapidAI · Oct 17, 2022 · 5fe2bdc · 5fe2bdc
1 parent d14f23c
commit 5fe2bdc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/src/AngleNet.cpp b/src/AngleNet.cpp
@@ -6,12 +6,8 @@ AngleNet::AngleNet() {}
 
 AngleNet::~AngleNet() {
     delete session;
-    for (auto name : inputNames) {
-        free(name);
-    }
-    for (auto name : outputNames) {
-        free(name);
-    }
+    inputNames.clear();
+    outputNames.clear();
 }
 
 void AngleNet::setNumThread(int numOfThread) {

diff --git a/src/CrnnNet.cpp b/src/CrnnNet.cpp
@@ -7,12 +7,8 @@ CrnnNet::CrnnNet() {}
 
 CrnnNet::~CrnnNet() {
     delete session;
-    for (auto name: inputNames) {
-        free(name);
-    }
-    for (auto name: outputNames) {
-        free(name);
-    }
+    inputNames.clear();
+    outputNames.clear();
 }
 
 void CrnnNet::setNumThread(int numOfThread) {
@@ -76,8 +72,10 @@ TextLine CrnnNet::scoreToTextLine(const std::vector<float> &outputData, int h, i
     float maxValue;
 
     for (int i = 0; i < h; i++) {
-        maxIndex = int(argmax(&outputData[i * w], &outputData[(i + 1) * w]));
-        maxValue = float(*std::max_element(&outputData[i * w], &outputData[(i + 1) * w]));
+        int start = i * w;
+        int stop = (i + 1) * w - 1;
+        maxIndex = int(argmax(&outputData[start], &outputData[stop]));
+        maxValue = float(*std::max_element(&outputData[start], &outputData[stop]));
 
         if (maxIndex > 0 && maxIndex < keySize && (!(i > 0 && maxIndex == lastIndex))) {
             scores.emplace_back(maxValue);

diff --git a/src/DbNet.cpp b/src/DbNet.cpp
@@ -5,12 +5,8 @@ DbNet::DbNet() {}
 
 DbNet::~DbNet() {
     delete session;
-    for (auto name : inputNames) {
-        free(name);
-    }
-    for (auto name : outputNames) {
-        free(name);
-    }
+    inputNames.clear();
+    outputNames.clear();
 }
 
 void DbNet::setNumThread(int numOfThread) {