Skip to content

buffer: added Buffer methods to r/w 24 bits integers. #169

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

Closed
wants to merge 1 commit into from
Closed

buffer: added Buffer methods to r/w 24 bits integers. #169

Show file tree
Hide file tree
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
92 changes: 92 additions & 0 deletions lib/buffer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,28 @@ Buffer.prototype.readUInt16BE = function(offset, noAssert) {
};


Buffer.prototype.readUInt24LE = function(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 3, this.length);

return ((this[offset]) |
(this[offset + 1] << 8) |
(this[offset + 2] << 16));
};


Buffer.prototype.readUInt24BE = function(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 3, this.length);

return ((this[offset] << 16) |
(this[offset + 1] << 8) |
this[offset + 2]);
};


Buffer.prototype.readUInt32LE = function(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
Expand Down Expand Up @@ -643,6 +665,28 @@ Buffer.prototype.readInt16BE = function(offset, noAssert) {
};


Buffer.prototype.readInt24LE = function(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 3, this.length);

return (this[offset]) |
(this[offset + 1] << 8) |
(this[offset + 2] << 16);
};


Buffer.prototype.readInt24BE = function(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
checkOffset(offset, 3, this.length);

return (this[offset] << 16) |
(this[offset + 1] << 8) |
(this[offset + 2]);
};


