style fixes, we should post some sensible style guide

This commit is contained in:
Andreas Gal 2011-06-20 01:20:05 -04:00
parent b1cd32fc9c
commit 09061a2cc4

28
pdf.js
View File

@ -1385,31 +1385,25 @@ var XRef = (function() {
var length = streamParameters.get("Length"); var length = streamParameters.get("Length");
var byteWidths = streamParameters.get("W"); var byteWidths = streamParameters.get("W");
var range = streamParameters.get("Index"); var range = streamParameters.get("Index");
if (!range) { if (!range)
range = [0, streamParameters.get("Size")]; range = [0, streamParameters.get("Size")];
}
var i, j; var i, j;
while (range.length > 0) { while (range.length > 0) {
var first = range[0], n = range[1]; var first = range[0], n = range[1];
if (!IsInt(first) || !IsInt(n)) { if (!IsInt(first) || !IsInt(n))
error("Invalid XRef range fields"); error("Invalid XRef range fields");
}
var typeFieldWidth = byteWidths[0], offsetFieldWidth = byteWidths[1], generationFieldWidth = byteWidths[2]; var typeFieldWidth = byteWidths[0], offsetFieldWidth = byteWidths[1], generationFieldWidth = byteWidths[2];
if (!IsInt(typeFieldWidth) || !IsInt(offsetFieldWidth) || !IsInt(generationFieldWidth)) { if (!IsInt(typeFieldWidth) || !IsInt(offsetFieldWidth) || !IsInt(generationFieldWidth))
error("Invalid XRef entry fields length"); error("Invalid XRef entry fields length");
}
for (i = 0; i < n; ++i) { for (i = 0; i < n; ++i) {
var type = 0, offset = 0, generation = 0; var type = 0, offset = 0, generation = 0;
for (j = 0; j < typeFieldWidth; ++j) { for (j = 0; j < typeFieldWidth; ++j)
type = (type << 8) | stream.getByte(); type = (type << 8) | stream.getByte();
} for (j = 0; j < offsetFieldWidth; ++j)
for (j = 0; j < offsetFieldWidth; ++j) {
offset = (offset << 8) | stream.getByte(); offset = (offset << 8) | stream.getByte();
} for (j = 0; j < generationFieldWidth; ++j)
for (j = 0; j < generationFieldWidth; ++j) {
generation = (generation << 8) | stream.getByte(); generation = (generation << 8) | stream.getByte();
} var entry = new Ref(offset, generation);
var entry = { offset: offset, gen: generation };
if (typeFieldWidth > 0) { if (typeFieldWidth > 0) {
switch (type) { switch (type) {
case 0: case 0:
@ -1425,16 +1419,14 @@ var XRef = (function() {
break; break;
} }
} }
if (!this.entries[first + i]) { if (!this.entries[first + i])
this.entries[first + i] = entry; this.entries[first + i] = entry;
}
} }
range.splice(0, 2); range.splice(0, 2);
} }
var prev = streamParameters.get("Prev"); var prev = streamParameters.get("Prev");
if (IsInt(prev)) { if (IsInt(prev))
this.readXRef(prev); this.readXRef(prev);
}
return streamParameters; return streamParameters;
}, },
readXRef: function(startXRef) { readXRef: function(startXRef) {
@ -1505,7 +1497,7 @@ var XRef = (function() {
return e; return e;
} }
// compressed entry // compressed entry
stream = this.fetch({num:e.offset, gen:0}); stream = this.fetch(new Ref(e.offset, 0));
if (!IsStream(stream)) if (!IsStream(stream))
error("bad ObjStm stream"); error("bad ObjStm stream");
var first = stream.parameters.get("First"); var first = stream.parameters.get("First");