Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove a remaining old-style preprocessor from src/core/fonts.js (PR 7322 follow-up)

Browse Source 
Note that this code was added *after* PR 7322 was opened, which thus explains why it was missed during rebasing.
This commit is contained in:
Jonas Jenwald 2016-10-15 11:33:09 +02:00
parent c1a34ffbcd
commit 1da59bec9b
1 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
src/core/fonts.js
View File

@ -505,73 +505,74 @@ var ProblematicCharRanges = new Int32Array([
0xFFF0, 0x10000 0xFFF0, 0x10000
]); ]);
//#if !PRODUCTION if (typeof PDFJSDev === 'undefined' || !PDFJSDev.test('PRODUCTION')) {
/** /**
* Used to validate the entries in `ProblematicCharRanges`, and to ensure that * Used to validate the entries in `ProblematicCharRanges`, and to ensure that
* its total number of characters does not exceed the PUA (Private Use Area) * its total number of characters does not exceed the PUA (Private Use Area)
* length. * length.
* @returns {Object} An object with {number} `numChars`, {number} `puaLength`, * @returns {Object} An object with {number} `numChars`, {number} `puaLength`,
* and {number} `percentage` parameters. * and {number} `percentage` parameters.
*/ */
function checkProblematicCharRanges() { var checkProblematicCharRanges = function checkProblematicCharRanges() {
function printRange(limits) { function printRange(limits) {
return '[' + limits.lower.toString('16').toUpperCase() + ', ' + return '[' + limits.lower.toString('16').toUpperCase() + ', ' +
limits.upper.toString('16').toUpperCase() + ')'; limits.upper.toString('16').toUpperCase() + ')';
} }
var numRanges = ProblematicCharRanges.length; var numRanges = ProblematicCharRanges.length;
if (numRanges % 2 !== 0) { if (numRanges % 2 !== 0) {
throw new Error('Char ranges must contain an even number of elements.'); throw new Error('Char ranges must contain an even number of elements.');
}
var previousLimits, numChars = 0;
for (var i = 0; i < numRanges; i += 2) {
var limits = {
lower: ProblematicCharRanges[i],
upper: ProblematicCharRanges[i + 1],
};
if (!isInt(limits.lower) || !isInt(limits.upper)) {
throw new Error('Range endpoints must be integers: ' +
printRange(limits));
} }
if (limits.lower < 0 || limits.upper < 0) { var prevLimits, numChars = 0;
throw new Error('Range endpoints must be non-negative: ' + for (var i = 0; i < numRanges; i += 2) {
printRange(limits)); var limits = {
} lower: ProblematicCharRanges[i],
var range = limits.upper - limits.lower; upper: ProblematicCharRanges[i + 1],
if (range < 1) { };
throw new Error('Range must contain at least one element: ' + if (!isInt(limits.lower) || !isInt(limits.upper)) {
printRange(limits)); throw new Error('Range endpoints must be integers: ' +
} printRange(limits));
if (previousLimits) {
if (limits.lower < previousLimits.lower) {
throw new Error('Ranges must be sorted in ascending order: ' +
printRange(limits) + ', ' + printRange(previousLimits));
} }
if (limits.lower < previousLimits.upper) { if (limits.lower < 0 || limits.upper < 0) {
throw new Error('Ranges must not overlap: ' + throw new Error('Range endpoints must be non-negative: ' +
printRange(limits) + ', ' + printRange(previousLimits)); printRange(limits));
} }
var range = limits.upper - limits.lower;
if (range < 1) {
throw new Error('Range must contain at least one element: ' +
printRange(limits));
}
if (prevLimits) {
if (limits.lower < prevLimits.lower) {
throw new Error('Ranges must be sorted in ascending order: ' +
printRange(limits) + ', ' + printRange(prevLimits));
}
if (limits.lower < prevLimits.upper) {
throw new Error('Ranges must not overlap: ' +
printRange(limits) + ', ' + printRange(prevLimits));
}
}
prevLimits = {
lower: limits.lower,
upper: limits.upper,
};
// The current range is OK.
numChars += range;
} }
previousLimits = { var puaLength = (PRIVATE_USE_OFFSET_END + 1) - PRIVATE_USE_OFFSET_START;
lower: limits.lower, if (numChars > puaLength) {
upper: limits.upper, throw new Error('Total number of chars must not exceed the PUA length.');
}
return {
numChars: numChars,
puaLength: puaLength,
percentage: 100 * (numChars / puaLength),
}; };
// The current range is OK.
numChars += range;
}
var puaLength = (PRIVATE_USE_OFFSET_END + 1) - PRIVATE_USE_OFFSET_START;
if (numChars > puaLength) {
throw new Error('Total number of chars must not exceed the PUA length.');
}
return {
numChars: numChars,
puaLength: puaLength,
percentage: 100 * (numChars / puaLength),
}; };
}
exports.checkProblematicCharRanges = checkProblematicCharRanges; exports.SEAC_ANALYSIS_ENABLED = SEAC_ANALYSIS_ENABLED;
//#endif exports.checkProblematicCharRanges = checkProblematicCharRanges;
}
/** /**
* 'Font' is the class the outside world should use, it encapsulate all the font * 'Font' is the class the outside world should use, it encapsulate all the font
@ -3434,7 +3435,6 @@ var CFFFont = (function CFFFontClosure() {
} }
})(); })();
exports.SEAC_ANALYSIS_ENABLED = SEAC_ANALYSIS_ENABLED;
exports.ErrorFont = ErrorFont; exports.ErrorFont = ErrorFont;
exports.Font = Font; exports.Font = Font;
exports.FontFlags = FontFlags; exports.FontFlags = FontFlags;