Merge branch 'master' into feature/refactor

w3nl · Dec 23, 2020 · c5543d8 · c5543d8
2 parents 2d27d00 + b8e41ff
commit c5543d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,7 @@
+0.7.3 2020-12-23
+=====
+* Made it possible to add density and width and height
+
 0.8.0 2020-12-18
 =====
 * Refactor so the code is more testable and readable

diff --git a/js/pdf2image.js b/js/pdf2image.js
@@ -322,12 +322,13 @@ function processOptions(receivedOptions) {
 
     if (receivedOptions.density) {
         options.density = positiveIntOrDefault(receivedOptions.density, 96);
-    } else if (receivedOptions.width || receivedOptions.height) {
-        options.width = positiveIntOrDefault(receivedOptions.width, '');
-        options.height = positiveIntOrDefault(receivedOptions.height, '');
     } else {
         options.density = 96;
     }
+    if (receivedOptions.width || receivedOptions.height) {
+        options.width = positiveIntOrDefault(receivedOptions.width, '');
+        options.height = positiveIntOrDefault(receivedOptions.height, '');
+    }
 
     // Its a jpg file
     if (options.outputType == '.jpg') {
@@ -480,7 +481,8 @@ function createPagePromise(pageNum, pageIndex, totalPagesProcessed, totalPDFPage
 
         if (options.density) {
             convertOptions.push('-density ' + options.density);
-        } else {
+        }
+        if (options.width) {
             convertOptions.push('-resize ' + options.width + (options.height ? 'X' + options.height : ''));
         }
         if (options.quality) {

diff --git a/package-lock.json b/package-lock.json