Simplified small pieces of TypeScript and JavaScript code.

pull/39/merge
Project Nayuki 6 years ago
parent 0b89eef361
commit 0a96eec52e

@ -329,10 +329,7 @@ var qrcodegen = new function() {
var ecc = rs.getRemainder(dat); var ecc = rs.getRemainder(dat);
if (i < numShortBlocks) if (i < numShortBlocks)
dat.push(0); dat.push(0);
ecc.forEach(function(b) { blocks.push(dat.concat(ecc));
dat.push(b);
});
blocks.push(dat);
} }
// Interleave (not concatenate) the bytes from every block into a single sequence // Interleave (not concatenate) the bytes from every block into a single sequence

@ -399,9 +399,7 @@ namespace qrcodegen {
let ecc: Array<byte> = rs.getRemainder(dat); let ecc: Array<byte> = rs.getRemainder(dat);
if (i < numShortBlocks) if (i < numShortBlocks)
dat.push(0); dat.push(0);
ecc.forEach( blocks.push(dat.concat(ecc));
(b: byte) => dat.push(b));
blocks.push(dat);
} }
// Interleave (not concatenate) the bytes from every block into a single sequence // Interleave (not concatenate) the bytes from every block into a single sequence
@ -770,8 +768,7 @@ namespace qrcodegen {
// the given version. The result is infinity if a segment has too many characters to fit its length field. // the given version. The result is infinity if a segment has too many characters to fit its length field.
public static getTotalBits(segs: Array<QrSegment>, version: int): number { public static getTotalBits(segs: Array<QrSegment>, version: int): number {
let result: number = 0; let result: number = 0;
for (let i = 0; i < segs.length; i++) { for (let seg of segs) {
let seg: QrSegment = segs[i];
let ccbits: int = seg.mode.numCharCountBits(version); let ccbits: int = seg.mode.numCharCountBits(version);
if (seg.numChars >= (1 << ccbits)) if (seg.numChars >= (1 << ccbits))
return Infinity; // The segment's length doesn't fit the field's bit width return Infinity; // The segment's length doesn't fit the field's bit width

Loading…
Cancel
Save