Add quotation marks to fix #54. Rebuild after merging #65

cornerstonejs · Apr 3, 2017 · 6a792c0 · 6a792c0
1 parent bb70db9
commit 6a792c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 18 deletions.
diff --git a/dist/cornerstoneWADOImageLoader.js b/dist/cornerstoneWADOImageLoader.js
@@ -352,11 +352,6 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
       sopClassUid !== '1.2.840.10008.5.1.4.1.1.12.2.1	'; // XRF
   }
 
-  function getSizeInBytes(imageFrame) {
-    var bytesPerPixel = Math.round(imageFrame.bitsAllocated / 8);
-    return imageFrame.rows * imageFrame.columns * bytesPerPixel * imageFrame.samplesPerPixel;
-  }
-
   /**
    * Helper function to set pixel data to the right typed array.  This is needed because web workers
    * can transfer array buffers but not typed arrays
@@ -418,7 +413,7 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
         render: undefined, // set below
         rowPixelSpacing: imagePlaneModule.pixelSpacing ? imagePlaneModule.pixelSpacing[0] : undefined,
         rows: imageFrame.rows,
-        sizeInBytes: getSizeInBytes(imageFrame),
+        sizeInBytes: imageFrame.pixelData.length,
         slope: modalityLutModule.rescaleSlope ? modalityLutModule.rescaleSlope: 1,
         width: imageFrame.columns,
         windowCenter: voiLutModule.windowCenter ? voiLutModule.windowCenter[0] : undefined,
@@ -875,7 +870,7 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
       var response = new Uint8Array(imageFrameAsArrayBuffer);
 
       // First look for the multipart mime header
-      var tokenIndex = cornerstoneWADOImageLoader.wadors.findIndexOfString(response, '\n\r\n');
+      var tokenIndex = cornerstoneWADOImageLoader.wadors.findIndexOfString(response, '\r\n\r\n');
       if(tokenIndex === -1) {
         deferred.reject('invalid response - no multipart mime header');
       }
@@ -886,18 +881,23 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
       if(!boundary) {
         deferred.reject('invalid response - no boundary marker')
       }
-      var offset = tokenIndex + 3; // skip over the \n\r\n
+      var offset = tokenIndex + 4; // skip over the \r\n\r\n
 
       // find the terminal boundary marker
       var endIndex = cornerstoneWADOImageLoader.wadors.findIndexOfString(response, boundary, offset);
       if(endIndex === -1) {
         deferred.reject('invalid response - terminating boundary not found');
       }
+
+      // Remove \r\n from the length
+      var length = endIndex - offset - 2;
+
       // return the info for this pixel data
-      var length = endIndex - offset;
       deferred.resolve({
         contentType: findContentType(split),
-        imageFrame: new Uint8Array(imageFrameAsArrayBuffer, offset, length)
+        imageFrame: {
+          pixelData: new Uint8Array(imageFrameAsArrayBuffer, offset, length)
+        }
       });
     });
     return deferred.promise();    
@@ -929,7 +929,7 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
 
     // TODO: load bulk data items that we might need
 
-    var mediaType;// = 'image/dicom+jp2';
+    var mediaType = 'multipart/related; type="application/octet-stream"'; // 'image/dicom+jp2';
 
     // get the pixel data from the server
     cornerstoneWADOImageLoader.wadors.getPixelData(uri, imageId, mediaType).then(function(result) {
@@ -1119,8 +1119,13 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
         planarConfiguration: getValue(metaData['00280006']),
         pixelAspectRatio: getValue(metaData['00280034']),
         smallestPixelValue: getValue(metaData['00280106']),
-        largestPixelValue: getValue(metaData['00280107'])
-        // TODO Color Palette
+        largestPixelValue: getValue(metaData['00280107']),
+        redPaletteColorLookupTableDescriptor: getNumberValues(metaData['00281101']),
+        greenPaletteColorLookupTableDescriptor: getNumberValues(metaData['00281102']),
+        bluePaletteColorLookupTableDescriptor: getNumberValues(metaData['00281103']),
+        redPaletteColorLookupTableData: getNumberValues(metaData['00281201']),
+        greenPaletteColorLookupTableData: getNumberValues(metaData['00281202']),
+        bluePaletteColorLookupTableData: getNumberValues(metaData['00281203'])
       };
     }
 
@@ -1258,7 +1263,6 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
 
     // This uri is not loaded or being loaded, load it via an xhrRequest
     var promise = loadRequest(uri, imageId);
-    promises[uri] = promise;
 
     // handle success and failure of the XHR request load
     var loadDeferred = $.Deferred();
@@ -1286,6 +1290,8 @@ if(typeof cornerstoneWADOImageLoader === 'undefined'){
         // error thrown, remove the promise
         delete promises[uri];
       });
+
+    promises[uri] = loadDeferred;
     return loadDeferred;
   }
 

diff --git a/dist/cornerstoneWADOImageLoader.min.js b/dist/cornerstoneWADOImageLoader.min.js
diff --git a/dist/cornerstoneWADOImageLoaderWebWorker.js b/dist/cornerstoneWADOImageLoaderWebWorker.js
@@ -555,7 +555,7 @@ cornerstoneWADOImageLoader = {};
     //console.time('jpeglossless');
     var buffer = pixelData.buffer;
     var decoder = new jpeg.lossless.Decoder();
-    var decompressedData = decoder.decode(buffer, buffer.byteOffset, buffer.length, byteOutput);
+    var decompressedData = decoder.decode(buffer, pixelData.byteOffset, pixelData.length, byteOutput);
     //console.timeEnd('jpeglossless');
     if (imageFrame.pixelRepresentation === 0) {
       if (imageFrame.bitsAllocated === 16) {