Merge pull request #113 from ws233/master

Added ability to init with config dictionary/files and use Caches directory for "tessdata" folder location.

Author: kevincon

Products/TesseractOCR.framework/Versions/A/Headers/G8Tesseract.h

@@ -40,6 +40,12 @@
  */
 @property (nonatomic, copy) NSString* language;
 
+/**
+ * The path to the tessdata file, if it was specified in a call to initWithLanguage:configDictionary:configFileNames:cachesRelatedDataPath:engineMode: as a cachesRelatedDataPath
+ * Otherwise it's supposed that the tessdata folder is located in the application bundle
+ */
+@property (nonatomic, readonly, copy) NSString *absoluteDataPath;
+
 /**
  *  The recognition mode to use. See `G8OCREngineMode` in G8Constants.h for the
  *  available recognition modes.
@@ -228,6 +234,30 @@
 - (id)initWithLanguage:(NSString*)language
             engineMode:(G8OCREngineMode)engineMode;
 
+/**
+ *  Initialize Tesseract with the provided language and engine mode.
+ *
+ *  @param language             The language to use in recognition. See `language`.
+ *  @param configDictionary     A dictioanry of the config variables
+ *  @param configFileNames      An array of file names containing key-value config pairs. All the config
+ *                              variables can be init only and debug time both. Furthermore they could be
+ *                              specified at the same time, in such case tesseract will get variables from
+ *                              every file and dictionary all together. 
+ *                              The files are searched into two folders, which are tessdata/tessconfigs and tessdata/configs
+ *  @param cachesRelatedPath    If the cachesRelatedDataPath is specified, the whole content of the tessdata from the
+ *                              application bundle is copied to the Library/Caches/cachesRelatedDataPath/tessdata
+ *                              and tesseract is initialized with that path.
+ *  @param engineMode           The engine mode to use in recognition. See `engineMode`.
+ *
+ *  @return The initialized Tesseract object, or `nil` if there was an error.
+ */
+
+- (id)initWithLanguage:(NSString *)language
+      configDictionary:(NSDictionary *)configDictionary
+       configFileNames:(NSArray *)configFileNames
+ cachesRelatedDataPath:(NSString *)cachesRelatedDataPath
+            engineMode:(G8OCREngineMode)engineMode NS_DESIGNATED_INITIALIZER;
+
 /**
  *  Set a Tesseract variable. See G8TesseractParameters.h for the available
  *  options.
@@ -237,6 +267,16 @@
  */
 - (void)setVariableValue:(NSString *)value forKey:(NSString *)key;
 
+/**
+ *  Returns a Tesseract variable for the given key. See G8TesseractParameters.h for the available
+ *  options.
+ *
+ *  @param key  The option to get.
+ *
+ *  @return     returns the variable value for the given key, if it's beeb set. nil otherwise.
+ */
+- (NSString*)variableValueForKey:(NSString *)key;
+
 /**
  *  Set Tesseract variables using a dictionary. See G8TesseractParameters.h for 
  *  the available options.

Products/TesseractOCR.framework/Versions/A/TesseractOCR

@@ -21,6 +21,7 @@
 		64DDA74E188FD7D10025590D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6400DDEA180C5DE000443362 /* Main.storyboard */; };
 		64DDA75B188FD9140025590D /* tessdata in Resources */ = {isa = PBXBuildFile; fileRef = 64DDA75A188FD9140025590D /* tessdata */; };
 		64E40AB1180C6D4D00C36DDE /* libstdc++.6.0.9.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 64E40AB0180C6D4D00C36DDE /* libstdc++.6.0.9.dylib */; };
