From 786c229619c2d661f7d4734186881ec2ccdf31e7 Mon Sep 17 00:00:00 2001 From: Andreas Stefl Date: Fri, 5 Jul 2024 13:01:20 +0200 Subject: [PATCH] Update core to 4.1.0 (#83) --- OpenDocumentReader/CoreWrapper.mm | 2 +- conan/conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenDocumentReader/CoreWrapper.mm b/OpenDocumentReader/CoreWrapper.mm index 651f96d..e1f6679 100644 --- a/OpenDocumentReader/CoreWrapper.mm +++ b/OpenDocumentReader/CoreWrapper.mm @@ -51,7 +51,7 @@ - (bool)translate:(NSString *)inputPath into:(NSString *)outputPath with:(NSStri auto outputPathC = [outputPath cStringUsingEncoding:NSUTF8StringEncoding]; auto outputPathCpp = std::string(outputPathC); - html = odr::OpenDocumentReader::html(inputPathCpp, passwordC, outputPathCpp, config); + html = odr::OpenDocumentReader::html(inputPathCpp, [passwordC]() { return passwordC; }, outputPathCpp, config); NSMutableArray *pageNames = [[NSMutableArray alloc] init]; NSMutableArray *pagePaths = [[NSMutableArray alloc] init]; diff --git a/conan/conanfile.py b/conan/conanfile.py index 762c30d..615849d 100644 --- a/conan/conanfile.py +++ b/conan/conanfile.py @@ -5,7 +5,7 @@ class Pkg(ConanFile): settings = "os", "compiler", "arch", "build_type" options = {"configuration": ["Debug", "Debug Lite", "Release", "Release Lite"]} default_options = {"configuration": "Debug"} - requires = "odrcore/3.0.0" + requires = "odrcore/4.1.0" def generate(self): xcode = XcodeDeps(self)