Skip to content

Commit 7d43785

Browse files
bamx23bamx23
committed
Merge branch 'master' into default-resolution
2 parents ae7de90 + b902703 commit 7d43785

File tree

26 files changed

+858
-130
lines changed

26 files changed

+858
-130
lines changed

‎.coveralls.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
service_name: travis-ci

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,4 @@ crashlytics-build.properties
7070
### Tesseract and Leptonica ###
7171
leptonica-*
7272
tesseract-*
73+

‎.travis.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,10 @@ xcode_sdk:
44
- iphonesimulator7.0
55
- iphonesimulator8.1
66
xcode_scheme:
7-
- TestsProject
87
- Template Framework Project
8+
- TestsProject
9+
before_install:
10+
sudo pip install PyYAML; sudo pip install cpp-coveralls
11+
after_success:
12+
./scripts/coveralls.rb --extension m --extension mm --exclude-folder include --exclude-folder TestsProject
13+

‎Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://github.com/CocoaPods/Specs.git'
22
workspace 'Tesseract-OCR-iOS'
3-
xcodeproj 'TestsProject/TestsProject.xcodeproj/'
3+
xcodeproj 'TestsProject/TestsProject.xcodeproj/', 'Coverage' => :debug
44

55
target 'TestsProjectTests' do
66

‎Podfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ DEPENDENCIES:
77
SPEC CHECKSUMS:
88
Kiwi: 73e1400209055ee9c8ba78c6012b6b642d0fb9f7
99

10-
COCOAPODS: 0.35.0
10+
COCOAPODS: 0.36.0.beta.1

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
Tesseract OCR iOS [![Build Status](https://travis-ci.org/gali8/Tesseract-OCR-iOS.svg?branch=master)](https://travis-ci.org/gali8/Tesseract-OCR-iOS) ![](https://img.shields.io/cocoapods/v/TesseractOCRiOS.svg) ![](https://img.shields.io/cocoapods/l/TesseractOCRiOS.svg) ![](https://img.shields.io/cocoapods/p/TesseractOCRiOS.svg)
1+
Tesseract OCR iOS
22
=================
3+
[![Build Status](https://travis-ci.org/gali8/Tesseract-OCR-iOS.svg?branch=master)](https://travis-ci.org/gali8/Tesseract-OCR-iOS) [![Coverage Status](https://img.shields.io/coveralls/gali8/Tesseract-OCR-iOS.svg)](https://coveralls.io/r/gali8/Tesseract-OCR-iOS) [![](https://img.shields.io/cocoapods/v/TesseractOCRiOS.svg)](http://cocoapods.org/?q=tesseractocrios) [![](https://img.shields.io/cocoapods/p/TesseractOCRiOS.svg)](http://cocoapods.org/?q=tesseractocrios) [![](https://img.shields.io/cocoapods/l/TesseractOCRiOS.svg)](https://github.com/gali8/Tesseract-OCR-iOS/blob/master/LICENSE.md)
34

45
**Use Tesseract OCR in iOS 7.0+ projects written in either Objective-C or Swift.
56
Easy and fast.**

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

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,9 @@
2020
64DDA74E188FD7D10025590D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6400DDEA180C5DE000443362 /* Main.storyboard */; };
2121
64DDA75B188FD9140025590D /* tessdata in Resources */ = {isa = PBXBuildFile; fileRef = 64DDA75A188FD9140025590D /* tessdata */; };
2222
64E40AB1180C6D4D00C36DDE /* libstdc++.6.0.9.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 64E40AB0180C6D4D00C36DDE /* libstdc++.6.0.9.dylib */; };
23-
73BE4C121A598F86002C15F1 /* TesseractOCR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0A7BE1A59565100D823D4 /* TesseractOCR.framework */; };
24-
73BE4C131A598F86002C15F1 /* TesseractOCR.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 73C0A7BE1A59565100D823D4 /* TesseractOCR.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
23+
73BE4C421A5D83AB002C15F1 /* TesseractOCR.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73BE4C411A5D83AB002C15F1 /* TesseractOCR.framework */; };
2524
/* End PBXBuildFile section */
2625

