Skip to content

add support for overriding 'isEncapsulated()' #60

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

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

add support for overriding 'isEncapsulated()' #60

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
5 changes: 3 additions & 2 deletions src/byteStream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var dicomParser = (function (dicomParser)
* @throws will throw an error if the byteArray parameter is not present or invalid
* @throws will throw an error if the position parameter is not inside the byte array
*/
dicomParser.ByteStream = function(byteArrayParser, byteArray, position) {
dicomParser.ByteStream = function(byteArrayParser, byteArray, position, transferSyntax) {
if(byteArrayParser === undefined)
{
throw "dicomParser.ByteStream: missing required parameter 'byteArrayParser'";
Expand All @@ -52,6 +52,7 @@ var dicomParser = (function (dicomParser)
this.byteArray = byteArray;
this.position = position ? position : 0;
this.warnings = []; // array of string warnings encountered while parsing
this.transferSyntax = transferSyntax;
};

/**
Expand Down Expand Up @@ -130,4 +131,4 @@ var dicomParser = (function (dicomParser)
};

return dicomParser;
}(dicomParser));
}(dicomParser));
11 changes: 6 additions & 5 deletions src/parseDicom.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var dicomParser = (function(dicomParser) {
// if an infalter callback is registered, use it
if (options && options.inflater) {
var fullByteArrayCallback = options.inflater(byteArray, position);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, fullByteArrayCallback, 0);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, fullByteArrayCallback, 0, transferSyntax);
}
// if running on node, use the zlib library to inflate
// http://stackoverflow.com/questions/4224606/how-to-check-whether-a-script-is-running-under-node-js
Expand All @@ -59,7 +59,7 @@ var dicomParser = (function(dicomParser) {
var fullByteArrayBuffer = dicomParser.alloc(byteArray, inflatedBuffer.length + position);
byteArray.copy(fullByteArrayBuffer, 0, 0, position);
inflatedBuffer.copy(fullByteArrayBuffer, position);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, fullByteArrayBuffer, 0);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, fullByteArrayBuffer, 0, transferSyntax);
}
// if pako is defined - use it. This is the web browser path
// https://github.com/nodeca/pako
Expand All @@ -72,7 +72,7 @@ var dicomParser = (function(dicomParser) {
var fullByteArray = dicomParser.alloc(byteArray, inflated.length + position);
fullByteArray.set(byteArray.slice(0, position), 0);
fullByteArray.set(inflated, position);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, fullByteArray, 0);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, fullByteArray, 0, transferSyntax);
}
// throw exception since no inflater is available
else {
Expand All @@ -81,13 +81,13 @@ var dicomParser = (function(dicomParser) {
}
if(transferSyntax === '1.2.840.10008.1.2.2') // explicit big endian
{
return new dicomParser.ByteStream(dicomParser.bigEndianByteArrayParser, byteArray, position);
return new dicomParser.ByteStream(dicomParser.bigEndianByteArrayParser, byteArray, position, transferSyntax);
}
else
{
// all other transfer syntaxes are little endian; only the pixel encoding differs
// make a new stream so the metaheader warnings don't come along for the ride
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, byteArray, position);
return new dicomParser.ByteStream(dicomParser.littleEndianByteArrayParser, byteArray, position, transferSyntax);
}
}

Expand Down Expand Up @@ -150,3 +150,4 @@ var dicomParser = (function(dicomParser) {

return dicomParser;
})(dicomParser);

16 changes: 11 additions & 5 deletions src/readDicomElementExplicit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ var dicomParser = (function (dicomParser)
}
}

dicomParser.isEncapsulated = function(element, byteStream) {
return element.length === 4294967295;
};

dicomParser.readDicomElementExplicit = function(byteStream, warnings, untilTag)
{
if(byteStream === undefined)
Expand Down Expand Up @@ -72,12 +76,14 @@ var dicomParser = (function (dicomParser)
}


if(element.length === 4294967295)
{
if(element.tag === 'x7fe00010') {
if(element.tag === 'x7fe00010') {
if(dicomParser.isEncapsulated(element, byteStream)) {
element.hadUndefinedLength = true;
dicomParser.findEndOfEncapsulatedElement(byteStream, element, warnings);
return element;
} else if(element.vr === 'UN') {
}
} else if (element.length === 4294967295) {
if(element.vr === 'UN') {
dicomParser.findAndSetUNElementLength(byteStream, element);
return element;
} else {
Expand All @@ -91,4 +97,4 @@ var dicomParser = (function (dicomParser)
};

return dicomParser;
}(dicomParser));
}(dicomParser));