+		736EFF261A5877200031B432 /* tessdata-rus in Resources */ = {isa = PBXBuildFile; fileRef = 736EFF251A5877200031B432 /* tessdata-rus */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -43,6 +44,7 @@
 		6490748F198A5CD500D728CC /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
 		64DDA75A188FD9140025590D /* tessdata */ = {isa = PBXFileReference; lastKnownFileType = folder; path = tessdata; sourceTree = "<group>"; };
 		64E40AB0180C6D4D00C36DDE /* libstdc++.6.0.9.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.6.0.9.dylib"; path = "usr/lib/libstdc++.6.0.9.dylib"; sourceTree = SDKROOT; };
+		736EFF251A5877200031B432 /* tessdata-rus */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "tessdata-rus"; path = "../TestsProject/TestsProjectTests/tessdata-rus"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -65,6 +67,7 @@
 		6400DDCC180C5DE000443362 = {
 			isa = PBXGroup;
 			children = (
+				736EFF251A5877200031B432 /* tessdata-rus */,
 				6400DDDE180C5DE000443362 /* Template Framework Project */,
 				6400DDD7180C5DE000443362 /* Frameworks */,
 				6400DDD6180C5DE000443362 /* Products */,
@@ -175,6 +178,7 @@
 				6400DDF1180C5DE000443362 /* Images.xcassets in Resources */,
 				428615B71845F340005D5A2E /* image_sample.jpg in Resources */,
 				64DDA75B188FD9140025590D /* tessdata in Resources */,
+				736EFF261A5877200031B432 /* tessdata-rus in Resources */,
 				6400DDE3180C5DE000443362 /* InfoPlist.strings in Resources */,
 				64DDA74E188FD7D10025590D /* Main.storyboard in Resources */,
 			);

Template Framework Project/Template Framework Project.xcodeproj/project.pbxproj

@@ -65,6 +65,11 @@
                BlueprintName = "TestsProjectTests"
                ReferencedContainer = "container:TestsProject/TestsProject.xcodeproj">
             </BuildableReference>
+            <SkippedTests>
+               <Test
+                  Identifier = "RecognitionTests">
+               </Test>
+            </SkippedTests>
          </TestableReference>
       </Testables>
       <MacroExpansion>

Tesseract-OCR-iOS.xcworkspace/xcshareddata/xcschemes/TestsProject.xcscheme

@@ -40,6 +40,12 @@
  */
 @property (nonatomic, copy) NSString* language;
 
+/**
+ * The path to the tessdata file, if it was specified in a call to initWithLanguage:configDictionary:configFileNames:cachesRelatedDataPath:engineMode: as a cachesRelatedDataPath
+ * Otherwise it's supposed that the tessdata folder is located in the application bundle
+ */
+@property (nonatomic, readonly, copy) NSString *absoluteDataPath;
+
 /**
  *  The recognition mode to use. See `G8OCREngineMode` in G8Constants.h for the
  *  available recognition modes.
@@ -228,6 +234,30 @@
 - (id)initWithLanguage:(NSString*)language
             engineMode:(G8OCREngineMode)engineMode;
 
+/**
+ *  Initialize Tesseract with the provided language and engine mode.
+ *
+ *  @param language             The language to use in recognition. See `language`.
+ *  @param configDictionary     A dictionary of the config variables
+ *  @param configFileNames      An array of file names containing key-value config pairs. All the config
+ *                              variables can be init only and debug time both. Furthermore they could be
+ *                              specified at the same time, in such case tesseract will get variables from
+ *                              every file and dictionary all together. 
+ *                              The files are searched into two folders, which are tessdata/tessconfigs and tessdata/configs
+ *  @param cachesRelatedPath    If the cachesRelatedDataPath is specified, the whole content of the tessdata from the
+ *                              application bundle is copied to the Library/Caches/cachesRelatedDataPath/tessdata
+ *                              and tesseract is initialized with that path.
+ *  @param engineMode           The engine mode to use in recognition. See `engineMode`.
+ *
+ *  @return The initialized Tesseract object, or `nil` if there was an error.
+ */
+
+- (id)initWithLanguage:(NSString *)language
+      configDictionary:(NSDictionary *)configDictionary
+       configFileNames:(NSArray *)configFileNames
+ cachesRelatedDataPath:(NSString *)cachesRelatedDataPath
+            engineMode:(G8OCREngineMode)engineMode NS_DESIGNATED_INITIALIZER;
+
 /**
  *  Set a Tesseract variable. See G8TesseractParameters.h for the available
  *  options.
@@ -237,6 +267,16 @@
  */
 - (void)setVariableValue:(NSString *)value forKey:(NSString *)key;
 
+/**
+ *  Returns a Tesseract variable for the given key. See G8TesseractParameters.h for the available
+ *  options.
+ *
+ *  @param key  The option to get.
+ *
+ *  @return     returns the variable value for the given key, if it's beeb set. nil otherwise.
+ */
+- (NSString*)variableValueForKey:(NSString *)key;
+
 /**
  *  Set Tesseract variables using a dictionary. See G8TesseractParameters.h for 
  *  the available options.