pdfjs-dist 2.1.266 → 2.2.228

package/lib/core/document.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2018 Mozilla Foundation
+ * Copyright 2019 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,6 +32,8 @@ var _obj = require("./obj");
 
 var _primitives = require("./primitives");
 
+var _core_utils = require("./core_utils");
+
 var _stream2 = require("./stream");
 
 var _annotation = require("./annotation");
@@ -92,13 +94,15 @@ function () {
     this.pdfFunctionFactory = pdfFunctionFactory;
     this.evaluatorOptions = pdfManager.evaluatorOptions;
     this.resourcesPromise = null;
-    var uniquePrefix = "p".concat(this.pageIndex, "_");
     var idCounters = {
       obj: 0
     };
     this.idFactory = {
       createObjId: function createObjId() {
-        return uniquePrefix + ++idCounters.obj;
+        return "p".concat(pageIndex, "_").concat(++idCounters.obj);
+      },
+      getDocId: function getDocId() {
+        return "g_".concat(pdfManager.docId);
       }
     };
   }
@@ -107,7 +111,7 @@ function () {
     key: "_getInheritableProperty",
     value: function _getInheritableProperty(key) {
       var getArray = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-      var value = (0, _util.getInheritableProperty)({
+      var value = (0, _core_utils.getInheritableProperty)({
         dict: this.pageDict,
         key: key,
         getArray: getArray,
@@ -147,8 +151,8 @@ function () {
           _iteratorError = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion && _iterator.return != null) {
-              _iterator.return();
+            if (!_iteratorNormalCompletion && _iterator["return"] != null) {
+              _iterator["return"]();
             }
           } finally {
             if (_didIteratorError) {
@@ -192,7 +196,6 @@ function () {
       var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
       var resourcesPromise = this.loadResources(['ExtGState', 'ColorSpace', 'Pattern', 'Shading', 'XObject', 'Font']);
       var partialEvaluator = new _evaluator.PartialEvaluator({
-        pdfManager: this.pdfManager,
         xref: this.xref,
         handler: handler,
         pageIndex: this.pageIndex,
@@ -250,8 +253,8 @@ function () {
           _iteratorError2 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-              _iterator2.return();
+            if (!_iteratorNormalCompletion2 && _iterator2["return"] != null) {
+              _iterator2["return"]();
             }
           } finally {
             if (_didIteratorError2) {
@@ -276,8 +279,8 @@ function () {
             _iteratorError3 = err;
           } finally {
             try {
-              if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-                _iterator3.return();
+              if (!_iteratorNormalCompletion3 && _iterator3["return"] != null) {
+                _iterator3["return"]();
               }
             } finally {
               if (_didIteratorError3) {
@@ -310,7 +313,6 @@ function () {
             contentStream = _ref9[0];
 
         var partialEvaluator = new _evaluator.PartialEvaluator({
-          pdfManager: _this3.pdfManager,
           xref: _this3.xref,
           handler: handler,
           pageIndex: _this3.pageIndex,
@@ -455,22 +457,10 @@ exports.Page = Page;
 var FINGERPRINT_FIRST_BYTES = 1024;
 var EMPTY_FINGERPRINT = '\x00\x00\x00\x00\x00\x00\x00' + '\x00\x00\x00\x00\x00\x00\x00\x00\x00';
 
-function find(stream, needle, limit, backwards) {
-  var pos = stream.pos;
-  var end = stream.end;
-
-  if (pos + limit > end) {
-    limit = end - pos;
-  }
-
-  var strBuf = [];
-
-  for (var i = 0; i < limit; ++i) {
-    strBuf.push(String.fromCharCode(stream.getByte()));
-  }
-
-  var str = strBuf.join('');
-  stream.pos = pos;
+function find(stream, needle, limit) {
+  var backwards = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  (0, _util.assert)(limit > 0, 'The "limit" must be a positive integer.');
+  var str = (0, _util.bytesToString)(stream.peekBytes(limit));
   var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
 
   if (index === -1) {
@@ -528,18 +518,32 @@ function () {
           this.xfa = this.acroForm.get('XFA');
           var fields = this.acroForm.get('Fields');
 
-          if ((!fields || !Array.isArray(fields) || fields.length === 0) && !this.xfa) {
+          if ((!Array.isArray(fields) || fields.length === 0) && !this.xfa) {
             this.acroForm = null;
           }
         }
       } catch (ex) {
-        if (ex instanceof _util.MissingDataException) {
+        if (ex instanceof _core_utils.MissingDataException) {
           throw ex;
         }
 
         (0, _util.info)('Cannot fetch AcroForm entry; assuming no AcroForms are present');
         this.acroForm = null;
       }
+
+      try {
+        var collection = this.catalog.catDict.get('Collection');
+
+        if ((0, _primitives.isDict)(collection) && collection.getKeys().length > 0) {
+          this.collection = collection;
+        }
+      } catch (ex) {
+        if (ex instanceof _core_utils.MissingDataException) {
+          throw ex;
+        }
+
+        (0, _util.info)('Cannot fetch Collection dictionary.');
+      }
     }
   }, {
     key: "checkHeader",
@@ -585,7 +589,9 @@ function () {
       var catalog = this.catalog,
           linearization = this.linearization;
       (0, _util.assert)(linearization && linearization.pageFirst === pageIndex);
-      var ref = new _primitives.Ref(linearization.objectNumberFirst, 0);
+
+      var ref = _primitives.Ref.get(linearization.objectNumberFirst, 0);
+
       return this.xref.fetchAsync(ref).then(function (obj) {
         if ((0, _primitives.isDict)(obj, 'Page') || (0, _primitives.isDict)(obj) && !obj.has('Type') && obj.has('Contents')) {
           if (ref && !catalog.pageKidsCountCache.has(ref)) {
@@ -596,7 +602,7 @@ function () {
         }
 
         throw new _util.FormatError('The Linearization dictionary doesn\'t point ' + 'to a valid Page dictionary.');
-      }).catch(function (reason) {
+      })["catch"](function (reason) {
         (0, _util.info)(reason);
         return catalog.getPageDict(pageIndex);
       });
@@ -635,13 +641,13 @@ function () {
     value: function checkFirstPage() {
       var _this6 = this;
 
-      return this.getPage(0).catch(function (reason) {
-        if (reason instanceof _util.XRefEntryException) {
+      return this.getPage(0)["catch"](function (reason) {
+        if (reason instanceof _core_utils.XRefEntryException) {
           _this6._pagePromises.length = 0;
 
           _this6.cleanup();
 
-          throw new _util.XRefParseException();
+          throw new _core_utils.XRefParseException();
         }
       });
     }
@@ -663,7 +669,7 @@ function () {
       try {
         linearization = _parser.Linearization.create(this.stream);
       } catch (err) {
-        if (err instanceof _util.MissingDataException) {
+        if (err instanceof _core_utils.MissingDataException) {
           throw err;
         }
 
@@ -751,14 +757,15 @@ function () {
         PDFFormatVersion: this.pdfFormatVersion,
         IsLinearized: !!this.linearization,
         IsAcroFormPresent: !!this.acroForm,
-        IsXFAPresent: !!this.xfa
+        IsXFAPresent: !!this.xfa,
+        IsCollectionPresent: !!this.collection
       };
       var infoDict;
 
       try {
         infoDict = this.xref.trailer.get('Info');
       } catch (err) {
-        if (err instanceof _util.MissingDataException) {
+        if (err instanceof _core_utils.MissingDataException) {
           throw err;
         }
 
@@ -805,8 +812,8 @@ function () {
           _iteratorError4 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
-              _iterator4.return();
+            if (!_iteratorNormalCompletion4 && _iterator4["return"] != null) {
+              _iterator4["return"]();
             }
           } finally {
             if (_didIteratorError4) {

package/lib/core/encodings.js

@@ -2,7 +2,7 @@
  * @licstart The following is the entire license notice for the
  * Javascript code in this page
  *
- * Copyright 2018 Mozilla Foundation
+ * Copyright 2019 Mozilla Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.