Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update datablock.js #116

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update datablock.js #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions src/datablock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,37 +48,37 @@ DataBlock.getDataBlocks=function(rawCodewords, version, ecLevel)

// Figure out the number and size of data blocks used by this version and
// error correction level
var ecBlocks = version.getECBlocksForLevel(ecLevel);
let ecBlocks = version.getECBlocksForLevel(ecLevel);

// First count the total number of data blocks
var totalBlocks = 0;
var ecBlockArray = ecBlocks.getECBlocks();
for (var i = 0; i < ecBlockArray.length; i++)
let totalBlocks = 0;
let ecBlockArray = ecBlocks.getECBlocks();
for (let i = 0; i < ecBlockArray.length; i++)
{
totalBlocks += ecBlockArray[i].Count;
}

// Now establish DataBlocks of the appropriate size and number of data codewords
var result = new Array(totalBlocks);
var numResultBlocks = 0;
for (var j = 0; j < ecBlockArray.length; j++)
let result = new Array(totalBlocks);
let numResultBlocks = 0;
for (let j = 0; j < ecBlockArray.length; j++)
{
var ecBlock = ecBlockArray[j];
for (var i = 0; i < ecBlock.Count; i++)
let ecBlock = ecBlockArray[j];
for (let i = 0; i < ecBlock.Count; i++)
{
var numDataCodewords = ecBlock.DataCodewords;
var numBlockCodewords = ecBlocks.ECCodewordsPerBlock + numDataCodewords;
let numDataCodewords = ecBlock.DataCodewords;
let numBlockCodewords = ecBlocks.ECCodewordsPerBlock + numDataCodewords;
result[numResultBlocks++] = new DataBlock(numDataCodewords, new Array(numBlockCodewords));
}
}

// All blocks have the same amount of data, except that the last n
// (where n may be 0) have 1 more byte. Figure out where these start.
var shorterBlocksTotalCodewords = result[0].codewords.length;
var longerBlocksStartAt = result.length - 1;
let shorterBlocksTotalCodewords = result[0].codewords.length;
let longerBlocksStartAt = result.length - 1;
while (longerBlocksStartAt >= 0)
{
var numCodewords = result[longerBlocksStartAt].codewords.length;
let numCodewords = result[longerBlocksStartAt].codewords.length;
if (numCodewords == shorterBlocksTotalCodewords)
{
break;
Expand All @@ -87,29 +87,29 @@ DataBlock.getDataBlocks=function(rawCodewords, version, ecLevel)
}
longerBlocksStartAt++;

var shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks.ECCodewordsPerBlock;
let shorterBlocksNumDataCodewords = shorterBlocksTotalCodewords - ecBlocks.ECCodewordsPerBlock;
// The last elements of result may be 1 element longer;
// first fill out as many elements as all of them have
var rawCodewordsOffset = 0;
for (var i = 0; i < shorterBlocksNumDataCodewords; i++)
let rawCodewordsOffset = 0;
for (let i = 0; i < shorterBlocksNumDataCodewords; i++)
{
for (var j = 0; j < numResultBlocks; j++)
for (let j = 0; j < numResultBlocks; j++)
{
result[j].codewords[i] = rawCodewords[rawCodewordsOffset++];
}
}
// Fill out the last data block in the longer ones
for (var j = longerBlocksStartAt; j < numResultBlocks; j++)
for (let j = longerBlocksStartAt; j < numResultBlocks; j++)
{
result[j].codewords[shorterBlocksNumDataCodewords] = rawCodewords[rawCodewordsOffset++];
}
// Now add in error correction blocks
var max = result[0].codewords.length;
for (var i = shorterBlocksNumDataCodewords; i < max; i++)
let max = result[0].codewords.length;
for (let i = shorterBlocksNumDataCodewords; i < max; i++)
{
for (var j = 0; j < numResultBlocks; j++)
for (let j = 0; j < numResultBlocks; j++)
{
var iOffset = j < longerBlocksStartAt?i:i + 1;
let iOffset = j < longerBlocksStartAt?i:i + 1;
result[j].codewords[iOffset] = rawCodewords[rawCodewordsOffset++];
}
}
Expand Down