Merge pull request #160 from kevincon/fix-orientation

Kevin Conley · Kevin Conley · commit a973a6c17867 · 2015-04-02T17:59:25.000-07:00
Image orientation fix. Fixes #151. Fixes #130.
diff --git a/Podfile.lock b/Podfile.lock
@@ -5,6 +5,6 @@ DEPENDENCIES:
   - Kiwi (~> 2.3.1)
 
 SPEC CHECKSUMS:
-  Kiwi: 73e1400209055ee9c8ba78c6012b6b642d0fb9f7
+  Kiwi: f038a6c61f7a9e4d7766bff5717aa3b3fdb75f55
 
-COCOAPODS: 0.36.0.beta.1
+COCOAPODS: 0.36.1
diff --git a/Tesseract OCR iOS.xcodeproj/project.pbxproj b/Tesseract OCR iOS.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		413F03321A5FBBDD000C194B /* UIImage+G8FixOrientation.h in Headers */ = {isa = PBXBuildFile; fileRef = 413F03301A5FBBDD000C194B /* UIImage+G8FixOrientation.h */; };
+		413F03331A5FBBDD000C194B /* UIImage+G8FixOrientation.m in Sources */ = {isa = PBXBuildFile; fileRef = 413F03311A5FBBDD000C194B /* UIImage+G8FixOrientation.m */; };
 		73C0A7961A5932C400D823D4 /* G8Tesseract.h in Headers */ = {isa = PBXBuildFile; fileRef = 64A029D617307CD0002B12E7 /* G8Tesseract.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		73C0A7971A5932C800D823D4 /* G8Tesseract.mm in Sources */ = {isa = PBXBuildFile; fileRef = 64A029D717307CD0002B12E7 /* G8Tesseract.mm */; };
 		73C0A7981A5932CC00D823D4 /* G8TesseractDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 4141211F1A4C578800583ED4 /* G8TesseractDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -25,6 +27,8 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		413F03301A5FBBDD000C194B /* UIImage+G8FixOrientation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+G8FixOrientation.h"; sourceTree = "<group>"; };
+		413F03311A5FBBDD000C194B /* UIImage+G8FixOrientation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+G8FixOrientation.m"; sourceTree = "<group>"; };
 		4141211F1A4C578800583ED4 /* G8TesseractDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = G8TesseractDelegate.h; sourceTree = "<group>"; };
 		418997A71A42CC8B00D6477C /* G8Constants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = G8Constants.h; sourceTree = "<group>"; };
 		41A95DE81A3AF39B0085093C /* G8TesseractParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = G8TesseractParameters.h; sourceTree = "<group>"; };
@@ -246,6 +250,8 @@
 				418997A71A42CC8B00D6477C /* G8Constants.h */,
 				6490748A198A5A5600D728CC /* UIImage+G8Filters.h */,
 				6490748B198A5A5600D728CC /* UIImage+G8Filters.m */,
+				413F03301A5FBBDD000C194B /* UIImage+G8FixOrientation.h */,
+				413F03311A5FBBDD000C194B /* UIImage+G8FixOrientation.m */,
 				41C7E8231A3F0682000DC42B /* Core */,
 				41C7E8211A3F0650000DC42B /* Readme */,
 				64A0293017307C1D002B12E7 /* Supporting Files */,
@@ -465,6 +471,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				413F03321A5FBBDD000C194B /* UIImage+G8FixOrientation.h in Headers */,
 				73C0A7961A5932C400D823D4 /* G8Tesseract.h in Headers */,
 				73C0A79D1A5932F900D823D4 /* G8TesseractParameters.h in Headers */,
 				73C0A7A01A59330A00D823D4 /* UIImage+G8Filters.h in Headers */,
@@ -548,6 +555,7 @@
 				73C0A7A11A59330E00D823D4 /* UIImage+G8Filters.m in Sources */,
 				73C0A79C1A5932F500D823D4 /* G8RecognitionOperation.m in Sources */,
 				73C0A7971A5932C800D823D4 /* G8Tesseract.mm in Sources */,
+				413F03331A5FBBDD000C194B /* UIImage+G8FixOrientation.m in Sources */,
 				73C0A79E1A5932FD00D823D4 /* G8TesseractParameters.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/TesseractOCR/G8Tesseract.mm b/TesseractOCR/G8Tesseract.mm
@@ -10,6 +10,7 @@
 #import "G8Tesseract.h"
 
 #import "UIImage+G8Filters.h"
+#import "UIImage+G8FixOrientation.h"
 #import "G8TesseractParameters.h"
 #import "G8Constants.h"
 #import "G8RecognizedBlock.h"
@@ -375,6 +376,8 @@ - (void)setImage:(UIImage *)image
             return;
         }
 
+        image = [image fixOrientation];
+        
         self.imageSize = image.size; //self.imageSize used in the characterBoxes method
 
         Pix *pix = nullptr;
@@ -490,43 +493,48 @@ - (NSString *)recognizedText
 - (G8Orientation)orientation
 {
     if (self.layoutAnalysed == NO) {
-        [self analyzeLayout];
+        [self analyseLayout];
     }
     return _orientation;
 }
 
 - (G8WritingDirection)writingDirection
 {
     if (self.layoutAnalysed == NO) {
-        [self analyzeLayout];
+        [self analyseLayout];
     }
     return _writingDirection;
 }
 
 - (G8TextlineOrder)textlineOrder
 {
     if (self.layoutAnalysed == NO) {
-        [self analyzeLayout];
+        [self analyseLayout];
     }
     return _textlineOrder;
 }
 
 - (CGFloat)deskewAngle
 {
     if (self.layoutAnalysed == NO) {
-        [self analyzeLayout];
+        [self analyseLayout];
     }
     return _deskewAngle;
 }
 
-- (void)analyzeLayout
+- (void)analyseLayout
 {
     tesseract::Orientation orientation;
     tesseract::WritingDirection direction;
     tesseract::TextlineOrder order;
     float deskewAngle;
 
     tesseract::PageIterator *iterator = _tesseract->AnalyseLayout();
+    if (iterator == NULL) {
+        NSLog(@"Can't analyse layout. Make sure 'osd.traineddata' available in 'tessdata'.");
+        return;
+    }
+
     iterator->Orientation(&orientation, &direction, &order, &deskewAngle);
     delete iterator;
 
diff --git a/TesseractOCR/UIImage+G8FixOrientation.h b/TesseractOCR/UIImage+G8FixOrientation.h
@@ -0,0 +1,19 @@
+//
+//  UIImage+G8FixOrientation.h
+//  Tesseract OCR iOS
+//
+//  Thanks to `an0` for answer from
+//  http://stackoverflow.com/a/10611036
+//
+//  Created by Nikolay Volosatov on 09/01/15.
+//  Copyright (c) 2014 Daniele Galiotto - www.g8production.com.
+//  All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface UIImage (G8FixOrientation)
+
+- (UIImage *)fixOrientation;
+
+@end
diff --git a/TesseractOCR/UIImage+G8FixOrientation.m b/TesseractOCR/UIImage+G8FixOrientation.m
@@ -0,0 +1,34 @@
+//
+//  UIImage+G8FixOrientation.m
+//  Tesseract OCR iOS
+//
+//  Thanks to `an0` for answer from
+//  http://stackoverflow.com/a/10611036
+//
+//  Created by Nikolay Volosatov on 09/01/15.
+//  Copyright (c) 2014 Daniele Galiotto - www.g8production.com.
+//  All rights reserved.
+//
+
+#import "UIImage+G8FixOrientation.h"
+
+@implementation UIImage (G8FixOrientation)
+
+- (UIImage *)fixOrientation
+{
+    // No-op if the orientation is already correct
+    if (self.imageOrientation == UIImageOrientationUp) return self;
+
+    UIImage *result;
+
+    UIGraphicsBeginImageContextWithOptions(self.size, NO, self.scale);
+
+    [self drawInRect:(CGRect){0, 0, self.size}];
+    result = UIGraphicsGetImageFromCurrentImageContext();
+
+    UIGraphicsEndImageContext();
+
+    return result;
+}
+
+@end
diff --git a/TestsProject/TestsProjectTests/RecognitionTests.m b/TestsProject/TestsProjectTests/RecognitionTests.m
@@ -59,6 +59,25 @@
         [[recognizedText should] containString:@"1234567890"];
     });
 
+    it(@"Should recognize regardless of orientation", ^{
+        UIImage *image = helper.image;
+        UIImage *rotatedImage = [UIImage imageWithCGImage:image.CGImage
+                                                    scale:image.scale
+                                              orientation:UIImageOrientationLeft];
+
+        [[theValue(image.imageOrientation) shouldNot] equal:theValue(rotatedImage.imageOrientation)];
+
+        [[theBlock(^{
+            [helper recognizeImage];
+        }) shouldNot] raise];
+
+        NSString *recognizedText = helper.tesseract.recognizedText;
+        [[recognizedText should] containString:@"1234567890"];
+
+        UIImage *thresholdedImage = helper.tesseract.thresholdedImage;
+        [[theValue(thresholdedImage.imageOrientation) should] equal:theValue(UIImageOrientationUp)];
+    });
+
     describe(@"Subimage", ^{
 
         beforeEach(^{
@@ -226,6 +245,16 @@
         [[theValue([onceThresholded g8_isEqualToImage:twiceThresholded]) should] beYes];
     });
 
+    it(@"Should not crash analyze layout", ^{
+        helper.pageSegmentationMode = G8PageSegmentationModeOSDOnly;
+
+        [helper recognizeImage];
+
+        [[theBlock(^{
+            [helper.tesseract deskewAngle];
+        }) shouldNot] raise];
+    });
+
     it(@"Should analyze layout", ^{
         helper.pageSegmentationMode = G8PageSegmentationModeAutoOSD;
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`#import "G8Tesseract.h"`
`11`	`11`
`12`	`12`	`#import "UIImage+G8Filters.h"`
	`13`	`+#import "UIImage+G8FixOrientation.h"`
`13`	`14`	`#import "G8TesseractParameters.h"`
`14`	`15`	`#import "G8Constants.h"`
`15`	`16`	`#import "G8RecognizedBlock.h"`
`@@ -375,6 +376,8 @@ - (void)setImage:(UIImage *)image`
`375`	`376`	`return;`
`376`	`377`	`}`
`377`	`378`
	`379`	`+ image = [image fixOrientation];`
	`380`	`+`
`378`	`381`	`self.imageSize = image.size; //self.imageSize used in the characterBoxes method`
`379`	`382`
`380`	`383`	`Pix *pix = nullptr;`
`@@ -490,43 +493,48 @@ - (NSString *)recognizedText`
`490`	`493`	`- (G8Orientation)orientation`
`491`	`494`	`{`
`492`	`495`	`if (self.layoutAnalysed == NO) {`
`493`		`- [self analyzeLayout];`
	`496`	`+ [self analyseLayout];`
`494`	`497`	`}`
`495`	`498`	`return _orientation;`
`496`	`499`	`}`
`497`	`500`
`498`	`501`	`- (G8WritingDirection)writingDirection`
`499`	`502`	`{`
`500`	`503`	`if (self.layoutAnalysed == NO) {`
`501`		`- [self analyzeLayout];`
	`504`	`+ [self analyseLayout];`
`502`	`505`	`}`
`503`	`506`	`return _writingDirection;`
`504`	`507`	`}`
`505`	`508`
`506`	`509`	`- (G8TextlineOrder)textlineOrder`
`507`	`510`	`{`
`508`	`511`	`if (self.layoutAnalysed == NO) {`
`509`		`- [self analyzeLayout];`
	`512`	`+ [self analyseLayout];`
`510`	`513`	`}`
`511`	`514`	`return _textlineOrder;`
`512`	`515`	`}`
`513`	`516`
`514`	`517`	`- (CGFloat)deskewAngle`
`515`	`518`	`{`
`516`	`519`	`if (self.layoutAnalysed == NO) {`
`517`		`- [self analyzeLayout];`
	`520`	`+ [self analyseLayout];`
`518`	`521`	`}`
`519`	`522`	`return _deskewAngle;`
`520`	`523`	`}`
`521`	`524`
`522`		`-- (void)analyzeLayout`
	`525`	`+- (void)analyseLayout`
`523`	`526`	`{`
`524`	`527`	`tesseract::Orientation orientation;`
`525`	`528`	`tesseract::WritingDirection direction;`
`526`	`529`	`tesseract::TextlineOrder order;`
`527`	`530`	`float deskewAngle;`
`528`	`531`
`529`	`532`	`tesseract::PageIterator *iterator = _tesseract->AnalyseLayout();`
	`533`	`+ if (iterator == NULL) {`
	`534`	`+ NSLog(@"Can't analyse layout. Make sure 'osd.traineddata' available in 'tessdata'.");`
	`535`	`+ return;`
	`536`	`+ }`
	`537`	`+`
`530`	`538`	`iterator->Orientation(&orientation, &direction, &order, &deskewAngle);`
`531`	`539`	`delete iterator;`
`532`	`540`