27-
/* Begin PBXCopyFilesBuildPhase section */
28-
73BE4C141A598F86002C15F1 /* Embed Frameworks */ = {
29-
isa = PBXCopyFilesBuildPhase;
30-
buildActionMask = 2147483647;
31-
dstPath = "";
32-
dstSubfolderSpec = 10;
33-
files = (
34-
73BE4C131A598F86002C15F1 /* TesseractOCR.framework in Embed Frameworks */,
35-
);
36-
name = "Embed Frameworks";
37-
runOnlyForDeploymentPostprocessing = 0;
38-
};
39-
/* End PBXCopyFilesBuildPhase section */
40-
4126
/* Begin PBXFileReference section */
4227
428615B61845F340005D5A2E /* image_sample.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = image_sample.jpg; sourceTree = "<group>"; };
4328
6400DDD5180C5DE000443362 /* Template Framework Project.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Template Framework Project.app"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -57,6 +42,7 @@
5742
6490748F198A5CD500D728CC /* CoreImage.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreImage.framework; path = System/Library/Frameworks/CoreImage.framework; sourceTree = SDKROOT; };
5843
64DDA75A188FD9140025590D /* tessdata */ = {isa = PBXFileReference; lastKnownFileType = folder; path = tessdata; sourceTree = "<group>"; };
5944
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; };
45+
73BE4C411A5D83AB002C15F1 /* TesseractOCR.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TesseractOCR.framework; path = "../build/Debug-iphoneos/TesseractOCR.framework"; sourceTree = "<group>"; };
6046
73C0A7BE1A59565100D823D4 /* TesseractOCR.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TesseractOCR.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6147
/* End PBXFileReference section */
6248

@@ -65,11 +51,11 @@
6551
isa = PBXFrameworksBuildPhase;
6652
buildActionMask = 2147483647;
6753
files = (
54+
73BE4C421A5D83AB002C15F1 /* TesseractOCR.framework in Frameworks */,
6855
64907490198A5CD500D728CC /* CoreImage.framework in Frameworks */,
6956
64E40AB1180C6D4D00C36DDE /* libstdc++.6.0.9.dylib in Frameworks */,
7057
6400DDDB180C5DE000443362 /* CoreGraphics.framework in Frameworks */,
7158
6400DDDD180C5DE000443362 /* UIKit.framework in Frameworks */,
72-
73BE4C121A598F86002C15F1 /* TesseractOCR.framework in Frameworks */,
7359
6400DDD9180C5DE000443362 /* Foundation.framework in Frameworks */,
7460
);
7561
runOnlyForDeploymentPostprocessing = 0;
@@ -97,6 +83,7 @@
9783
6400DDD7180C5DE000443362 /* Frameworks */ = {
9884
isa = PBXGroup;
9985
children = (
86+
73BE4C411A5D83AB002C15F1 /* TesseractOCR.framework */,
10087
73C0A7BE1A59565100D823D4 /* TesseractOCR.framework */,
10188
6490748F198A5CD500D728CC /* CoreImage.framework */,
10289
64E40AB0180C6D4D00C36DDE /* libstdc++.6.0.9.dylib */,
@@ -144,7 +131,6 @@
144131
6400DDD1180C5DE000443362 /* Sources */,
145132
6400DDD2180C5DE000443362 /* Frameworks */,
146133
6400DDD3180C5DE000443362 /* Resources */,
147-
73BE4C141A598F86002C15F1 /* Embed Frameworks */,
148134
);
149135
buildRules = (
150136
);
@@ -316,12 +302,17 @@
316302
"$(inherited)",
317303
"$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
318304
);
305+
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
319306
GCC_PRECOMPILE_PREFIX_HEADER = YES;
320307
GCC_PREFIX_HEADER = "Template Framework Project/Template Framework Project-Prefix.pch";
321308
INFOPLIST_FILE = "Template Framework Project/Template Framework Project-Info.plist";
322309
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
323310
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
324311
ONLY_ACTIVE_ARCH = YES;
312+
OTHER_LDFLAGS = (
313+
"-lstdc++",
314+
"-ObjC",
315+
);
325316
PRODUCT_NAME = "$(TARGET_NAME)";
326317
WRAPPER_EXTENSION = app;
327318
};
@@ -336,12 +327,17 @@
336327
"$(inherited)",
337328
"$(PROJECT_TEMP_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)",
338329
);
330+
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
339331
GCC_PRECOMPILE_PREFIX_HEADER = YES;
340332
GCC_PREFIX_HEADER = "Template Framework Project/Template Framework Project-Prefix.pch";
341333
INFOPLIST_FILE = "Template Framework Project/Template Framework Project-Info.plist";
342334
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
343335
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
344336
ONLY_ACTIVE_ARCH = NO;
337+
OTHER_LDFLAGS = (
338+
"-lstdc++",
339+
"-ObjC",
340+
);
345341
PRODUCT_NAME = "$(TARGET_NAME)";
346342
WRAPPER_EXTENSION = app;
347343
};

