|
@@ -28,8 +28,8 @@ factory((root.pdfjsDistBuildPdfCombined = {}));
|
|
// Use strict in our context only - users might not want it
|
|
// Use strict in our context only - users might not want it
|
|
'use strict';
|
|
'use strict';
|
|
|
|
|
|
-var pdfjsVersion = '1.5.341';
|
|
|
|
-var pdfjsBuild = '0da97ad';
|
|
|
|
|
|
+var pdfjsVersion = '1.5.343';
|
|
|
|
+var pdfjsBuild = '9228a04';
|
|
|
|
|
|
var pdfjsFilePath =
|
|
var pdfjsFilePath =
|
|
typeof document !== 'undefined' && document.currentScript ?
|
|
typeof document !== 'undefined' && document.currentScript ?
|
|
@@ -30649,9 +30649,11 @@ exports.TilingPattern = TilingPattern;
|
|
|
|
|
|
var Util = sharedUtil.Util;
|
|
var Util = sharedUtil.Util;
|
|
var assert = sharedUtil.assert;
|
|
var assert = sharedUtil.assert;
|
|
|
|
+var warn = sharedUtil.warn;
|
|
var error = sharedUtil.error;
|
|
var error = sharedUtil.error;
|
|
var isInt = sharedUtil.isInt;
|
|
var isInt = sharedUtil.isInt;
|
|
var isString = sharedUtil.isString;
|
|
var isString = sharedUtil.isString;
|
|
|
|
+var MissingDataException = sharedUtil.MissingDataException;
|
|
var isName = corePrimitives.isName;
|
|
var isName = corePrimitives.isName;
|
|
var isCmd = corePrimitives.isCmd;
|
|
var isCmd = corePrimitives.isCmd;
|
|
var isStream = corePrimitives.isStream;
|
|
var isStream = corePrimitives.isStream;
|
|
@@ -31499,41 +31501,49 @@ var CMapFactory = (function CMapFactoryClosure() {
|
|
var previous;
|
|
var previous;
|
|
var embededUseCMap;
|
|
var embededUseCMap;
|
|
objLoop: while (true) {
|
|
objLoop: while (true) {
|
|
- var obj = lexer.getObj();
|
|
|
|
- if (isEOF(obj)) {
|
|
|
|
- break;
|
|
|
|
- } else if (isName(obj)) {
|
|
|
|
- if (obj.name === 'WMode') {
|
|
|
|
- parseWMode(cMap, lexer);
|
|
|
|
- } else if (obj.name === 'CMapName') {
|
|
|
|
- parseCMapName(cMap, lexer);
|
|
|
|
- }
|
|
|
|
- previous = obj;
|
|
|
|
- } else if (isCmd(obj)) {
|
|
|
|
- switch (obj.cmd) {
|
|
|
|
- case 'endcmap':
|
|
|
|
- break objLoop;
|
|
|
|
- case 'usecmap':
|
|
|
|
- if (isName(previous)) {
|
|
|
|
- embededUseCMap = previous.name;
|
|
|
|
- }
|
|
|
|
- break;
|
|
|
|
- case 'begincodespacerange':
|
|
|
|
- parseCodespaceRange(cMap, lexer);
|
|
|
|
- break;
|
|
|
|
- case 'beginbfchar':
|
|
|
|
- parseBfChar(cMap, lexer);
|
|
|
|
- break;
|
|
|
|
- case 'begincidchar':
|
|
|
|
- parseCidChar(cMap, lexer);
|
|
|
|
- break;
|
|
|
|
- case 'beginbfrange':
|
|
|
|
- parseBfRange(cMap, lexer);
|
|
|
|
- break;
|
|
|
|
- case 'begincidrange':
|
|
|
|
- parseCidRange(cMap, lexer);
|
|
|
|
- break;
|
|
|
|
|
|
+ try {
|
|
|
|
+ var obj = lexer.getObj();
|
|
|
|
+ if (isEOF(obj)) {
|
|
|
|
+ break;
|
|
|
|
+ } else if (isName(obj)) {
|
|
|
|
+ if (obj.name === 'WMode') {
|
|
|
|
+ parseWMode(cMap, lexer);
|
|
|
|
+ } else if (obj.name === 'CMapName') {
|
|
|
|
+ parseCMapName(cMap, lexer);
|
|
|
|
+ }
|
|
|
|
+ previous = obj;
|
|
|
|
+ } else if (isCmd(obj)) {
|
|
|
|
+ switch (obj.cmd) {
|
|
|
|
+ case 'endcmap':
|
|
|
|
+ break objLoop;
|
|
|
|
+ case 'usecmap':
|
|
|
|
+ if (isName(previous)) {
|
|
|
|
+ embededUseCMap = previous.name;
|
|
|
|
+ }
|
|
|
|
+ break;
|
|
|
|
+ case 'begincodespacerange':
|
|
|
|
+ parseCodespaceRange(cMap, lexer);
|
|
|
|
+ break;
|
|
|
|
+ case 'beginbfchar':
|
|
|
|
+ parseBfChar(cMap, lexer);
|
|
|
|
+ break;
|
|
|
|
+ case 'begincidchar':
|
|
|
|
+ parseCidChar(cMap, lexer);
|
|
|
|
+ break;
|
|
|
|
+ case 'beginbfrange':
|
|
|
|
+ parseBfRange(cMap, lexer);
|
|
|
|
+ break;
|
|
|
|
+ case 'begincidrange':
|
|
|
|
+ parseCidRange(cMap, lexer);
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+ } catch (ex) {
|
|
|
|
+ if (ex instanceof MissingDataException) {
|
|
|
|
+ throw ex;
|
|
|
|
+ }
|
|
|
|
+ warn('Invalid cMap data: ' + ex);
|
|
|
|
+ continue;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -31544,9 +31554,8 @@ var CMapFactory = (function CMapFactoryClosure() {
|
|
}
|
|
}
|
|
if (useCMap) {
|
|
if (useCMap) {
|
|
return extendCMap(cMap, builtInCMapParams, useCMap);
|
|
return extendCMap(cMap, builtInCMapParams, useCMap);
|
|
- } else {
|
|
|
|
- return Promise.resolve(cMap);
|
|
|
|
}
|
|
}
|
|
|
|
+ return Promise.resolve(cMap);
|
|
}
|
|
}
|
|
|
|
|
|
function extendCMap(cMap, builtInCMapParams, useCMap) {
|
|
function extendCMap(cMap, builtInCMapParams, useCMap) {
|
|
@@ -31608,8 +31617,6 @@ var CMapFactory = (function CMapFactoryClosure() {
|
|
parseCMap(cMap, lexer, builtInCMapParams, null).then(
|
|
parseCMap(cMap, lexer, builtInCMapParams, null).then(
|
|
function (parsedCMap) {
|
|
function (parsedCMap) {
|
|
resolve(parsedCMap);
|
|
resolve(parsedCMap);
|
|
- }).catch(function (e) {
|
|
|
|
- reject(new Error({ message: 'Invalid CMap data', error: e }));
|
|
|
|
});
|
|
});
|
|
} else {
|
|
} else {
|
|
reject(new Error('Unable to get cMap at: ' + url));
|
|
reject(new Error('Unable to get cMap at: ' + url));
|