Merge pull request #2971 from poke1024/rowattr

Add RowAttributes getter to PageIterator

src/ccmain/ltrresultiterator.cpp

@@ -145,14 +145,6 @@ float LTRResultIterator::Confidence(PageIteratorLevel level) const {
   return 0.0f;
 }
 
-void LTRResultIterator::RowAttributes(float* row_height, float* descenders,
-                                      float* ascenders) const {
-  *row_height = it_->row()->row->x_height() + it_->row()->row->ascenders() -
-                it_->row()->row->descenders();
-  *descenders = it_->row()->row->descenders();
-  *ascenders = it_->row()->row->ascenders();
-}
-
 // Returns the font attributes of the current word. If iterating at a higher
 // level object than words, eg textlines, then this will return the
 // attributes of the first word in that textline.

src/ccmain/ltrresultiterator.h

@@ -94,10 +94,6 @@ class TESS_API LTRResultIterator : public PageIterator {
   // The number should be interpreted as a percent probability. (0.0f-100.0f)
   float Confidence(PageIteratorLevel level) const;
 
-  // Returns the attributes of the current row.
-  void RowAttributes(float* row_height, float* descenders,
-                     float* ascenders) const;
-
   // ============= Functions that refer to words only ============.
 
   // Returns the font attributes of the current word. If iterating at a higher

src/ccmain/pageiterator.cpp

@@ -516,6 +516,14 @@ bool PageIterator::Baseline(PageIteratorLevel level,
   return true;
 }
 
+void PageIterator::RowAttributes(float* row_height, float* descenders,
+                                 float* ascenders) const {
+  *row_height = it_->row()->row->x_height() + it_->row()->row->ascenders() -
+                it_->row()->row->descenders();
+  *descenders = it_->row()->row->descenders();
+  *ascenders = it_->row()->row->ascenders();
+}
+
 void PageIterator::Orientation(tesseract::Orientation *orientation,
                                tesseract::WritingDirection *writing_direction,
                                tesseract::TextlineOrder *textline_order,

src/ccmain/pageiterator.h

@@ -264,6 +264,10 @@ class TESS_API PageIterator {
   bool Baseline(PageIteratorLevel level,
                 int* x1, int* y1, int* x2, int* y2) const;
 
+  // Returns the attributes of the current row.
+  void RowAttributes(float* row_height, float* descenders,
+                     float* ascenders) const;
+
   /**
    * Returns orientation for the block the iterator points to.
    *   orientation, writing_direction, textline_order: see publictypes.h