Merge branch 'fix-ci-conan-core' of github.com:opendocument-app/OpenDocument.droid into fix-ci-conan-core

Author: andiwand

CMakeLists.txt

@@ -5,7 +5,10 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-# make sure "which conan" points to a version of 1.x
+# create virtual environment in project root and "pip install conan==1.*"
+set(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_LIST_DIR}/bin")
+# or make sure "which conan" points to a version of 1.x
+
 # TODO: call FIND_PROGRAM(conan) here manually so the location is cached for later
 # TODO: use proper virtual environment
 

README.md

@@ -11,3 +11,7 @@ Feel free to use it in your own project too, but please don't forget to tell us
      height="80">](https://play.google.com/store/apps/details?id=at.tomtasche.reader)
 
 More information at http://reader.tomtasche.at/ and in the app itself.
+
+## Setup
+
+- `conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan`

app/src/main/java/at/tomtasche/reader/background/PdfLoader.java

@@ -47,6 +47,8 @@ public void loadSync(Options options) {
             File cacheDirectory = AndroidFileCache.getCacheDirectory(cacheFile);
 
             pdf2htmlEX pdfConverter = new pdf2htmlEX(context).setInputPDF(cacheFile);
+            pdfConverter.setProcessOutline(false);
+            pdfConverter.setBackgroundImageFormat(pdf2htmlEX.BackgroundImageFormat.JPG);
             pdfConverter.setDRM(false);
             pdfConverter.setProcessAnnotation(true);
             if (options.password != null) {