two engines in one app

521hellogithub · Oct 13, 2022 · 1212621 · 1212621
1 parent e3e1e36
commit 1212621
Show file tree

Hide file tree

Showing 7 changed files with 727 additions and 55 deletions.
diff --git a/Builder/all-beta.sh b/Builder/all-beta.sh
@@ -1,25 +1,12 @@
 #!/usr/bin/env bash
 
-
-### Librera Old
-./link_to_mupdf_1.11.sh
+./link_merge.sh
 
 cd ../
 
 ./gradlew clean incVersion
 
-./gradlew assembleOldRelease
-
-
-### Librera Beta
-
-cd Builder
-
-#./link_to_mupdf_master.sh
-./link_to_mupdf_1.20.2.sh
-
-cd ../
-
+./gradlew assembleLibreraRelease
 ./gradlew assembleProRelease
 ./gradlew assembleFdroidRelease
 
@@ -28,14 +15,10 @@ cd ../
 
 cd Builder
 
-rm /home/dev/Dropbox/FREE_PDF_APK/testing/*-arm*
-rm /home/dev/Dropbox/FREE_PDF_APK/testing/*-x86*
 
-rm /home/dev/Nextcloud/LibreraBeta/*-arm*
+rm /home/dev/Dropbox/FREE_PDF_APK/testing/*-x86*
 rm /home/dev/Nextcloud/LibreraBeta/*-x86*
 
 ./remove_all.sh
 ./install_all.sh
-./clear-cache.sh
-
-
+./clear-cache.sh
diff --git a/Builder/jni/libmupdf-1.11.c b/Builder/jni/libmupdf-1.11.c
@@ -289,7 +289,7 @@ Java_org_ebookdroid_droids_mupdf_codec_MuPdfDocument_getMupdfVersion(JNIEnv *env
 
 JNIEXPORT jlong JNICALL
 Java_org_ebookdroid_droids_mupdf_codec_MuPdfDocument_open(JNIEnv *env,
-		jclass clazz, jint storememory, jint format, jstring fname, jstring pwd, jstring jcss, jint isDocCSS) {
+		jclass clazz, jint storememory, jint format, jstring fname, jstring pwd, jstring jcss, jint isDocCSS, jfloat imageScale) {
 	renderdocument_t *doc;
 	jboolean iscopy;
 	jclass cls;
@@ -318,6 +318,8 @@ Java_org_ebookdroid_droids_mupdf_codec_MuPdfDocument_open(JNIEnv *env,
 		goto cleanup;
 	}
 
+	doc->ctx->image_scale = imageScale;
+
 	fz_register_document_handlers(doc->ctx);