Fixed issue 1108

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@1072 d0cd1f9f-072b-0410-8dd7-cf729c803f20
shenqiliang · Apr 24, 2014 · 0dd47a2 · 0dd47a2
1 parent 9fad031
commit 0dd47a2
Showing 1 changed file with 22 additions and 15 deletions.
diff --git a/cube/cube_line_segmenter.cpp b/cube/cube_line_segmenter.cpp
@@ -106,6 +106,21 @@ Pixa *CubeLineSegmenter::VerticalClosing(Pix *pix,
   return pixac;
 }
 
+// Helper cleans up after CrackLine.
+static void CleanupCrackLine(int line_cnt, Pixa **lines_pixa,
+                             Boxa **line_con_comps,
+                             Pixa **line_con_comps_pix) {
+  for (int line = 0; line < line_cnt; line++) {
+    if (lines_pixa[line] != NULL) {
+      pixaDestroy(&lines_pixa[line]);
+    }
+  }
+
+  delete []lines_pixa;
+  boxaDestroy(line_con_comps);
+  pixaDestroy(line_con_comps_pix);
+}
+
 // do a desperate attempt at cracking lines
 Pixa *CubeLineSegmenter::CrackLine(Pix *cracked_line_pix,
                                    Box *cracked_line_box, int line_cnt) {
@@ -139,19 +154,18 @@ Pixa *CubeLineSegmenter::CrackLine(Pix *cracked_line_pix,
     if (lines_pixa[line_idx] == NULL) {
       lines_pixa[line_idx] = pixaCreate(line_con_comps->n);
       if (lines_pixa[line_idx] == NULL) {
-        delete []lines_pixa;
-        boxaDestroy(&line_con_comps);
-        pixaDestroy(&line_con_comps_pix);
+        CleanupCrackLine(line_cnt, lines_pixa, &line_con_comps,
+                         &line_con_comps_pix);
         return NULL;
       }
     }
 
     // add the concomp to the line
     if (pixaAddPix(lines_pixa[line_idx], con_pix, L_CLONE) != 0 ||
         pixaAddBox(lines_pixa[line_idx], con_box, L_CLONE)) {
-      delete []lines_pixa;
-      boxaDestroy(&line_con_comps);
-      pixaDestroy(&line_con_comps_pix);
+      CleanupCrackLine(line_cnt, lines_pixa, &line_con_comps,
+                       &line_con_comps_pix);
+      return NULL;
     }
   }
 
@@ -192,15 +206,8 @@ Pixa *CubeLineSegmenter::CrackLine(Pix *cracked_line_pix,
   }
 
   // cleanup
-  for (int line = 0; line < line_cnt; line++) {
-    if (lines_pixa[line] != NULL) {
-      pixaDestroy(&lines_pixa[line]);
-    }
-  }
-
-  delete []lines_pixa;
-  boxaDestroy(&line_con_comps);
-  pixaDestroy(&line_con_comps_pix);
+  CleanupCrackLine(line_cnt, lines_pixa, &line_con_comps,
+                   &line_con_comps_pix);
 
   if (success == false) {
     pixaDestroy(&lines);