Skip to content

Commit 2cd7a44

Browse files
TomTascheTomTasche
authored
Merge pull request #28 from TomTasche/development
v1.6
2 parents be9fe79 + 8e009cb commit 2cd7a44

121 files changed

Lines changed: 3571 additions & 2468 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎OpenDocument.core‎

‎OpenDocumentReader.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
1010
21E6C5303C9ED8A9A9317BEC /* Pods_OpenDocumentReader.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EF00F649A86477A6C27F07C0 /* Pods_OpenDocumentReader.framework */; };
11+
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E2064DDF22CFA1BA006441F8 /* iAd.framework */; };
1112
E22EB716226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */; };
1213
E22EB718226B633500053B86 /* Document.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB717226B633500053B86 /* Document.swift */; };
1314
E22EB71A226B65E300053B86 /* DocumentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E22EB719226B65E300053B86 /* DocumentViewController.swift */; };
@@ -159,28 +160,28 @@
159160
isa = PBXContainerItemProxy;
160161
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
161162
proxyType = 1;
162-
remoteGlobalIDString = 0F8A108E2C594911A247D0AC;
163+
remoteGlobalIDString = 8D4E2F0BCFAD4292AE1273E6;
163164
remoteInfo = glog;
164165
};
165166
E26C39322250D976009C484A /* PBXContainerItemProxy */ = {
166167
isa = PBXContainerItemProxy;
167168
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
168169
proxyType = 1;
169-
remoteGlobalIDString = 38511368D2F6490DAC6010ED;
170+
remoteGlobalIDString = 757CD8A4AB3B4664A378839E;
170171
remoteInfo = miniz;
171172
};
172173
E26C39342250D976009C484A /* PBXContainerItemProxy */ = {
173174
isa = PBXContainerItemProxy;
174175
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
175176
proxyType = 1;
176-
remoteGlobalIDString = 9BC43A20109B4428920064F9;
177+
remoteGlobalIDString = 670CFA8E9DBD4C75B0F5E2B4;
177178
remoteInfo = odrlib;
178179
};
179180
E26C39362250D976009C484A /* PBXContainerItemProxy */ = {
180181
isa = PBXContainerItemProxy;
181182
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
182183
proxyType = 1;
183-
remoteGlobalIDString = 02E9C2F28FAF47A7B44B0EB1;
184+
remoteGlobalIDString = 7EB41FC0D1724584A85196BA;
184185
remoteInfo = tinyxml2;
185186
};
186187
E2CDC4BA226A407500E9FCED /* PBXContainerItemProxy */ = {
@@ -215,14 +216,15 @@
215216
isa = PBXContainerItemProxy;
216217
containerPortal = E26C38EA2250D91C009C484A /* odr.xcodeproj */;
217218
proxyType = 1;
218-
remoteGlobalIDString = CBE800DAB4894B91A1AB68A8;
219+
remoteGlobalIDString = E3B45187C92B47DCB57902A1;
219220
remoteInfo = "cryptopp-object";
220221
};
221222
/* End PBXContainerItemProxy section */
222223

223224
/* Begin PBXFileReference section */
224225
97704690541D85438FC2079C /* Pods-OpenDocumentReader.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.release.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.release.xcconfig"; sourceTree = "<group>"; };
225226
B3FCFC99F5757D71C0A3EB11 /* Pods-OpenDocumentReader.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-OpenDocumentReader.debug.xcconfig"; path = "Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader.debug.xcconfig"; sourceTree = "<group>"; };
227+
E2064DDF22CFA1BA006441F8 /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
226228
E22EB6F7226B621200053B86 /* DocumentBrowserTransitioningDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentBrowserTransitioningDelegate.swift; sourceTree = "<group>"; };
227229
E22EB717226B633500053B86 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = "<group>"; };
228230
E22EB719226B65E300053B86 /* DocumentViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DocumentViewController.swift; sourceTree = "<group>"; };
@@ -249,6 +251,7 @@
249251
isa = PBXFrameworksBuildPhase;
250252
buildActionMask = 2147483647;
251253
files = (
254+
E2064DFE22CFA1BA006441F8 /* iAd.framework in Frameworks */,
252255
E23795302274844400BA7238 /* AdSupport.framework in Frameworks */,
253256
E2D920F0226B1C7D0042A774 /* libcryptopp-object.a in Frameworks */,
254257
E2A3EE742259FA3100511BD2 /* libtinyxml2.a in Frameworks */,
@@ -304,6 +307,7 @@
304307
E2BB4B64220EF4F20056176B /* Frameworks */ = {
305308
isa = PBXGroup;
306309
children = (
310+
E2064DDF22CFA1BA006441F8 /* iAd.framework */,
307311
E237952F2274844400BA7238 /* AdSupport.framework */,
308312
E26C39382250DC6E009C484A /* WebKit.framework */,
309313
E26C38EA2250D91C009C484A /* odr.xcodeproj */,
@@ -391,7 +395,7 @@
391395
TargetAttributes = {
392396
E2F7ED4E220B54D600D63515 = {
393397
CreatedOnToolsVersion = 10.1;
394-
LastSwiftMigration = 1010;
398+
LastSwiftMigration = 1020;
395399
};
396400
};
397401
};
@@ -653,26 +657,15 @@
653657
files = (
654658
);
655659
inputFileListPaths = (
656-
);
657-
inputPaths = (
658-
"${SRCROOT}/Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks.sh",
659-
"${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework",
660-
"${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework",
661-
"${BUILT_PRODUCTS_DIR}/ScrollableSegmentedControl/ScrollableSegmentedControl.framework",
662-
"${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework",
660+
"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks-${CONFIGURATION}-input-files.xcfilelist",
663661
);
664662
name = "[CP] Embed Pods Frameworks";
665663
outputFileListPaths = (
666-
);
667-
outputPaths = (
668-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework",
669-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework",
670-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ScrollableSegmentedControl.framework",
671-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework",
664+
"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks-${CONFIGURATION}-output-files.xcfilelist",
672665
);
673666
runOnlyForDeploymentPostprocessing = 0;
674667
shellPath = /bin/sh;
675-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks.sh\"\n";
668+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-OpenDocumentReader/Pods-OpenDocumentReader-frameworks.sh\"\n";
676669
showEnvVarsInLog = 0;
677670
};
678671
/* End PBXShellScriptBuildPhase section */
@@ -877,7 +870,7 @@
877870
PRODUCT_NAME = "$(TARGET_NAME)";
878871
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
879872
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
880-
SWIFT_VERSION = 4.2;
873+
SWIFT_VERSION = 5.0;
881874
TARGETED_DEVICE_FAMILY = "1,2";
882875
};
883876
name = Debug;
@@ -904,7 +897,7 @@
904897
PRODUCT_BUNDLE_IDENTIFIER = at.tomtasche.reader;
905898
PRODUCT_NAME = "$(TARGET_NAME)";
906899
SWIFT_OBJC_BRIDGING_HEADER = OpenDocumentReader/BridgingHeader.h;
907-
SWIFT_VERSION = 4.2;
900+
SWIFT_VERSION = 5.0;
908901
TARGETED_DEVICE_FAMILY = "1,2";
909902
};
910903
name = Release;