‎Tesseract OCR iOS.xcodeproj/project.pbxproj‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,8 @@
581581
COPY_PHASE_STRIP = NO;
582582
GCC_C_LANGUAGE_STANDARD = gnu99;
583583
GCC_DYNAMIC_NO_PIC = NO;
584+
GCC_GENERATE_TEST_COVERAGE_FILES = NO;
585+
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = NO;
584586
GCC_OPTIMIZATION_LEVEL = 0;
585587
GCC_PREPROCESSOR_DEFINITIONS = (
586588
"DEBUG=1",
@@ -662,6 +664,7 @@
662664
"$(inherited)",
663665
"$(PROJECT_DIR)/TesseractOCR/lib",
664666
);
667+
MACH_O_TYPE = staticlib;
665668
MTL_ENABLE_DEBUG_INFO = YES;
666669
PRODUCT_NAME = "$(TARGET_NAME)";
667670
SKIP_INSTALL = YES;
@@ -702,6 +705,7 @@
702705
"$(inherited)",
703706
"$(PROJECT_DIR)/TesseractOCR/lib",
704707
);
708+
MACH_O_TYPE = staticlib;
705709
MTL_ENABLE_DEBUG_INFO = NO;
706710
PRODUCT_NAME = "$(TARGET_NAME)";
707711
SKIP_INSTALL = YES;
@@ -712,13 +716,95 @@
712716
};
713717
name = Release;
714718
};
719+
F4EE1C791A612ADC007BB075 /* Coverage */ = {
720+
isa = XCBuildConfiguration;
721+
buildSettings = {
722+
ALWAYS_SEARCH_USER_PATHS = NO;
723+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
724+
CLANG_CXX_LIBRARY = "compiler-default";
725+
CLANG_ENABLE_OBJC_ARC = YES;
726+
CLANG_WARN_CONSTANT_CONVERSION = YES;
727+
CLANG_WARN_EMPTY_BODY = YES;
728+
CLANG_WARN_ENUM_CONVERSION = YES;
729+
CLANG_WARN_INT_CONVERSION = YES;
730+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
731+
COPY_PHASE_STRIP = NO;
732+
GCC_C_LANGUAGE_STANDARD = gnu99;
733+
GCC_DYNAMIC_NO_PIC = NO;
734+
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
735+
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
736+
GCC_OPTIMIZATION_LEVEL = 0;
737+
GCC_PREPROCESSOR_DEFINITIONS = (
738+
"DEBUG=1",
739+
"$(inherited)",
740+
);
741+
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
742+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
743+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
744+
GCC_WARN_UNUSED_VARIABLE = YES;
745+
INFOPLIST_FILE = "";
746+
IPHONEOS_DEPLOYMENT_TARGET = 5.0;
747+
ONLY_ACTIVE_ARCH = YES;
748+
OTHER_LDFLAGS = (
749+
"-ObjC",
750+
"-lstdc++",
751+
);
752+
SDKROOT = iphoneos;
753+
};
754+
name = Coverage;
755+
};
756+
F4EE1C7A1A612ADC007BB075 /* Coverage */ = {
757+
isa = XCBuildConfiguration;
758+
buildSettings = {
759+
CLANG_CXX_LIBRARY = "libc++";
760+
CLANG_ENABLE_MODULES = YES;
761+
CLANG_WARN_BOOL_CONVERSION = YES;
762+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
763+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
764+
CLANG_WARN_UNREACHABLE_CODE = YES;
765+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
766+
CURRENT_PROJECT_VERSION = 1;
767+
DEFINES_MODULE = YES;
768+
DYLIB_COMPATIBILITY_VERSION = 1;
769+
DYLIB_CURRENT_VERSION = 1;
770+
DYLIB_INSTALL_NAME_BASE = "@rpath";
771+
ENABLE_STRICT_OBJC_MSGSEND = YES;
772+
GCC_PREPROCESSOR_DEFINITIONS = (
773+
"DEBUG=1",
774+
"$(inherited)",
775+
);
776+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
777+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
778+
GCC_WARN_UNDECLARED_SELECTOR = YES;
779+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
780+
GCC_WARN_UNUSED_FUNCTION = YES;
781+
INFOPLIST_FILE = "TesseractOCR/TesseractOCR-Info.plist";
782+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
783+
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
784+
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
785+
LIBRARY_SEARCH_PATHS = (
786+
"$(inherited)",
787+
"$(PROJECT_DIR)/TesseractOCR/lib",
788+
);
789+
MACH_O_TYPE = staticlib;
790+
MTL_ENABLE_DEBUG_INFO = YES;
791+
PRODUCT_NAME = "$(TARGET_NAME)";
792+
SKIP_INSTALL = YES;
793+
TARGETED_DEVICE_FAMILY = "1,2";
794+
VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64";
795+
VERSIONING_SYSTEM = "apple-generic";
796+
VERSION_INFO_PREFIX = "";
797+
};
798+
name = Coverage;
799+
};
715800
/* End XCBuildConfiguration section */
716801

