1
0
Fork 0
mirror of https://github.com/mozilla/pdf.js.git synced 2025-04-26 01:58:06 +02:00

Merge remote-tracking branch 'mozilla/master' into mergexref-1

Conflicts:
	src/core.js
	src/evaluator.js
	src/obj.js
This commit is contained in:
Yury Delendik 2012-04-05 10:03:49 -05:00
commit cea388201d
18 changed files with 1581 additions and 1589 deletions

View file

@ -112,8 +112,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
};
PartialEvaluator.prototype = {
getOperatorList: function partialEvaluatorGetOperatorList(stream, resources,
dependency, queue) {
getOperatorList: function PartialEvaluator_getOperatorList(stream,
resources,
dependency,
queue) {
var self = this;
var xref = this.xref;
@ -518,8 +520,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
properties.hasEncoding = hasEncoding;
},
readToUnicode:
function partialEvaluatorReadToUnicode(toUnicode, xref) {
readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref) {
var cmapObj = toUnicode;
var charToUnicode = [];
if (isName(cmapObj)) {
@ -638,8 +639,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
}
return charToUnicode;
},
readCidToGidMap:
function partialEvaluatorReadCidToGidMap(cidToGidStream) {
readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
// Extract the encoding from the CIDToGIDMap
var glyphsData = cidToGidStream.getBytes();
@ -656,7 +656,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return result;
},
extractWidths: function partialEvaluatorWidths(dict,
extractWidths: function PartialEvaluator_extractWidths(dict,
xref,
descriptor,
properties) {
@ -708,7 +708,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
properties.widths = glyphsWidths;
},
getBaseFontMetrics: function getBaseFontMetrics(name) {
getBaseFontMetrics: function PartialEvaluator_getBaseFontMetrics(name) {
var defaultWidth = 0, widths = [];
var glyphWidths = Metrics[stdFontMap[name] || name];
if (isNum(glyphWidths)) {
@ -723,8 +723,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
};
},
translateFont: function partialEvaluatorTranslateFont(dict, xref, resources,
dependency) {
translateFont: function PartialEvaluator_translateFont(dict,
xref,
resources,
dependency) {
var baseDict = dict;
var type = dict.get('Subtype');
assertWellFormed(isName(type), 'invalid font Subtype');