Commit cb04c03

committed

Arithmetic{Compress,Decompress}.cpp: Simplified code to modify frequency table directly instead of temporary vector.

1 parent 343ea80 commit cb04c03Copy full SHA for cb04c03

File tree

-8

lines changed

-8

lines changed

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,8 @@ int main(int argc, char *argv[]) {`
`36`	`36`
`37`	`37`	`// Read input file once to compute symbol frequencies`
`38`	`38`	`std::ifstream in(inputFile, std::ios::binary);`
`39`		`- std::vector<uint32_t> temp(256, 0);`
`40`		`- temp.push_back(1); // EOF symbol gets a frequency of 1`
`41`		`- SimpleFrequencyTable freqs(temp);`
	`39`	`+ SimpleFrequencyTable freqs(std::vector<uint32_t>(257, 0));`
	`40`	`+ freqs.increment(256); // EOF symbol gets a frequency of 1`
`42`	`41`	`while (true) {`
`43`	`42`	`int b = in.get();`
`44`	`43`	`if (b == EOF)`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,14 @@ int main(int argc, char *argv[]) {`
`38`	`38`	`BitInputStream bin(in);`
`39`	`39`	`try {`
`40`	`40`
`41`		`- std::vector<uint32_t> temp;`
`42`		`- for (int i = 0; i < 256; i++) {`
	`41`	`+ SimpleFrequencyTable freqs(std::vector<uint32_t>(257, 0));`
	`42`	`+ for (uint32_t i = 0; i < 256; i++) {`
`43`	`43`	`uint32_t freq = 0;`
`44`	`44`	`for (int j = 0; j < 32; j++)`
`45`	`45`	`freq = (freq << 1) \| bin.readNoEof(); // Big endian`
`46`		`- temp.push_back(freq);`
	`46`	`+ freqs.set(i, freq);`
`47`	`47`	`}`
`48`		`- temp.push_back(1); // EOF symbol`
`49`		`- SimpleFrequencyTable freqs(temp);`
	`48`	`+ freqs.increment(256); // EOF symbol`
`50`	`49`
`51`	`50`	`ArithmeticDecoder dec(32, bin);`
`52`	`51`	`while (true) {`

Comments

(0)