From 56936e37693a23873d648873a7234d0d5632903c Mon Sep 17 00:00:00 2001 From: Kevin Conley Date: Thu, 2 Apr 2015 19:10:21 -0700 Subject: [PATCH] Only perform layout analysis once per image. --- TesseractOCR/G8Tesseract.mm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/TesseractOCR/G8Tesseract.mm b/TesseractOCR/G8Tesseract.mm index 58ecb706..8603e12a 100755 --- a/TesseractOCR/G8Tesseract.mm +++ b/TesseractOCR/G8Tesseract.mm @@ -492,38 +492,33 @@ - (NSString *)recognizedText - (G8Orientation)orientation { - if (self.layoutAnalysed == NO) { - [self analyseLayout]; - } + [self analyseLayout]; return _orientation; } - (G8WritingDirection)writingDirection { - if (self.layoutAnalysed == NO) { - [self analyseLayout]; - } + [self analyseLayout]; return _writingDirection; } - (G8TextlineOrder)textlineOrder { - if (self.layoutAnalysed == NO) { - [self analyseLayout]; - } + [self analyseLayout]; return _textlineOrder; } - (CGFloat)deskewAngle { - if (self.layoutAnalysed == NO) { - [self analyseLayout]; - } + [self analyseLayout]; return _deskewAngle; } - (void)analyseLayout { + // Only perform the layout analysis if we haven't already + if (self.layoutAnalysed) return; + tesseract::Orientation orientation; tesseract::WritingDirection direction; tesseract::TextlineOrder order;