@cornerstonejs/dicom-image-loader 5.8.1 → 5.10.2

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 (26) hide show
  1. package/dist/esm/imageLoader/createImage.js +4 -2
  2. package/dist/esm/imageLoader/getInstanceModule.js +3 -1
  3. package/dist/esm/imageLoader/internal/options.js +4 -0
  4. package/dist/esm/imageLoader/internal/rangeRequest.js +4 -2
  5. package/dist/esm/imageLoader/internal/streamRequest.js +3 -1
  6. package/dist/esm/imageLoader/wadors/loadImage.js +4 -2
  7. package/dist/esm/imageLoader/wadors/loadImage_test.js +0 -2
  8. package/dist/esm/imageLoader/wadors/metaData/ECGHelpers.js +3 -1
  9. package/dist/esm/imageLoader/wadors/metaData/getSequenceItems.js +3 -1
  10. package/dist/esm/imageLoader/wadors/register.js +3 -2
  11. package/dist/esm/imageLoader/wadouri/dataSetCacheManager.js +3 -1
  12. package/dist/esm/imageLoader/wadouri/dataset-from-partial-content.js +6 -4
  13. package/dist/esm/imageLoader/wadouri/getUncompressedImageFrame.js +3 -1
  14. package/dist/esm/imageLoader/wadouri/loadImage.js +5 -4
  15. package/dist/esm/imageLoader/wadouri/register.js +3 -2
  16. package/dist/esm/shared/decoders/decodeHTJ2K.js +1 -12
  17. package/dist/esm/shared/decoders/decodeJPEG2000.js +1 -12
  18. package/dist/esm/shared/decoders/decodeJPEGBaseline8Bit.js +1 -6
  19. package/dist/esm/shared/decoders/decodeJPEGLS.js +1 -12
  20. package/dist/esm/shared/decoders/getPixelData.d.ts +8 -0
  21. package/dist/esm/shared/decoders/getPixelData.js +17 -0
  22. package/dist/esm/shared/decoders/isSignedPixelData.d.ts +4 -0
  23. package/dist/esm/shared/decoders/isSignedPixelData.js +4 -0
  24. package/dist/esm/version.d.ts +1 -1
  25. package/dist/esm/version.js +1 -1
  26. package/package.json +6 -7
@@ -1,5 +1,6 @@
1
1
  import getMinMax from '../shared/getMinMax.js';
2
2
  import { canRenderFloatTextures, Enums, metaData, utilities, } from '@cornerstonejs/core';
3
+ import { logging } from '@cornerstonejs/metadata';
3
4
  import convertColorSpace from './convertColorSpace.js';
4
5
  import isColorConversionRequired from './isColorConversionRequired.js';
5
6
  import decodeImageFrame from './decodeImageFrame.js';
@@ -11,6 +12,7 @@ import removeAFromRGBA from './removeAFromRGBA.js';
11
12
  import isModalityLUTForDisplay from './isModalityLutForDisplay.js';
12
13
  import setPixelDataType from './setPixelDataType.js';
13
14
  import { fetchPaletteData } from './colorSpaceConverters/fetchPaletteData.js';
15
+ const log = logging.loaderLog.getLogger('createImage');
14
16
  let lastImageIdDrawn = '';
15
17
  async function createImage(imageId, pixelData, transferSyntax, options = {}) {
16
18
  const useRGBA = options.useRGBA;
@@ -54,7 +56,7 @@ async function createImage(imageId, pixelData, transferSyntax, options = {}) {
54
56
  options.preScale.enabled = false;
55
57
  }
56
58
  }
57
- const { decodeConfig, wasmBasePath } = getOptions();
59
+ const { decodeConfig, wasmBasePath = utilities.getWasmBasePath() } = getOptions();
58
60
  const taskDecodeConfig = wasmBasePath === undefined
59
61
  ? decodeConfig
60
62
  : { ...decodeConfig, wasmBasePath };
