Expose processAnnotation option

Author: ViliusSutkus89

UpcomingReleaseNotes.md

@@ -0,0 +1,3 @@
+Expose processAnnotation option.
+
+It is off by default, but if turned on, allows converting annotations too, along with the original pdf document.

pdf2htmlEX/src/main/cpp/pdf2htmlEX.cc

@@ -75,7 +75,8 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_call_1pdf2htmlEX(JNIEnv *e
                                                                jboolean enableDrm,
                                                                jstring backgroundFormat_,
                                                                jboolean enableEmbedFont,
-                                                               jboolean enableEmbedExternalFont
+                                                               jboolean enableEmbedExternalFont,
+                                                               jboolean processAnnotation
 							       ) {
   CCharGC dataDir(env, dataDir_);
   CCharGC popplerDir(env, popplerDir_);
@@ -96,6 +97,7 @@ Java_com_viliussutkus89_android_pdf2htmlex_pdf2htmlEX_call_1pdf2htmlEX(JNIEnv *e
   converter.setOutputFilename(outputFile.c_str());
   converter.setEmbedFont(enableEmbedFont == JNI_TRUE);
   converter.setEmbedExternalFont(enableEmbedExternalFont == JNI_TRUE);
+  converter.setProcessAnnotation(processAnnotation == JNI_TRUE);
 
   if (!backgroundFormat.isEmpty()) {
     converter.setBackgroundImageFormat(backgroundFormat.c_str());

pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX.java

@@ -51,6 +51,7 @@ public class pdf2htmlEX {
   private boolean p_drm = true;
   private boolean p_embedFont = true;
   private boolean p_embedExternalFont = true;
+  private boolean p_processAnnotation = false;
   private String p_backgroundFormat = "";
 
   boolean p_wasPasswordEntered = false;
@@ -180,6 +181,11 @@ public pdf2htmlEX setEmbedExternalFont(boolean embedExternalFont) {
     return this;
   }
 
+  public pdf2htmlEX setProcessAnnotation(boolean processAnnotation) {
+    this.p_processAnnotation = processAnnotation;
+    return this;
+  }
+
   /**
    * @param backgroundFormat: png (default), jpg or svg
    */
@@ -244,11 +250,12 @@ int convert_MakeTheActualCall(File outputHtml) throws IOException {
         m_poppler_dataDir.getAbsolutePath(), m_pdf2htmlEX_tmpDir.getAbsolutePath(),
         this.p_inputPDF.getAbsolutePath(), outputHtml.getAbsolutePath(),
         this.p_ownerPassword, this.p_userPassword, this.p_outline, this.p_drm,
-        this.p_backgroundFormat, this.p_embedFont, this.p_embedExternalFont
+        this.p_backgroundFormat, this.p_embedFont, this.p_embedExternalFont,
+        this.p_processAnnotation
     );
   }
 
-  private native int call_pdf2htmlEX(String dataDir, String popplerDir, String tmpDir, String inputFile, String outputFile, String ownerPassword, String userPassword, boolean outline, boolean drm, String backgroundFormat, boolean embedFont, boolean embedExternalFont);
+  private native int call_pdf2htmlEX(String dataDir, String popplerDir, String tmpDir, String inputFile, String outputFile, String ownerPassword, String userPassword, boolean outline, boolean drm, String backgroundFormat, boolean embedFont, boolean embedExternalFont, boolean processAnnotation);
 
   // Because Java cannot setenv for the current process
   private static native void set_environment_value(String key, String value);

pdf2htmlEX/src/main/java/com/viliussutkus89/android/pdf2htmlex/pdf2htmlEX_exe.java

@@ -133,6 +133,11 @@ public pdf2htmlEX setEmbedExternalFont(boolean embedExternalFont) {
     return this;
   }
 
+  public pdf2htmlEX setProcessAnnotation(boolean processAnnotation) {
+    this.m_arguments.put("--process-annotation", processAnnotation ? "1" : "0");
+    return this;
+  }
+
   /**
    * @param backgroundFormat: png (default), jpg or svg
    */