717802
/* Begin XCConfigurationList section */
718803
64F74CC4172FD75F0068E657 /* Build configuration list for PBXProject "Tesseract OCR iOS" */ = {
719804
isa = XCConfigurationList;
720805
buildConfigurations = (
721806
64F74CD5172FD75F0068E657 /* Debug */,
807+
F4EE1C791A612ADC007BB075 /* Coverage */,
722808
64F74CD6172FD75F0068E657 /* Release */,
723809
);
724810
defaultConfigurationIsVisible = 0;
@@ -728,6 +814,7 @@
728814
isa = XCConfigurationList;
729815
buildConfigurations = (
730816
73C0A78F1A592C2B00D823D4 /* Debug */,
817+
F4EE1C7A1A612ADC007BB075 /* Coverage */,
731818
73C0A7901A592C2B00D823D4 /* Release */,
732819
);
733820
defaultConfigurationIsVisible = 0;

‎Tesseract OCR iOS.xcodeproj/xcshareddata/xcschemes/TesseractOCR.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4141
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
4242
shouldUseLaunchSchemeArgsEnv = "YES"
43-
buildConfiguration = "Debug">
43+
buildConfiguration = "Coverage">
4444
<Testables>
4545
<TestableReference
4646
skipped = "NO">

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

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,6 @@
2020
ReferencedContainer = "container:TestsProject/TestsProject.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23-
<BuildActionEntry
24-
buildForTesting = "YES"
25-
buildForRunning = "YES"
26-
buildForProfiling = "YES"
27-
buildForArchiving = "YES"
28-
buildForAnalyzing = "YES">
29-
<BuildableReference
30-
BuildableIdentifier = "primary"
31-
BlueprintIdentifier = "64A0293917307C7E002B12E7"
32-
BuildableName = "TesseractOCRAggregate"
33-
BlueprintName = "TesseractOCRAggregate"
34-
ReferencedContainer = "container:Tesseract OCR iOS.xcodeproj">
35-
</BuildableReference>
36-
</BuildActionEntry>
3723
<BuildActionEntry
3824
buildForTesting = "YES"
3925
buildForRunning = "YES"
@@ -54,7 +40,7 @@
5440
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5541
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
5642
shouldUseLaunchSchemeArgsEnv = "YES"
57-
buildConfiguration = "Debug">
43+
buildConfiguration = "Coverage">
5844
<Testables>
5945
<TestableReference
6046
skipped = "NO">
@@ -82,7 +68,7 @@
8268
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
8369
launchStyle = "0"
8470
useCustomWorkingDirectory = "NO"
85-
buildConfiguration = "Debug"
71+
buildConfiguration = "Coverage"
8672
ignoresPersistentStateOnLaunch = "NO"
8773
debugDocumentVersioning = "YES"
8874
allowLocationSimulation = "YES">

0 commit comments

Comments
 (0)