fix: null handeling in getFont encoding

4silvertooth · Feb 16, 2021 · 0ac1000 · 0ac1000
1 parent ef3d3c8
commit 0ac1000
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Doc.cpp b/Doc.cpp
@@ -235,7 +235,7 @@ sciter::value Doc::loadTTFontFromFile(sciter::astring path, HPDF_BOOL embed) {
     return sciter::value::make_string(font_name);
 }
 
-sciter::value Doc::getFont(sciter::astring name, sciter::astring encoding) {
+sciter::value Doc::getFont(sciter::astring name, sciter::value encoding) {
   auto ret = new libharu::Font(pdf, name.c_str(), encoding);
   return sciter::value::wrap_asset(ret);
 }

diff --git a/PDF.h b/PDF.h
@@ -135,7 +135,7 @@ class Doc : public sciter::om::asset<Doc> {
     int setPassword(sciter::astring, sciter::astring);
     sciter::value loadJpegImageFromFile(sciter::astring);
     sciter::value loadPngImageFromFile(sciter::astring);
-    sciter::value getFont(sciter::astring, sciter::astring);
+    sciter::value getFont(sciter::astring, sciter::value);
 
     SOM_PASSPORT_BEGIN(Doc)
     SOM_PASSPORT_FLAGS(SOM_EXTENDABLE_OBJECT)
@@ -191,12 +191,12 @@ class Font : public sciter::om::asset<Image> {
 
   public:
 
-    Font(HPDF_Doc& pdf, const char* name, sciter::astring encoding) {
-      if(!encoding.empty()){
-        font = HPDF_GetFont(pdf, name, encoding.c_str());
+    Font(HPDF_Doc& pdf, const char* name, sciter::value encoding) {
+      if(encoding.is_null()){
+        font = HPDF_GetFont(pdf, name, NULL);
       }
       else {
-        font = HPDF_GetFont(pdf, name, NULL);
+        font = HPDF_GetFont(pdf, name, aux::w2a(encoding.to_string()));
       }
     }
     virtual ~Font() {};

diff --git a/Page.cpp b/Page.cpp
@@ -106,4 +106,5 @@ int Page::drawImage(sciter::value img, sciter::value rect) {
 int Page::circle(HPDF_REAL x, HPDF_REAL y, HPDF_REAL radius) {
     return HPDF_Page_Circle(page, x, y, radius);
 }
+
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     int Page::circle(HPDF_REAL x, HPDF_REAL y, HPDF_REAL radius) {
         return HPDF_Page_Circle(page, x, y, radius);
     }
     }