@@ -184,7 +186,7 @@ async function createImage(imageId, pixelData, transferSyntax, options = {}) {
184
186
  typeof x.length === 'number'
185
187
  ? Array.from(x).slice(0, 10)
186
188
  : null;
187
- console.log('[createImage] PALETTE COLOR before convertColorSpace', {
189
+ log.info('[createImage] PALETTE COLOR before convertColorSpace', {
188
190
  imageId,
189
191
  descriptor: desc,
190
192
  pixelDataLength: len,
@@ -1,4 +1,6 @@
1
1
  import { metaData } from '@cornerstonejs/core';
2
+ import { logging } from '@cornerstonejs/metadata';
3
+ const log = logging.loaderLog.getLogger('getInstanceModule');
2
4
  function getInstanceModule(imageId, metaDataProvider, types) {
3
5
  const result = {};
4
6
  for (const t of types) {
@@ -16,7 +18,7 @@ function getInstanceModule(imageId, metaDataProvider, types) {
16
18
  }
17
19
  }
18
20
  catch (error) {
19
- console.error(`Error retrieving ${t} data:`, error);
21
+ log.error(`Error retrieving ${t} data:`, error);
20
22
  }
21
23
  }
22
24
  return result;
@@ -1,3 +1,4 @@
1
+ import { utilities } from '@cornerstonejs/core';
1
2
  let options = {
2
3
  open(xhr, url) {
3
4
  xhr.open('get', url, true);
@@ -13,6 +14,9 @@ let options = {
13
14
  };
14
15
  export function setOptions(newOptions) {
15
16
  options = Object.assign(options, newOptions);
17
+ if (newOptions.wasmBasePath !== undefined) {
18
+ utilities.setWasmBasePath(newOptions.wasmBasePath);
19
+ }
16
20
  }
17
21
  export function getOptions() {
18
22
  return options;
@@ -1,7 +1,9 @@
1
+ import { logging } from '@cornerstonejs/metadata';
1
2
  import { getOptions } from './options.js';
2
3
  import metaDataManager from '../wadors/metaDataManager.js';
3
4
  import extractMultipart from '../wadors/extractMultipart.js';
4
5
  import { getImageQualityStatus } from '../wadors/getImageQualityStatus.js';
6
+ const log = logging.loaderLog.getLogger('rangeRequest');
5
7
  export default function rangeRequest(url, imageId, defaultHeaders = {}, options = {}) {
6
8
  const globalOptions = getOptions();
7
9
  const { retrieveOptions = {}, streamingData } = options;
@@ -14,7 +16,7 @@ export default function rangeRequest(url, imageId, defaultHeaders = {}, options
14
16
  globalOptions.errorInterceptor(error);
15
17
  }
16
18
  else {
17
- console.warn('rangeRequest:Caught', err);
19
+ log.warn('rangeRequest:Caught', err);
18
20
  }
19
21
  };
20
22
  const promise = new Promise(async (resolve, reject) => {
@@ -48,7 +50,7 @@ export default function rangeRequest(url, imageId, defaultHeaders = {}, options
48
50
  }
49
51
  catch (err) {
50
52
  errorInterceptor(err);
51
- console.error(err);
53
+ log.error(err);
52
54
  reject(err);
53
55
  }
54
56
  });
@@ -1,7 +1,9 @@
1
1
  import { utilities } from '@cornerstonejs/core';
2
+ import { logging } from '@cornerstonejs/metadata';
2
3
  import { getOptions } from './options.js';
3
4
  import extractMultipart from '../wadors/extractMultipart.js';
4
5
  import { getImageQualityStatus } from '../wadors/getImageQualityStatus.js';
6
+ const log = logging.loaderLog.getLogger('streamRequest');
5
7
  const { ProgressiveIterator } = utilities;
6
8
  export default function streamRequest(url, imageId, defaultHeaders = {}, options = {}) {
7
9
  const globalOptions = getOptions();
@@ -73,7 +75,7 @@ export default function streamRequest(url, imageId, defaultHeaders = {}, options
73
75
  }
74
76
  catch (err) {
75
77
  errorInterceptor(err);
76
- console.error(err);
78
+ log.error(err);
77
79
  reject(err);
78
80
  }
79
81
  });
@@ -1,8 +1,10 @@
1
1
  import { Enums, imageRetrievalPoolManager, utilities, } from '@cornerstonejs/core';
2
2
  import { Enums as csCoreEnums } from '@cornerstonejs/core';
3
+ import { logging } from '@cornerstonejs/metadata';
3
4
  import createImage from '../createImage.js';
4
5
  import getPixelData from './getPixelData.js';
5
6
  import { loadImageFromCompressedFrameRegistry } from './loadImageFromRegistry.js';
7
+ const log = logging.loaderLog.getLogger('wadors');
6
8
  const { ProgressiveIterator } = utilities;
7
9
  const { ImageQualityStatus } = Enums;
8
10
  const streamableTransferSyntaxes = new Set([
@@ -61,7 +63,7 @@ function loadImage(imageId, options = {}) {
61
63
  if (registryPromise) {
62
64
  return {
63
65
  promise: registryPromise.catch((error) => {
64
- console.warn(`Failed to decode registry frame data for ${imageId}; falling back to network retrieval`, error);
66
+ log.warn(`Failed to decode registry frame data for ${imageId}; falling back to network retrieval`, error);
65
67
  return loadImageFromNetwork(imageId, options).promise;
66
68
  }),
67
69
  cancelFn: undefined,
@@ -105,7 +107,7 @@ function loadImageFromNetwork(imageId, options = {}) {
105
107
  }
106
108
  catch (e) {
107
109
  if (extractDone) {
108
- console.warn("Couldn't decode", e);
110
+ log.warn("Couldn't decode", e);
109
111
  throw e;
110
112
  }
111
113
  }
@@ -33,8 +33,6 @@ describe('#getTransferSyntaxForContentType', function () {
33
33
  const expectedTransferSyntax = testCase[1];
34
34
  it(`given a content type of ${contentType}, should return ${expectedTransferSyntax}`, () => {
35
35
  const transferSyntax = getTransferSyntaxForContentType(contentType);
36
- console.log(transferSyntax);
37
- console.log(expectedTransferSyntax);
38
36
  expect(transferSyntax).to.be.equal(expectedTransferSyntax);
39
37
  });
40
38
  });
@@ -1,6 +1,8 @@
1
+ import { logging } from '@cornerstonejs/metadata';
1
2
  import getValue from './getValue.js';
2
3
  import getNumberValue from './getNumberValue.js';
3
4
  import getSequenceItems from './getSequenceItems.js';
5
+ const log = logging.loaderLog.getLogger('wadors');
4
6
  const TAG = {
5
7
  WaveformSequence: '54000100',
6
8
  NumberOfWaveformChannels: '003A0005',
@@ -44,7 +46,7 @@ function convertBuffer(dataSrc, numberOfChannels, numberOfSamples, bits, type) {
44
46
  }
45
47
  return ret;
46
48
  }
47
- console.warn(`[ECGHelpers] Unsupported waveform format: ${bits}-bit ${type}. Only 16-bit SS is supported.`);
49
+ log.warn(`[ECGHelpers] Unsupported waveform format: ${bits}-bit ${type}. Only 16-bit SS is supported.`);
48
50
  return [];
49
51
  }
50
52
  function multipartDecode(response) {
@@ -1,10 +1,12 @@
1
+ import { logging } from '@cornerstonejs/metadata';
2
+ const log = logging.loaderLog.getLogger('wadors');
1
3
  function getSequenceItems(element) {
2
4
  if (!element?.Value?.length) {
3
5
  return [];
4
6
  }
5
7
  if (!Array.isArray(element.Value)) {
6
8
  if (typeof element.Value === 'object') {
7
- console.warn('Warning: Value should be an array, but an object was found. Encapsulating the object in an array.');
9
+ log.warn('Warning: Value should be an array, but an object was found. Encapsulating the object in an array.');
8
10
  return [element.Value];
9
11
  }
10
12
  return [];
@@ -1,11 +1,12 @@
1
1
  import { metaData, registerImageLoader } from '@cornerstonejs/core';
2
2
  import loadImage from './loadImage.js';
3
3
  import { metaDataProvider } from './metaData/index.js';
4
- import { registerDefaultProviders } from '@cornerstonejs/metadata';
4
+ import { logging, registerDefaultProviders } from '@cornerstonejs/metadata';
5
+ const log = logging.loaderLog.getLogger('wadors');
5
6
  export default function (options) {
6
7
  registerImageLoader('wadors', loadImage);
7
8
  if (options?.useLegacyMetadataProvider) {
8
- console.warn('wadors metaDataProvider is deprecated. Use addDicomWebInstance from @cornerstonejs/metadata instead.');
9
+ log.warn('wadors metaDataProvider is deprecated. Use addDicomWebInstance from @cornerstonejs/metadata instead.');
9
10
  metaData.addProvider(metaDataProvider);
10
11
  return;
11
12
  }
@@ -5,6 +5,8 @@ import { combineFrameInstanceDataset } from './combineFrameInstanceDataset.js';
5
5
  import multiframeDataset from './retrieveMultiframeDataset.js';
6
6
  import { loadedDataSets, purgeLoadedDataSets } from './loadedDataSets.js';
7
7
  import { eventTarget, triggerEvent } from '@cornerstonejs/core';
8
+ import { logging } from '@cornerstonejs/metadata';
9
+ const log = logging.loaderLog.getLogger('wadouri');
8
10
  let cacheSizeInBytes = 0;
9
11
  let promises = {};
10
12
  function isLoaded(uri) {
@@ -24,7 +26,7 @@ function get(uri) {
24
26
  function update(uri, dataSet) {
25
27
  const loadedDataSet = loadedDataSets[uri];
26
28
  if (!loadedDataSet) {
27
- console.error(`No loaded dataSet for uri ${uri}`);
29
+ log.error(`No loaded dataSet for uri ${uri}`);
28
30
  return;
29
31
  }
30
32
  cacheSizeInBytes -= loadedDataSet.dataSet.byteArray.length;
@@ -1,11 +1,13 @@
1
+ import { logging } from '@cornerstonejs/metadata';
1
2
  import { parseDicom } from './parseDicomWithInflater.js';
3
+ const log = logging.loaderLog.getLogger('wadouri');
2
4
  function fixFragments(dataSet) {
3
5
  const fragments = dataSet.elements.x7fe00010.fragments;
4
6
  const totalLength = dataSet.byteArray.length;
5
7
  for (const fragment of fragments) {
6
8
  const { position, length } = fragment;
7
9
  if (length > totalLength - position) {
8
- console.log(`Truncated fragment, changing fragment length from ${fragment.length} to ${totalLength - position}`);
10
+ log.info(`Truncated fragment, changing fragment length from ${fragment.length} to ${totalLength - position}`);
9
11
  fragment.length = totalLength - position;
10
12
  }
11
13
  }
@@ -16,15 +18,15 @@ function parsePartialByteArray(byteArray) {
16
18
  untilTag: 'x7fe00010',
17
19
  });
18
20
  if (!dataSet.elements.x7fe00010) {
19
- console.warn('Pixel data not found!');
21
+ log.warn('Pixel data not found!');
20
22
  }
21
23
  let pixelDataSet;
22
24
  try {
23
25
  pixelDataSet = parseDicom(byteArray);
24
26
  }
25
27
  catch (err) {
26
- console.error(err);
27
- console.log('pixel data dataset:', err.dataSet);
28
+ log.error(err);
29
+ log.info('pixel data dataset:', err.dataSet);
28
30
  pixelDataSet = err.dataSet;
29
31
  }
30
32
  dataSet.elements.x7fe00010 = pixelDataSet.elements.x7fe00010;
@@ -1,4 +1,6 @@
1
+ import { logging } from '@cornerstonejs/metadata';
1
2
  import unpackBinaryFrame from './unpackBinaryFrame.js';
3
+ const log = logging.loaderLog.getLogger('wadouri');
2
4
  function getUncompressedImageFrame(dataSet, frameIndex) {
3
5
  const pixelDataElement = dataSet.elements.x7fe00010 || dataSet.elements.x7fe00008;
4
6
  const bitsAllocated = dataSet.uint16('x00280100');
@@ -8,7 +10,7 @@ function getUncompressedImageFrame(dataSet, frameIndex) {
8
10
  const photometricInterpretation = dataSet.string('x00280004');
9
11
  if (photometricInterpretation === 'YBR_FULL_422') {
10
12
  samplesPerPixel = 2;
11
- console.warn(`Using SamplesPerPixel of 2 for YBR_FULL_422 photometric interpretation.
13
+ log.warn(`Using SamplesPerPixel of 2 for YBR_FULL_422 photometric interpretation.
12
14
  See http://dicom.nema.org/medical/dicom/current/output/chtml/part03/sect_C.7.6.3.html for more information.`);
13
15
  }
14
16
  const pixelDataOffset = pixelDataElement.dataOffset;
@@ -1,5 +1,5 @@
1
1
  import { Enums, metaData } from '@cornerstonejs/core';
2
- import { Enums as MetadataEnums, utilities } from '@cornerstonejs/metadata';
2
+ import { Enums as MetadataEnums, utilities, logging, } from '@cornerstonejs/metadata';
3
3
  import createImage from '../createImage.js';
4
4
  import { xhrRequest } from '../internal/index.js';
5
5
  import dataSetCacheManager from './dataSetCacheManager.js';
@@ -7,6 +7,7 @@ import getPixelData from './getPixelData.js';
7
7
  import loadFileRequest from './loadFileRequest.js';
8
8
  import parseImageId from './parseImageId.js';
9
9
  const { ImageQualityStatus } = Enums;
10
+ const log = logging.loaderLog.getLogger('wadouri');
10
11
  const { addDicomPart10Instance } = utilities;
11
12
  const NATURALIZED = MetadataEnums.MetadataModules.NATURALIZED;
12
13
  function addDecache(imageLoadObject, imageId) {
@@ -128,7 +129,7 @@ function loadImageFromNaturalizedMetadata(imageId, options = {}) {
128
129
  : 0;
129
130
  const promise = (async () => {
130
131
  const start = Date.now();
131
- console.log('[dicomImageLoader/wadouri] loadImageFromNaturalizedMetadata: start', {
132
+ log.info('[dicomImageLoader/wadouri] loadImageFromNaturalizedMetadata: start', {
132
133
  imageId,
133
134
  scheme: parsedImageId.scheme,
134
135
  url: parsedImageId.url,
@@ -136,7 +137,7 @@ function loadImageFromNaturalizedMetadata(imageId, options = {}) {
136
137
  });
137
138
  let natural = metaData.get(NATURALIZED, imageId);
138
139
  if (!natural) {
139
- console.log('[dicomImageLoader/wadouri] loadImageFromNaturalizedMetadata: no NATURALIZED metadata, attempting to fetch and populate', { imageId });
140
+ log.info('[dicomImageLoader/wadouri] loadImageFromNaturalizedMetadata: no NATURALIZED metadata, attempting to fetch and populate', { imageId });
140
141
  if (!schemeLoader) {
141
142
  throw new Error(`loadImageFromNaturalizedMetadata: no NATURALIZED cache and unknown scheme ${parsedImageId.scheme}`);
142
143
  }
@@ -149,7 +150,7 @@ function loadImageFromNaturalizedMetadata(imageId, options = {}) {
149
150
  const loadEnd = Date.now();
150
151
  const frameData = metaData.getTyped(MetadataEnums.MetadataModules.COMPRESSED_FRAME_DATA, imageId, { frameIndex });
151
152
  if (!frameData) {
152
- console.warn('[dicomImageLoader/wadouri] loadImageFromNaturalizedMetadata: no COMPRESSED_FRAME_DATA for imageId', { imageId, frameIndex });
153
+ log.warn('[dicomImageLoader/wadouri] loadImageFromNaturalizedMetadata: no COMPRESSED_FRAME_DATA for imageId', { imageId, frameIndex });
153
154
  throw new Error(`loadImageFromNaturalizedMetadata: no pixel data in NATURALIZED for imageId ${imageId}`);
154
155
  }
155
156
  const { pixelData, transferSyntaxUid } = frameData;
@@ -1,10 +1,11 @@
1
1
  import { metaData, registerImageLoader } from '@cornerstonejs/core';
2
- import { registerDefaultProviders } from '@cornerstonejs/metadata';
2
+ import { logging, registerDefaultProviders } from '@cornerstonejs/metadata';
3
3
  import { loadImage, loadImageFromNaturalizedMetadata } from './loadImage.js';
4
4
  import { metaDataProvider } from './metaData/index.js';
5
+ const log = logging.loaderLog.getLogger('wadouri');
5
6
  export default function (options) {
6
7
  if (options?.useLegacyMetadataProvider === true) {
7
- console.warn('wadouri metaDataProvider is deprecated. Use registerMetadataProvider module from @cornerstonejs/metadata instead.');
8
+ log.warn('wadouri metaDataProvider is deprecated. Use registerMetadataProvider module from @cornerstonejs/metadata instead.');
8
9
  registerImageLoader('dicomweb', loadImage);
9
10
  registerImageLoader('wadouri', loadImage);
10
11
  registerImageLoader('dicomfile', loadImage);
@@ -1,5 +1,6 @@
1
1
  import openJphFactory, {} from '@cornerstonejs/codec-openjph/wasmjs';
2
2
  const openjphWasm = new URL('@cornerstonejs/codec-openjph/wasm', import.meta.url);
3
+ import getPixelData from './getPixelData.js';
3
4
  import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
4
5
  const local = {
5
6
  codec: undefined,
@@ -96,16 +97,4 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
96
97
  ...encodedImageInfo,
97
98
  };
98
99
  }
99
- function getPixelData(frameInfo, decodedBuffer) {
100
- if (frameInfo.bitsPerSample > 8) {
101
- if (frameInfo.isSigned) {
102
- return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
103
- }
104
- return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
105
- }
106
- if (frameInfo.isSigned) {
107
- return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
108
- }
109
- return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
110
- }
111
100
  export default decodeAsync;
@@ -1,5 +1,6 @@
1
1
  import openJpegFactory from '@cornerstonejs/codec-openjpeg/decodewasmjs';
2
2
  const openjpegWasm = new URL('@cornerstonejs/codec-openjpeg/decodewasm', import.meta.url);
3
+ import getPixelData from './getPixelData.js';
3
4
  import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
4
5
  const local = {
5
6
  codec: undefined,
@@ -80,16 +81,4 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
80
81
  ...encodedImageInfo,
81
82
  };
82
83
  }
83
- function getPixelData(frameInfo, decodedBuffer) {
84
- if (frameInfo.bitsPerSample > 8) {
85
- if (frameInfo.isSigned) {
86
- return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
87
- }
88
- return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
89
- }
90
- if (frameInfo.isSigned) {
91
- return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
92
- }
93
- return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
94
- }
95
84
  export default decodeAsync;
@@ -1,5 +1,6 @@
1
1
  import libjpegTurboFactory from '@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasmjs';
2
2
  const libjpegTurboWasm = new URL('@cornerstonejs/codec-libjpeg-turbo-8bit/decodewasm', import.meta.url);
3
+ import getPixelData from './getPixelData.js';
3
4
  import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
4
5
  const local = {
5
6
  codec: undefined,
@@ -55,12 +56,6 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
55
56
  ...encodedImageInfo,
56
57
  };
57
58
  }
58
- function getPixelData(frameInfo, decodedBuffer) {
59
- if (frameInfo.isSigned) {
60
- return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
61
- }
62
- return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
63
- }
64
59
  const initialize = initLibjpegTurbo;
65
60
  export { initialize };
66
61
  export default decodeAsync;
@@ -1,5 +1,6 @@
1
1
  import charlsFactory from '@cornerstonejs/codec-charls/decodewasmjs';
2
2
  const charlsWasm = new URL('@cornerstonejs/codec-charls/decodewasm', import.meta.url);
3
+ import getPixelData from './getPixelData.js';
3
4
  import { resolveWasmUrl, setWasmBasePathFromConfig } from '../wasmBasePath.js';
4
5
  const local = {
5
6
  codec: undefined,
@@ -71,16 +72,4 @@ async function decodeAsync(compressedImageFrame, imageInfo) {
71
72
  throw getExceptionMessage(error);
72
73
  }
73
74
  }
74
- function getPixelData(frameInfo, decodedBuffer, signed) {
75
- if (frameInfo.bitsPerSample > 8) {
76
- if (signed) {
77
- return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
78
- }
79
- return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
80
- }
81
- if (signed) {
82
- return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
83
- }
84
- return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
85
- }
86
75
  export default decodeAsync;
@@ -0,0 +1,8 @@
1
+ import type { ByteArray } from 'dicom-parser';
2
+ interface DecodedFrameInfo {
3
+ bitsPerSample?: number;
4
+ isSigned?: boolean | number;
5
+ componentCount?: number;
6
+ }
7
+ export default function getPixelData(frameInfo: DecodedFrameInfo, decodedBuffer: ByteArray, signedOverride?: boolean): Uint8Array | Int16Array | Uint16Array | Int8Array;
8
+ export {};
@@ -0,0 +1,17 @@
1
+ import isSignedPixelData from './isSignedPixelData.js';
2
+ export default function getPixelData(frameInfo, decodedBuffer, signedOverride) {
3
+ const signed = isSignedPixelData({
4
+ isSigned: signedOverride ?? frameInfo?.isSigned,
5
+ componentCount: frameInfo?.componentCount,
6
+ });
7
+ if (frameInfo?.bitsPerSample > 8) {
8
+ if (signed) {
9
+ return new Int16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
10
+ }
11
+ return new Uint16Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength / 2);
12
+ }
13
+ if (signed) {
14
+ return new Int8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
15
+ }
16
+ return new Uint8Array(decodedBuffer.buffer, decodedBuffer.byteOffset, decodedBuffer.byteLength);
17
+ }
@@ -0,0 +1,4 @@
1
+ export default function isSignedPixelData(frameInfo?: {
2
+ isSigned?: boolean | number;
3
+ componentCount?: number;
4
+ }): boolean;
@@ -0,0 +1,4 @@
1
+ export default function isSignedPixelData(frameInfo) {
2
+ const declaredSigned = frameInfo?.isSigned === true || frameInfo?.isSigned === 1;
3
+ return declaredSigned && frameInfo.componentCount === 1;
4
+ }
@@ -1 +1 @@
1
- export declare const version = "5.8.1";
1
+ export declare const version = "5.10.2";
@@ -1 +1 @@
1
- export const version = '5.8.1';
1
+ export const version = '5.10.2';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cornerstonejs/dicom-image-loader",
3
- "version": "5.8.1",
3
+ "version": "5.10.2",
4
4
  "description": "Cornerstone Image Loader for DICOM WADO-URI and WADO-RS and Local file",
5
5
  "keywords": [
6
6
  "DICOM",
@@ -122,18 +122,17 @@
122
122
  "uuid": "9.0.1"
123
123
  },
124
124
  "devDependencies": {
125
- "@cornerstonejs/core": "5.8.1",
126
- "@cornerstonejs/metadata": "5.8.1"
125
+ "@cornerstonejs/core": "5.10.2",
126
+ "@cornerstonejs/metadata": "5.10.2"
127
127
  },
128
128
  "peerDependencies": {
129
- "@cornerstonejs/core": "5.8.1",
130
- "@cornerstonejs/metadata": "5.8.1",
129
+ "@cornerstonejs/core": "5.10.2",
130
+ "@cornerstonejs/metadata": "5.10.2",
131
131
  "dicom-parser": "1.8.21"
132
132
  },
133
133
  "config": {
134
134
  "commitizen": {
135
135
  "path": "./node_modules/cz-conventional-changelog"
136
136
  }
137
- },
138
- "gitHead": "b0e07ac229d4118fa46350210a0ed6ce2cd24a25"
137
+ }
139
138
  }