Samples & PDFix SDK headers update

Author: jozefbaranec

.gitignore

@@ -8,4 +8,5 @@ xcuserdata/
 bin/PDFixSDKSample*
 bin/*.dll
 bin/*.dylib
-bin/output/
+bin/output/
+bin/resources/tessdata

bin/resources/README.md

@@ -0,0 +1,6 @@
+resources required to run samples
+
+/test.pdf - sample PDF to process
+/watermark.png - image used for watermark
+/test.pfx - sample digital signature 
+/tessdata/ - folder for Tesseract OCR data (not present in the repository please copy from Tesserct official web site)

include/Pdfix.h

@@ -69,9 +69,11 @@
 #define kTemplateTagAlternate "tag-alternate"
 #define kTemplateAltText "alt-text"
 #define kTemplateTagAttribute "tag-attribute"
-#define kTemplateLayout "layout"
 #define kTemplateList "list"
 #define kTemplateTable "table"
+#define kTemplateTableLayout "table_layout"
+#define kTemplateCellLayout "cell_layout"
+#define kTemplateRectLayout "rect_layout"
 #define kTemplateTextLine "text-line"
 #define kTemplateReflow "reflow"
 #define kTemplateCreateTextBlock "create-text-block"
@@ -339,6 +341,7 @@ enum {
   kErrorDocTemplateInvalidValue = 114,
   kErrorPdsStructTreeInvalid = 115,
   kErrorPsRegexIndexOutOfBounds = 116,
+  kErrorInit = 117,
 } ;
 
 typedef enum {

src/AddComment.hpp

@@ -21,10 +21,10 @@ Example how to add a text annotation with a reply.
 
   // Adds a new text annotation.
 void AddComment(
-  std::wstring email,                    // authorization email   
-  std::wstring license_key,              // authorization license key
-  std::wstring open_file,                // source PDF document
-  std::wstring save_file                 // directory where to save PDF docuemnt
+  const std::wstring& email,                    // authorization email   
+  const std::wstring& license_key,              // authorization license key
+  const std::wstring& open_file,                // source PDF document
+  const std::wstring& save_file                 // directory where to save PDF docuemnt
 ) {
   // initialize Pdfix
   if (!Pdfix_init(Pdfix_MODULE_NAME))

src/AddWatermark.hpp

@@ -21,12 +21,12 @@
 
   // Adds watermark from img_path and saves the document to save_path.
 void AddWatermark(
-  std::wstring email,                        // authorization email   
-  std::wstring license_key,                  // authorization license key
-  std::wstring open_path,                    // source PDF document
-  std::wstring save_path,                    // path to save PDF docuemnt
-  std::wstring img_path,                     // watermark to apply
-  PdfWatermarkParams watermark_params        // watermark parameters
+  const std::wstring& email,                        // authorization email   
+  const std::wstring& license_key,                  // authorization license key
+  const std::wstring& open_path,                    // source PDF document
+  const std::wstring& save_path,                    // path to save PDF docuemnt
+  const std::wstring& img_path,                     // watermark to apply
+  PdfWatermarkParams& watermark_params              // watermark parameters
 ) {
   // initialize Pdfix
   if (!Pdfix_init(Pdfix_MODULE_NAME))
@@ -50,12 +50,12 @@ void AddWatermark(
   watermark_params.opacity = 0.5;
   watermark_params.order_top = true;
 
-
   if (!doc->AddWatermarkFromImage(&watermark_params, img_path.c_str()))
     throw std::runtime_error(pdfix->GetError());
-  doc->Save(save_path.c_str(), kSaveFull);
-  doc->Close();
+  if (!doc->Save(save_path.c_str(), kSaveFull))
+    throw std::runtime_error(pdfix->GetError());
 
+  doc->Close();
   pdfix->Destroy();
 }
 

src/CertDigitalSignature.hpp

@@ -39,11 +39,11 @@ static BOOL CALLBACK  CertFilterCallback(PCCERT_CONTEXT pCertContext,
 
 // Applies digital signature.
 void CertDigitalSignature(
-  std::wstring email,                           // authorization email   
-  std::wstring license_key,                     // authorization license key
-  std::wstring open_path,                       // source PDF document
-  std::wstring save_path,                       // signed PDF document
-  std::wstring time_stamp_server                // time stamp server
+  const std::wstring& email,                           // authorization email   
+  const std::wstring& license_key,                     // authorization license key
+  const std::wstring& open_path,                       // source PDF document
+  const std::wstring& save_path,                       // signed PDF document
+  const std::wstring& time_stamp_server                // time stamp server
 ) {
 #ifdef WIN32 
   HCERTSTORE cert_store = NULL;

src/ConvertToHtml.hpp

@@ -24,12 +24,12 @@ PdfToHtml_statics;
 
 // Converts PDF to HTML.
 void ConvertToHtml(
-  std::wstring email,          // authorization email   
-  std::wstring license_key,    // authorization license key
-  std::wstring open_path,      // source PDF document
-  std::wstring save_path,      // output HTML file
-  std::wstring config_path,    // configuration file
-  PdfHtmlParams html_params    // conversion parameters
+  const std::wstring& email,          // authorization email   
+  const std::wstring& license_key,    // authorization license key
+  const std::wstring& open_path,      // source PDF document
+  const std::wstring& save_path,      // output HTML file
+  const std::wstring& config_path,    // configuration file
+  PdfHtmlParams& html_params    // conversion parameters
 ) {
   // initialize Pdfix
   if (!Pdfix_init(Pdfix_MODULE_NAME))
@@ -46,7 +46,7 @@ void ConvertToHtml(
     throw std::runtime_error("PdfToHtml_init fail");
 
   PdfToHtml* pdf_to_html = GetPdfToHtml();
-  if (!pdfix)
+  if (!pdf_to_html)
     throw std::runtime_error("GetPdfToHtml fail");
 
   std::cout << "PDFix PDF to HTML " << pdf_to_html->GetVersionMajor() << "." <<

src/DigitalSignature.hpp

@@ -21,12 +21,12 @@ Example how to add a text annotation with a reply.
 
 // Example how to apply a digital signature from the PFX file.
 void DigitalSignature(
-  std::wstring email,                   // authorization email   
-  std::wstring license_key,             // authorization license key
-  std::wstring open_path,               // source PDF document
-  std::wstring save_path,               // signed PDF document
-  std::wstring pfx_path,                // pfx file
-  std::wstring pfx_password             // pfx password
+  const std::wstring& email,                   // authorization email   
+  const std::wstring& license_key,             // authorization license key
+  const std::wstring& open_path,               // source PDF document
+  const std::wstring& save_path,               // signed PDF document
+  const std::wstring& pfx_path,                // pfx file
+  const std::wstring& pfx_password             // pfx password
 ) {
   // initialize Pdfix
   if (!Pdfix_init(Pdfix_MODULE_NAME))

src/DocumentMetadata.hpp

@@ -21,11 +21,11 @@ Example how to get or set document metadata.
 
 // Gets/sets document metadata.
 void DocumentMetadata(
-  std::wstring email,                           // authorization email   
-  std::wstring license_key,                     // authorization license key
-  std::wstring open_path,                       // source PDF document
-  std::wstring save_path,                       // output PDF doucment
-  std::wstring xml_path                         // metadata file path
+  const std::wstring& email,                           // authorization email   
+  const std::wstring& license_key,                     // authorization license key
+  const std::wstring& open_path,                       // source PDF document
+  const std::wstring& save_path,                       // output PDF doucment
+  const std::wstring& xml_path                         // metadata file path
 ) {
   // initialize Pdfix
   if (!Pdfix_init(Pdfix_MODULE_NAME))

src/EmbedFonts.hpp

@@ -21,10 +21,10 @@ Example how to Embed Fonts.
 
   // Gets/sets document metadata.
 void EmbedFonts(
-  std::wstring email,                 // authorization email   
-  std::wstring license_key,           // authorization license key
-  std::wstring open_path,             // source PDF document
-  std::wstring save_path              // output PDF doucment
+  const std::wstring& email,                 // authorization email   
+  const std::wstring& license_key,           // authorization license key
+  const std::wstring& open_path,             // source PDF document
+  const std::wstring& save_path              // output PDF doucment
 ) {
   // initialize Pdfix
   if (!Pdfix_init(Pdfix_MODULE_NAME))