Browse Source

Fix some strict warnings

Vivien Nicolas 14 years ago
parent
commit
76f6398e47
  1. 1
      crypto.js
  2. 14
      fonts.js
  3. 6
      pdf.js
  4. 12
      web/viewer.js

1
crypto.js

@ -569,6 +569,7 @@ var CipherTransformFactory = (function() {
}; };
} }
error('Unknown crypto method'); error('Unknown crypto method');
return null;
} }
constructor.prototype = { constructor.prototype = {

14
fonts.js

@ -66,7 +66,7 @@ var FontMeasure = (function FontMeasure() {
return { return {
setActive: function fonts_setActive(font, size) { setActive: function fonts_setActive(font, size) {
if (current = font) { if (current == font) {
var sizes = current.sizes; var sizes = current.sizes;
if (!(measureCache = sizes[size])) if (!(measureCache = sizes[size]))
measureCache = sizes[size] = Object.create(null); measureCache = sizes[size] = Object.create(null);
@ -856,7 +856,7 @@ var Font = (function Font() {
var language = int16(font.getBytes(2)); var language = int16(font.getBytes(2));
if (format == 4) { if (format == 4) {
return; return cmap.data;
} else if (format == 0) { } else if (format == 0) {
// Characters below 0x20 are controls characters that are hardcoded // Characters below 0x20 are controls characters that are hardcoded
// into the platform so if some characters in the font are assigned // into the platform so if some characters in the font are assigned
@ -927,6 +927,7 @@ var Font = (function Font() {
return cmap.data = createCMapTable(glyphs); return cmap.data = createCMapTable(glyphs);
} }
} }
return cmap.data;
}; };
// Check that required tables are present // Check that required tables are present
@ -2287,7 +2288,7 @@ var Type2CFF = (function() {
id = (id << 8) | bytes[pos++]; id = (id << 8) | bytes[pos++];
charset.push(strings[id]); charset.push(strings[id]);
} }
return charset; break;
case 1: case 1:
while (charset.length <= length) { while (charset.length <= length) {
var first = bytes[pos++]; var first = bytes[pos++];
@ -2296,7 +2297,7 @@ var Type2CFF = (function() {
for (var i = 0; i <= numLeft; ++i) for (var i = 0; i <= numLeft; ++i)
charset.push(strings[first++]); charset.push(strings[first++]);
} }
return charset; break;
case 2: case 2:
while (charset.length <= length) { while (charset.length <= length) {
var first = bytes[pos++]; var first = bytes[pos++];
@ -2306,11 +2307,11 @@ var Type2CFF = (function() {
for (var i = 0; i <= numLeft; ++i) for (var i = 0; i <= numLeft; ++i)
charset.push(strings[first++]); charset.push(strings[first++]);
} }
return charset; break;
default: default:
error('Unknown charset format'); error('Unknown charset format');
} }
return charset;
}, },
getPrivDict: function cff_getprivdict(baseDict, strings) { getPrivDict: function cff_getprivdict(baseDict, strings) {
var dict = {}; var dict = {};
@ -2440,6 +2441,7 @@ var Type2CFF = (function() {
} else { } else {
error('Incorrect byte'); error('Incorrect byte');
} }
return -1;
}; };
function parseFloatOperand() { function parseFloatOperand() {

6
pdf.js

@ -2093,7 +2093,7 @@ var LZWStream = (function() {
var c = this.str.getByte(); var c = this.str.getByte();
if (c == null) { if (c == null) {
this.eof = true; this.eof = true;
return; return null;
} }
cachedData = (cachedData << 8) | c; cachedData = (cachedData << 8) | c;
bitsCached += 8; bitsCached += 8;
@ -5208,7 +5208,7 @@ var Util = (function() {
return 'rgb(' + ri + ',' + gi + ',' + bi + ')'; return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
}; };
constructor.makeCssCmyk = function makecmyk(c, m, y, k) { constructor.makeCssCmyk = function makecmyk(c, m, y, k) {
var c = (new DeviceCmykCS()).getRgb([c, m, y, k]); c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0; var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
return 'rgb(' + ri + ',' + gi + ',' + bi + ')'; return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
}; };
@ -5335,6 +5335,7 @@ var ColorSpace = (function() {
} else { } else {
error('unrecognized color space object: "' + cs + '"'); error('unrecognized color space object: "' + cs + '"');
} }
return null;
}; };
return constructor; return constructor;
@ -5623,6 +5624,7 @@ var Pattern = (function() {
default: default:
error('Unknown type of pattern: ' + typeNum); error('Unknown type of pattern: ' + typeNum);
} }
return null;
}; };
constructor.parseShading = function pattern_shading(shading, matrix, constructor.parseShading = function pattern_shading(shading, matrix,

12
web/viewer.js

@ -417,16 +417,18 @@ window.addEventListener('transitionend', function(evt) {
var pagesCount = PDFView.pages.length; var pagesCount = PDFView.pages.length;
var container = document.getElementById('sidebarView'); var container = document.getElementById('sidebarView');
container._interval = window.setInterval(function() { container._interval = window.setInterval(function interval() {
if (pageIndex >= pagesCount) if (pageIndex >= pagesCount) {
return window.clearInterval(container._interval); window.clearInterval(container._interval);
return;
}
PDFView.thumbnails[pageIndex++].draw(); PDFView.thumbnails[pageIndex++].draw();
}, 500); }, 500);
}, true); }, true);
window.addEventListener('scalechange', function(evt) { window.addEventListener('scalechange', function scalechange(evt) {
var options = document.getElementById('scaleSelect').options; var options = document.getElementById('scaleSelect').options;
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
var option = options[i]; var option = options[i];
@ -434,7 +436,7 @@ window.addEventListener('scalechange', function(evt) {
} }
}, true); }, true);
window.addEventListener('pagechange', function(evt) { window.addEventListener('pagechange', function pagechange(evt) {
var page = evt.detail; var page = evt.detail;
document.location.hash = page; document.location.hash = page;
document.getElementById('pageNumber').value = page; document.getElementById('pageNumber').value = page;

Loading…
Cancel
Save