‎OpenDocumentReader.xcodeproj/xcshareddata/xcschemes/OpenDocumentReader.xcscheme‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1020"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
18+
BuildableName = "OpenDocumentReader.app"
19+
BlueprintName = "OpenDocumentReader"
20+
ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<MacroExpansion>
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
36+
BuildableName = "OpenDocumentReader.app"
37+
BlueprintName = "OpenDocumentReader"
38+
ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
39+
</BuildableReference>
40+
</MacroExpansion>
41+
<AdditionalOptions>
42+
</AdditionalOptions>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Release"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
59+
BuildableName = "OpenDocumentReader.app"
60+
BlueprintName = "OpenDocumentReader"
61+
ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
<AdditionalOptions>
65+
</AdditionalOptions>
66+
</LaunchAction>
67+
<ProfileAction
68+
buildConfiguration = "Release"
69+
shouldUseLaunchSchemeArgsEnv = "YES"
70+
savedToolIdentifier = ""
71+
useCustomWorkingDirectory = "NO"
72+
debugDocumentVersioning = "YES">
73+
<BuildableProductRunnable
74+
runnableDebuggingMode = "0">
75+
<BuildableReference
76+
BuildableIdentifier = "primary"
77+
BlueprintIdentifier = "E2F7ED4E220B54D600D63515"
78+
BuildableName = "OpenDocumentReader.app"
79+
BlueprintName = "OpenDocumentReader"
80+
ReferencedContainer = "container:OpenDocumentReader.xcodeproj">
81+
</BuildableReference>
82+
</BuildableProductRunnable>
83+
</ProfileAction>
84+
<AnalyzeAction
85+
buildConfiguration = "Debug">
86+
</AnalyzeAction>
87+
<ArchiveAction
88+
buildConfiguration = "Release"
89+
revealArchiveInOrganizer = "YES">
90+
</ArchiveAction>
91+
</Scheme>

‎OpenDocumentReader/CoreWrapper.mm‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
@implementation CoreWrapper
1818
- (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber *)page with:(NSString *)password {
1919
try {
20-
auto translator = odr::TranslationHelper::create();
21-
bool opened = translator->open([inputPath cStringUsingEncoding:NSUTF8StringEncoding]);
20+
auto translator = odr::TranslationHelper();
21+
bool opened = translator.open([inputPath cStringUsingEncoding:NSUTF8StringEncoding]);
2222
if (!opened) {
2323
_errorCode = @(-1);
2424
return false;
2525
}
2626

27-
const odr::FileMeta& meta = translator->getMeta();
27+
const odr::FileMeta& meta = translator.getMeta();
2828

2929
bool decrypted = !meta.encrypted;
3030
if (password != nil) {
31-
decrypted = translator->decrypt([password cStringUsingEncoding:NSUTF8StringEncoding]);
31+
decrypted = translator.decrypt([password cStringUsingEncoding:NSUTF8StringEncoding]);
3232
}
3333

3434
if (!decrypted) {
@@ -52,7 +52,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber
5252
}
5353
_pageNames = pageNames;
5454

55-
translator->translate([outputPath cStringUsingEncoding:NSUTF8StringEncoding], config);
55+
translator.translate([outputPath cStringUsingEncoding:NSUTF8StringEncoding], config);
5656
} catch (...) {
5757
_errorCode = @(-3);
5858
return false;

‎OpenDocumentReader/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<key>CFBundlePackageType</key>
5252
<string>APPL</string>
5353
<key>CFBundleShortVersionString</key>
54-
<string>1.5</string>
54+
<string>1.6</string>
5555
<key>CFBundleVersion</key>
56-
<string>8</string>
56+
<string>9</string>
5757
<key>LSRequiresIPhoneOS</key>
5858
<true/>
5959
<key>UILaunchStoryboardName</key>

0 commit comments

Comments
 (0)