Merge branch 'master' into images

modesty · Nov 25, 2021 · 98bbef6 · 98bbef6
2 parents 33c39da + 17ef9da
commit 98bbef6
Show file tree

Hide file tree

Showing 37 changed files with 1,782 additions and 1,602 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,6 @@
 *.out
 node_modules/
 target/
+.idea
+.npmrc
 
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,3 @@
 language: node_js
 node_js:
-  - "4.5.0"
+  - "14.18.0"
diff --git a/base/core/core.js b/base/core/core.js
@@ -170,13 +170,17 @@ var Page = (function PageClosure() {
 
 
         var opList = new OperatorList(handler, self.pageIndex);
-
-        handler.send('StartRenderPage', {
-          transparency: partialEvaluator.hasBlendModes(self.resources),
-          pageIndex: self.pageIndex
-        });
-        partialEvaluator.getOperatorList(contentStream, self.resources, opList);
-        pageListPromise.resolve(opList);
+        try {
+            handler.send('StartRenderPage', {
+            transparency: partialEvaluator.hasBlendModes(self.resources),
+            pageIndex: self.pageIndex
+            });
+            partialEvaluator.getOperatorList(contentStream, self.resources, opList);
+            pageListPromise.resolve(opList);
+        }
+        catch(e) {
+            pageListPromise.reject(e);
+        }
       });
 
       var annotationsPromise = pdfManager.ensure(this, 'annotations');

