Partially revert "Merge pull request tesseract-ocr#3330 from Sintun/m…

…aster" This partially reverts commit 122daf1, reversing changes made to 4cd56dc. This fixes a fatal assertion for certain images: cell_y_.size() >= 2 && cell_x_.size() >= 2:Error:Assert failed:in file ../../../src/textord/tablerecog.cpp, line 363 Signed-off-by: Stefan Weil <[email protected]>
stweil · Jul 15, 2021 · ffea0f2 · ffea0f2
1 parent a71edc9
commit ffea0f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/textord/colfind.cpp b/src/textord/colfind.cpp
@@ -37,8 +37,8 @@
 #include "scrollview.h"
 #include "strokewidth.h"
 #include "tablefind.h"
-#include "workingpartset.h"
 #include "tabletransfer.h"
+#include "workingpartset.h"
 
 #include <algorithm>
 

diff --git a/src/textord/tablefind.cpp b/src/textord/tablefind.cpp
@@ -2003,7 +2003,7 @@ void TableFinder::MakeTableBlocks(ColPartitionGrid *grid, ColPartitionSet **all_
                          ScrollView::BLUE, ScrollView::LIGHT_BLUE);
   }
 #endif  // GRAPHICS_DISABLED
-  
+
   // initializing recognizer in order to extract table row and columnd info
   TableRecognizer recognizer;
   {
@@ -2013,7 +2013,7 @@ void TableFinder::MakeTableBlocks(ColPartitionGrid *grid, ColPartitionSet **all_
     recognizer.set_max_text_height(global_median_xheight_ * 2.0);
     recognizer.set_min_height(1.5 * gridheight());
   }
-  
+
   // Since we have table blocks already, remove table tags from all
   // colpartitions
   GridSearch<ColPartition, ColPartition_CLIST, ColPartition_C_IT> gsearch(grid);
@@ -2068,7 +2068,8 @@ void TableFinder::MakeTableBlocks(ColPartitionGrid *grid, ColPartitionSet **all_
       table_partition->set_flow(BTFT_CHAIN);
       table_partition->SetBlobTypes();
       grid->InsertBBox(true, true, table_partition);
-
+
+#if 0 // This code triggers an assertion.
       // Insert table columns and rows into an api accessible object
       StructuredTable* table_structure = recognizer.RecognizeTable(table_box);
       if (table_structure != nullptr) {
@@ -2084,9 +2085,10 @@ void TableFinder::MakeTableBlocks(ColPartitionGrid *grid, ColPartitionSet **all_
 
       delete table_structure;
       }
+#endif
     }
   }
-  
+
 #ifndef GRAPHICS_DISABLED
   if (textord_show_tables) {
     table_grid_.DisplayBoxes(table_win);