@abasb75/dicom-parser 0.0.0-test20a → 0.0.0-test21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/types.d.ts +2 -1
  3. package/utils/PaletteColor.js +13 -17
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abasb75/dicom-parser",
3
- "version": "0.0.0-test20a",
3
+ "version": "0.0.0-test21",
4
4
  "description": "a javascript powerfull dicom parser",
5
5
  "main": "index.js",
6
6
  "type": "module",
package/types.d.ts CHANGED
@@ -82,10 +82,11 @@ interface PixelDataDecodeOptions {
82
82
  dataset?: Dataset;
83
83
  }
84
84
  interface PaletteColorDataColor {
85
- data: number[];
85
+ data: Uint8Array[] | Uint16Array[];
86
86
  firstInputValueMapped: number;
87
87
  lutEntries: number;
88
88
  bitsPerEntry: number;
89
+ littleEndian: boolean;
89
90
  }
90
91
  interface PaletteColorData {
91
92
  red: PaletteColorDataColor | undefined;
package/utils/PaletteColor.js CHANGED
@@ -11,10 +11,10 @@ var PaletteColor = /** @class */ (function () {
11
11
  return undefined;
12
12
  }
13
13
  var littleEndian = dataset.littleEndian;
14
- var red = PaletteColor.getData(redPaletteColorLookupTableDescriptor, redPaletteColorLookupTableData, segmentedRedPaletteColorLookupTableData, bitsAllocated, littleEndian);
15
- var green = PaletteColor.getData(greenPaletteColorLookupTableDescriptor, greenPaletteColorLookupTableData, segmentedGreenPaletteColorLookupTableData, bitsAllocated, littleEndian);
16
- var blue = PaletteColor.getData(bluePaletteColorLookupTableDescriptor, bluePaletteColorLookupTableData, segmentedBluePaletteColorLookupTableData, bitsAllocated, littleEndian);
17
- var alpha = PaletteColor.getData(alphaPaletteColorLookupTableDescriptor, alphaPaletteColorLookupTableData, segmentedAlphaPaletteColorLookupTableData, bitsAllocated, littleEndian);
14
+ var red = PaletteColor.getData(redPaletteColorLookupTableDescriptor, redPaletteColorLookupTableData, segmentedRedPaletteColorLookupTableData, littleEndian);
15
+ var green = PaletteColor.getData(greenPaletteColorLookupTableDescriptor, greenPaletteColorLookupTableData, segmentedGreenPaletteColorLookupTableData, littleEndian);
16
+ var blue = PaletteColor.getData(bluePaletteColorLookupTableDescriptor, bluePaletteColorLookupTableData, segmentedBluePaletteColorLookupTableData, littleEndian);
17
+ var alpha = PaletteColor.getData(alphaPaletteColorLookupTableDescriptor, alphaPaletteColorLookupTableData, segmentedAlphaPaletteColorLookupTableData, littleEndian);
18
18
  return {
19
19
  red: red,
20
20
  green: green,
@@ -27,7 +27,7 @@ var PaletteColor = /** @class */ (function () {
27
27
  enumerable: false,
28
28
  configurable: true,
29
29
  writable: true,
30
- value: function (descriptor, paletteData, segmentedPaletteData, bitsAllocated, littleEndian) {
30
+ value: function (descriptor, paletteData, segmentedPaletteData, littleEndian) {
31
31
  var _a;
32
32
  if (!Array.isArray(descriptor)
33
33
  || descriptor.length < 3) {
@@ -42,12 +42,12 @@ var PaletteColor = /** @class */ (function () {
42
42
  }
43
43
  if (paletteData) {
44
44
  tableDataArray = bitsPerEntry === 16
45
- ? PaletteColor.get16Array(paletteData, bitsAllocated, littleEndian)
45
+ ? PaletteColor.get16Array(paletteData, littleEndian)
46
46
  : PaletteColor.get8Array(paletteData);
47
47
  }
48
48
  else if (segmentedPaletteData) {
49
49
  var segmentedTableDataArray = bitsPerEntry === 16
50
- ? PaletteColor.get16Array(segmentedPaletteData, bitsAllocated, littleEndian)
50
+ ? PaletteColor.get16Array(segmentedPaletteData, littleEndian)
51
51
  : PaletteColor.get8Array(segmentedPaletteData);
52
52
  tableDataArray = (_a = PaletteColor.segmentedDataToData(segmentedTableDataArray, lutEntries)) === null || _a === void 0 ? void 0 : _a.tableData;
53
53
  }
@@ -58,7 +58,8 @@ var PaletteColor = /** @class */ (function () {
58
58
  data: tableDataArray,
59
59
  firstInputValueMapped: firstInputValueMapped,
60
60
  lutEntries: lutEntries,
61
- bitsPerEntry: bitsPerEntry
61
+ bitsPerEntry: bitsPerEntry,
62
+ littleEndian: littleEndian,
62
63
  };
63
64
  }
64
65
  });
@@ -66,15 +67,10 @@ var PaletteColor = /** @class */ (function () {
66
67
  enumerable: false,
67
68
  configurable: true,
68
69
  writable: true,
69
- value: function (paletteData, bitsAllocated, littleEndian) {
70
+ value: function (paletteData, littleEndian) {
70
71
  var array = [];
71
72
  for (var i = 0; i < paletteData.byteLength; i += 2) {
72
- if (bitsAllocated === 8) {
73
- array.push(paletteData.getUint16(i, littleEndian) >> 8);
74
- }
75
- else {
76
- array.push(paletteData.getUint16(i, littleEndian));
77
- }
73
+ array.push(paletteData.getUint16(i, littleEndian));
78
74
  }
79
75
  return array;
80
76
  }
@@ -116,7 +112,7 @@ var PaletteColor = /** @class */ (function () {
116
112
  segmentedDataOffset++;
117
113
  tableDataOffset++;
118
114
  }
119
- lastValue = tableData[segmentedDataOffset - 1] & 0xFFFF;
115
+ lastValue = tableData[segmentedDataOffset - 1] & 0xffff;
120
116
  break;
121
117
  case 1:
122
118
  if (typeof lastValue !== "number") {
@@ -128,7 +124,7 @@ var PaletteColor = /** @class */ (function () {
128
124
  tableData[tableDataOffset] = (lastValue + ((newValue - lastValue) / len));
129
125
  tableDataOffset++;
130
126
  }
131
- lastValue = newValue & 0xFFFF;
127
+ lastValue = newValue & 0xffff;
132
128
  break;
133
129
  case 2: // untested
134
130
  if (typeof lastValue !== "number") {