diff --git a/base/core/crypto.js b/base/core/crypto.js
@@ -553,17 +553,17 @@ var CipherTransformFactory = (function CipherTransformFactoryClosure() {
   function CipherTransformFactory(dict, fileId, password) {
     var filter = dict.get('Filter');
     if (!isName(filter) || filter.name != 'Standard')
-      error('unknown encryption method');
+      error('Error: unknown encryption method');
     this.dict = dict;
     var algorithm = dict.get('V');
     if (!isInt(algorithm) ||
       (algorithm != 1 && algorithm != 2 && algorithm != 4))
-      error('unsupported encryption algorithm');
+      error('Error: unsupported encryption algorithm');
     this.algorithm = algorithm;
     var keyLength = dict.get('Length') || 40;
     if (!isInt(keyLength) ||
       keyLength < 40 || (keyLength % 8) !== 0)
-      error('invalid key length');
+      error('Error: invalid key length');
     // prepare keys
     var ownerPassword = stringToBytes(dict.get('O')).subarray(0, 32);
     var userPassword = stringToBytes(dict.get('U')).subarray(0, 32);

diff --git a/base/core/obj.js b/base/core/obj.js
@@ -1001,6 +1001,7 @@ var XRef = (function XRefClosure() {
           throw e;
         }
         log('(while reading XRef): ' + e);
+        error(e);
       }
 
       if (recoveryMode)

diff --git a/base/core/parser.js b/base/core/parser.js
@@ -534,9 +534,8 @@ var Lexer = (function LexerClosure() {
           str += String.fromCharCode(ch);
         }
       }
-      if (str.length > 128) {
-        error('Warning: name token is longer than allowed by the spec: ' +
-              str.length);
+      if (str.length > 127) {
+        warn('Name token is longer than allowed by the spec: ' + str.length);
       }
       return new Name(str);
     },

diff --git a/base/display/api.js b/base/display/api.js
@@ -412,8 +412,13 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
             return;
           }
           stats.time('Rendering');
-          internalRenderTask.initalizeGraphics(transparency);
-          internalRenderTask.operatorListChanged();
+          try {//MQZ. catch canvas drawing exceptions
+            internalRenderTask.initalizeGraphics(transparency);
+            internalRenderTask.operatorListChanged();
+          }
+          catch(err) {
+            complete(err); 
+          }
         },
         function pageDisplayReadPromiseError(reason) {
           complete(reason);

diff --git a/base/display/canvas.js b/base/display/canvas.js
@@ -1036,7 +1036,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     showText: function CanvasGraphics_showText(glyphs, skipTextSelection) {
       var ctx = this.ctx;
       var current = this.current;
-      var font = current.font;
+      var font = current.font || {};
       var fontSize = current.fontSize;
       var fontSizeScale = current.fontSizeScale;
       var charSpacing = current.charSpacing;
@@ -1095,19 +1095,20 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
         this.processingType3 = null;
       } else {
         ctx.save();
-          var tx = 0;
 
 //MQZ Dec.04.2013 handles leading word spacing
+          var tx = 0;
           if (wordSpacing !== 0) {
-              var firstGlyph = _.find(glyphs, function(g) { return _.isObject(g);});
+              var firstGlyph = glyphs.filter(g => g && ('fontChar' in g || 'unicode' in g))[0];
               if (firstGlyph && (firstGlyph.fontChar === ' ' || firstGlyph.unicode === ' ')) {
-                  if (_.find(glyphs, function(g) { return _.isObject(g) && g.unicode !== ' ';})) {
-                    current.x += wordSpacing * fontSize * textHScale;
-                  }
+                tx = wordSpacing * fontSize * textHScale;
               }
           }
 
+        current.x += tx
         this.applyTextTransforms();
+        current.x -= tx
+        // MQZ-GYJ Apr.20.2017 handles leading word spacing over
 
         var lineWidth = current.lineWidth;
         var a1 = current.textMatrix[0], b1 = current.textMatrix[1];
@@ -1286,7 +1287,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
               }
           }
           else {
-              if (-e >= spaceWidth) {
+            //MQZ-GYJ. Apr.20.2017 split word when spacing is a positive number but very big
+              if (Math.abs(e) >= spaceWidth) {
                   if (vertical) {
                       current.y += spacingLength;
                   } else {
@@ -1533,6 +1535,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
       var depth = this.current.paintFormXObjectDepth;
       do {
         this.restore();
+        this.current.paintFormXObjectDepth--;
         // some pdf don't close all restores inside object
         // closing those for them
       } while (this.current.paintFormXObjectDepth >= depth);
@@ -1616,6 +1619,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     },
 
     endGroup: function CanvasGraphics_endGroup(group) {
+        //MQZ. make sure endGroup is always invoked after beginGroup
+        if (this.groupLevel == 0)
+            this.beginGroup(group);
+
       this.groupLevel--;
       var groupCtx = this.ctx;
       this.ctx = this.groupStack.pop();

diff --git a/base/display/metadata.js b/base/display/metadata.js
@@ -57,7 +57,7 @@ var Metadata = PDFJS.Metadata = (function MetadataClosure() {
       var doc = this.metaDocument;
       var rdf = doc.documentElement;
 
-      if (rdf.nodeName.toLowerCase() !== 'rdf:rdf') { // Wrapped in <xmpmeta>
+      if (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf') { // Wrapped in <xmpmeta>
         rdf = rdf.firstChild;
         while (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf')
           rdf = rdf.nextSibling;

diff --git a/base/shared/annotation.js b/base/shared/annotation.js
@@ -667,7 +667,7 @@ var LinkAnnotation = (function LinkAnnotationClosure() {
 
   // Lets URLs beginning with 'www.' default to using the 'http://' protocol.
   function addDefaultProtocolToUrl(url) {
-    if (url.indexOf('www.') === 0) {
+    if (url && url.indexOf('www.') === 0) {
       return ('http://' + url);
     }
     return url;

diff --git a/base/shared/util.js b/base/shared/util.js
@@ -1244,18 +1244,18 @@ nodeUtil.p2jinfo = info;
 nodeUtil.p2jwarn = warn;
 nodeUtil.p2jerror = error;
 nodeUtil.verbosity = function(verbo) {
-    if (!isNaN(verbo)) {
+    if (isNaN(verbo)) {
+        verbosity = WARNINGS;
+    }
+    else {
         if (verbo <= ERRORS) {
-            verbo = ERRORS;
+            verbosity = ERRORS;
         }
         else if (verbo >= INFOS) {
-            verbo = INFOS;
+            verbosity = INFOS;
         }
-
-        verbosity = verbo;
-    }
-    else {
-        verbosity = ERRORS;
+        else
+            verbosity = verbo;
     }
 };
 nodeUtil.verbosity();

diff --git a/bin/pdf2json b/bin/pdf2json
@@ -1,6 +1,4 @@
 #!/usr/bin/env node
 
-'use strict';
-
-var P2JCMD = require('../lib/p2jcmd');
+const P2JCMD = require('../lib/p2jcmd');
 new P2JCMD().start();
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,6 @@ @@
     *.out
     node_modules/
     target/
+    .idea
+    .npmrc