0x5eal/rbxts-pako
1
0
Fork 0
mirror of https://github.com/0x5eal/rbxts-pako.git synced 2025-04-06 03:41:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed strings output for inflate (temporary solution)

Browse source
This commit is contained in:
Vitaly Puzrin 2014-04-13 19:17:26 +04:00
parent 1cf47067c2
commit aecf1fa6b1
2 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/inflate.js
View file

@ -214,7 +214,7 @@ Inflate.prototype.push = function(data, mode) {
if (strm.next_out_index) { if (strm.next_out_index) {
if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) { if (strm.avail_out === 0 || status === c.Z_STREAM_END || (strm.avail_in === 0 && _mode === c.Z_FINISH)) {
if (this.to === 'string') { /*if (this.options.to === 'string') {
// realign size to utf8 char border & move tail to start of buffer // realign size to utf8 char border & move tail to start of buffer
next_out_utf8_index = strm.next_out_index - 5; next_out_utf8_index = strm.next_out_index - 5;
@ -243,7 +243,8 @@ Inflate.prototype.push = function(data, mode) {
} else { } else {
this.onData(utils.shrinkBuf(strm.next_out, strm.next_out_index)); this.onData(utils.shrinkBuf(strm.next_out, strm.next_out_index));
} }*/
this.onData(utils.shrinkBuf(strm.next_out, strm.next_out_index));
} }
} }
} while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END); } while ((strm.avail_in > 0 || strm.avail_out === 0) && status !== c.Z_STREAM_END);
@ -292,7 +293,8 @@ Inflate.prototype.onEnd = function(status) {
if (this.options.to === 'string') { if (this.options.to === 'string') {
// Glue & convert here, until we teach pako to send // Glue & convert here, until we teach pako to send
// utf8 alligned strings to onData // utf8 alligned strings to onData
this.result = this.chunks.join(''); //this.result = this.chunks.join('');
this.result = strings.buf2string(utils.flattenChunks(this.chunks));
} else { } else {
this.result = utils.flattenChunks(this.chunks); this.result = utils.flattenChunks(this.chunks);
} }

21
test/strings.js
View file

@ -29,10 +29,10 @@ describe('Deflate strings', function () {
}); });
it('Deflate with binary string output', function () { it('Deflate with binary string output', function () {
assert.ok(cmp( var data = pako.deflate(sampleArray, { to: 'string', chunkSize: 99 });
new Buffer(pako.deflate(sampleArray, { to: 'string', chunkSize: 99 }), 'binary'),
pako.deflate(sampleArray) assert.equal(typeof data, 'string');
)); assert.ok(cmp(new Buffer(data, 'binary'), pako.deflate(sampleArray)));
}); });
}); });
@ -43,17 +43,14 @@ describe('Inflate strings', function () {
var deflatedArray = pako.deflate(sampleArray); var deflatedArray = pako.deflate(sampleArray);
it('Inflate binary string input', function () { it('Inflate binary string input', function () {
assert.ok(cmp( assert.ok(cmp(pako.inflate(deflatedString), pako.inflate(deflatedArray)));
pako.inflate(deflatedString),
pako.inflate(deflatedArray)
));
}); });
it('Inflate with javascript string (utf16) output', function () { it('Inflate with javascript string (utf16) output', function () {
assert.ok( var data = pako.inflate(deflatedArray, { to: 'string', chunkSize: 99 });
pako.inflate(deflatedArray, { to: 'string', chunkSize: 99 }),
sampleString assert.equal(typeof data, 'string');
); assert.equal(data, sampleString);
}); });
}); });