Only perform layout analysis once per image.

Kevin Conley · Kevin Conley · commit 56936e37693a · 2015-04-02T19:10:21.000-07:00
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -492,38 +492,33 @@ - (NSString *)recognizedText`
`492`	`492`
`493`	`493`	`- (G8Orientation)orientation`
`494`	`494`	`{`
`495`		`- if (self.layoutAnalysed == NO) {`
`496`		`- [self analyseLayout];`
`497`		`- }`
	`495`	`+ [self analyseLayout];`
`498`	`496`	`return _orientation;`
`499`	`497`	`}`
`500`	`498`
`501`	`499`	`- (G8WritingDirection)writingDirection`
`502`	`500`	`{`
`503`		`- if (self.layoutAnalysed == NO) {`
`504`		`- [self analyseLayout];`
`505`		`- }`
	`501`	`+ [self analyseLayout];`
`506`	`502`	`return _writingDirection;`
`507`	`503`	`}`
`508`	`504`
`509`	`505`	`- (G8TextlineOrder)textlineOrder`
`510`	`506`	`{`
`511`		`- if (self.layoutAnalysed == NO) {`
`512`		`- [self analyseLayout];`
`513`		`- }`
	`507`	`+ [self analyseLayout];`
`514`	`508`	`return _textlineOrder;`
`515`	`509`	`}`
`516`	`510`
`517`	`511`	`- (CGFloat)deskewAngle`
`518`	`512`	`{`
`519`		`- if (self.layoutAnalysed == NO) {`
`520`		`- [self analyseLayout];`
`521`		`- }`
	`513`	`+ [self analyseLayout];`
`522`	`514`	`return _deskewAngle;`
`523`	`515`	`}`
`524`	`516`
`525`	`517`	`- (void)analyseLayout`
`526`	`518`	`{`
	`519`	`+ // Only perform the layout analysis if we haven't already`
	`520`	`+ if (self.layoutAnalysed) return;`
	`521`	`+`
`527`	`522`	`tesseract::Orientation orientation;`
`528`	`523`	`tesseract::WritingDirection direction;`
`529`	`524`	`tesseract::TextlineOrder order;`