Merge branch 'development' of github.com:TomTasche/OpenDocument.ios into feature/lite-version

Thomas Taschauer · Thomas Taschauer · commit 91ea343f18e8 · 2020-04-26T10:45:09.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,4 +3,7 @@ cmake_minimum_required(VERSION 3.12.4)
 option (ODR_TEST "" OFF)
 set(ODR_TEST OFF)
 
+option (ODR_INSTALL "" OFF)
+set(ODR_INSTALL OFF)
+
 add_subdirectory(OpenDocument.core)
diff --git a/OpenDocument.core b/OpenDocument.core
@@ -1 +1 @@
-Subproject commit 3ced0b0cb36ed586e21b9f79607d4390229b3f5e
+Subproject commit bed7b74490c9f24ea20574fe204bb60bc1a66983
diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm
@@ -10,12 +10,12 @@
 
 #import "CoreWrapper.h"
 
-#include "odr/OpenDocumentReader.h"
+#include "odr/Reader.h"
 #include "odr/Config.h"
 #include "odr/Meta.h"
 
 @implementation CoreWrapper {
-    odr::OpenDocumentReader translator;
+    odr::Reader translator;
     bool initialized;
 }
 
@@ -31,7 +31,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath at:(NSNumber
                     return false;
                 }
                 
-                const auto meta = translator.getMeta();
+                const auto meta = translator.meta();
                 
                 bool decrypted = !meta.encrypted;
                 if (password != nil) {
