@cornerstonejs/core 0.40.0 → 0.40.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cornerstonejs/core",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "description": "",
   "main": "dist/umd/index.js",
   "types": "dist/esm/index.d.ts",
@@ -51,5 +51,5 @@
     "type": "individual",
     "url": "https://ohif.org/donate"
   },
-  "gitHead": "b21acf448f3b24c4ff109da5208bc313c0289b81"
+  "gitHead": "ebbb555ff9032600b1f7d6fecde9303e5c79571f"
 }

package/src/RenderingEngine/BaseVolumeViewport.ts

@@ -599,7 +599,9 @@ abstract class BaseVolumeViewport extends Viewport implements IVolumeViewport {
       spacing: vtkImageData.getSpacing(),
       origin: vtkImageData.getOrigin(),
       direction: vtkImageData.getDirection(),
-      scalarData: vtkImageData.getPointData().getScalars().getData(),
+      scalarData: vtkImageData.getPointData().getScalars().isDeleted()
+        ? null
+        : vtkImageData.getPointData().getScalars().getData(),
       imageData: actor.getMapper().getInputData(),
       metadata: {
         Modality: volume?.metadata?.Modality,

package/src/RenderingEngine/vtkClasses/vtkStreamingOpenGLVolumeMapper.js

@@ -285,6 +285,18 @@ function vtkStreamingOpenGLVolumeMapper(publicAPI, model) {
 
     return [lowerLeftU, lowerLeftV];
   };
+
+  // TODO: it seems like this may be needed to reset the GPU memory associated
+  // with a volume
+  // publicAPI.hardReset = () => {
+  //   model.opacityTexture.releaseGraphicsResources(model._openGLRenderWindow);
+  //   model.colorTexture.releaseGraphicsResources(model._openGLRenderWindow);
+  //   model.scalarTexture.setOglNorm16Ext(
+  //     model.context.getExtension('EXT_texture_norm16')
+  //   );
+  //   model.scalarTexture.releaseGraphicsResources(model._openGLRenderWindow);
+  //   model.scalarTexture.resetFormatAndType();
+  // };
 }
 
 // ----------------------------------------------------------------------------

package/src/cache/cache.ts

@@ -133,7 +133,7 @@ class Cache implements ICache {
     }
 
     if (volume.imageData) {
-      volume.imageData = null;
+      volume.imageData.delete();
     }
 
     if (volumeLoadObject.cancelFn) {

package/src/cache/classes/ImageVolume.ts

@@ -1,6 +1,7 @@
 import isTypedArray from '../../utilities/isTypedArray';
 import { imageIdToURI } from '../../utilities';
 import { vtkStreamingOpenGLTexture } from '../../RenderingEngine/vtkClasses';
+import type { vtkImageData } from '@kitware/vtk.js/Common/DataModel/ImageData';
 import {
   IVolume,
   VolumeScalarData,
@@ -50,7 +51,7 @@ export class ImageVolume implements IImageVolume {
   /** volume number of voxels */
   numVoxels: number;
   /** volume image data */
-  imageData?: any;
+  imageData?: vtkImageData;
   /** open gl texture for the volume */
   vtkOpenGLTexture: any; // No good way of referencing vtk classes as they aren't classes.
   /** load status object for the volume */
@@ -147,7 +148,12 @@ export class ImageVolume implements IImageVolume {
    * destroy the volume and make it unusable
    */
   destroy(): void {
+    // TODO: GPU memory associated with volume is not cleared.
+    this.vtkOpenGLTexture.releaseGraphicsResources();
+    this.vtkOpenGLTexture.destroyTexture();
     this.vtkOpenGLTexture.delete();
+    this.imageData.delete();
+    this.imageData = null;
     this.scalarData = null;
   }
 }