Buffer.prototype.readInt32LE = function(offset, noAssert) {
offset = offset >>> 0;
if (!noAssert)
Expand Down Expand Up @@ -775,6 +819,30 @@ Buffer.prototype.writeUInt16BE = function(value, offset, noAssert) {
};


Buffer.prototype.writeUInt24LE = function(value, offset, noAssert) {
value = +value;
offset = offset >>> 0;
if (!noAssert)
checkInt(this, value, offset, 3, 0xffffff, 0);
this[offset + 2] = (value >>> 16);
this[offset + 1] = (value >>> 8);
this[offset] = value;
return offset + 3;
};


Buffer.prototype.writeUInt24BE = function(value, offset, noAssert) {
value = +value;
offset = offset >>> 0;
if (!noAssert)
checkInt(this, value, offset, 3, 0xffffff, 0);
this[offset] = (value >>> 16);
this[offset + 1] = (value >>> 8);
this[offset + 2] = value;
return offset + 3;
};


Buffer.prototype.writeUInt32LE = function(value, offset, noAssert) {
value = +value;
offset = offset >>> 0;
Expand Down Expand Up @@ -879,6 +947,30 @@ Buffer.prototype.writeInt16BE = function(value, offset, noAssert) {
};


Buffer.prototype.writeInt24LE = function(value, offset, noAssert) {
value = +value;
offset = offset >>> 0;
if (!noAssert)
checkInt(this, value, offset, 3, 0x7fffff, -0x800000);
this[offset] = value;
this[offset + 1] = (value >>> 8);
this[offset + 2] = (value >>> 16);
return offset + 3;
};


Buffer.prototype.writeInt24BE = function(value, offset, noAssert) {
value = +value;
offset = offset >>> 0;
if (!noAssert)
checkInt(this, value, offset, 3, 0x7fffff, -0x800000);
this[offset] = (value >>> 16);
this[offset + 1] = (value >>> 8);
this[offset + 2] = value;
return offset + 3;
};


Buffer.prototype.writeInt32LE = function(value, offset, noAssert) {
value = +value;
offset = offset >>> 0;
Expand Down
64 changes: 64 additions & 0 deletions test/simple/test-writeint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,69 @@ function test16(clazz) {
}


function test24(clazz) {
var buffer = new clazz(6);

buffer.writeInt24BE(0x23, 0);
buffer.writeInt24LE(0x23, 3);
ASSERT.equal(0x00, buffer[0]);
ASSERT.equal(0x00, buffer[1]);
ASSERT.equal(0x23, buffer[2]);
ASSERT.equal(0x23, buffer[3]);
ASSERT.equal(0x00, buffer[4]);
ASSERT.equal(0x00, buffer[5]);

buffer.writeInt24BE(-5, 0);
buffer.writeInt24LE(-5, 3);
ASSERT.equal(0xff, buffer[0]);
ASSERT.equal(0xff, buffer[1]);
ASSERT.equal(0xfb, buffer[2]);
ASSERT.equal(0xfb, buffer[3]);
ASSERT.equal(0xff, buffer[4]);
ASSERT.equal(0xff, buffer[5]);

buffer.writeInt24BE(-0x6fffff, 0);
buffer.writeInt24LE(-0x6fffff, 3);
ASSERT.equal(0x90, buffer[0]);
ASSERT.equal(0x00, buffer[1]);
ASSERT.equal(0x01, buffer[2]);
ASSERT.equal(0x01, buffer[3]);
ASSERT.equal(0x00, buffer[4]);
ASSERT.equal(0x90, buffer[5]);

/* Make sure we handle min/max correctly */
buffer.writeInt24BE(0x7fffff, 0);
buffer.writeInt24BE(-0x800000, 3);
ASSERT.equal(0x7f, buffer[0]);
ASSERT.equal(0xff, buffer[1]);
ASSERT.equal(0xff, buffer[2]);
ASSERT.equal(0x80, buffer[3]);
ASSERT.equal(0x00, buffer[4]);
ASSERT.equal(0x00, buffer[5]);
ASSERT.throws(function() {
buffer.writeInt24BE(0x7fffff + 1, 0);
});
ASSERT.throws(function() {
buffer.writeInt24BE(-0x800000 - 1, 0);
});

buffer.writeInt24LE(0x7fffff, 0);
buffer.writeInt24LE(-0x800000, 3);
ASSERT.equal(0xff, buffer[0]);
ASSERT.equal(0xff, buffer[1]);
ASSERT.equal(0x7f, buffer[2]);
ASSERT.equal(0x00, buffer[3]);
ASSERT.equal(0x00, buffer[4]);
ASSERT.equal(0x80, buffer[5]);
ASSERT.throws(function() {
buffer.writeInt24LE(0x7fffff + 1, 0);
});
ASSERT.throws(function() {
buffer.writeInt24LE(-0x800000 - 1, 0);
});
}


function test32(clazz) {
var buffer = new clazz(8);

Expand Down Expand Up @@ -185,4 +248,5 @@ function test32(clazz) {

test8(Buffer);
test16(Buffer);
test24(Buffer);
test32(Buffer);
37 changes: 37 additions & 0 deletions test/simple/test-writeuint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,42 @@ function test16(clazz) {
}


function test24(clazz) {
var data = new clazz(6);
var value = 0xf90a6d;

data.writeUInt24BE(value, 0);
ASSERT.equal(0xf9, data[0]);
ASSERT.equal(0x0a, data[1]);
ASSERT.equal(0x6d, data[2]);

data.writeUInt24BE(value, 1);
ASSERT.equal(0xf9, data[1]);
ASSERT.equal(0x0a, data[2]);
ASSERT.equal(0x6d, data[3]);

data.writeUInt24BE(value, 2);
ASSERT.equal(0xf9, data[2]);
ASSERT.equal(0x0a, data[3]);
ASSERT.equal(0x6d, data[4]);

data.writeUInt24LE(value, 0);
ASSERT.equal(0xf9, data[2]);
ASSERT.equal(0x0a, data[1]);
ASSERT.equal(0x6d, data[0]);

data.writeUInt24LE(value, 1);
ASSERT.equal(0xf9, data[3]);
ASSERT.equal(0x0a, data[2]);
ASSERT.equal(0x6d, data[1]);

data.writeUInt24LE(value, 2);
ASSERT.equal(0xf9, data[4]);
ASSERT.equal(0x0a, data[3]);
ASSERT.equal(0x6d, data[2]);
}


function test32(clazz) {
var data = new clazz(6);
var value = 0xe7f90a6d;
Expand Down Expand Up @@ -144,4 +180,5 @@ function test32(clazz) {

test8(Buffer);
test16(Buffer);
test24(Buffer);
test32(Buffer);