Replace YBR_FULL_422 by YBR_FULL. Fixes #63

ivmartel · Jul 24, 2019 · e87ce7e · e87ce7e
1 parent 47d6f53
commit e87ce7e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/image/image.js b/src/image/image.js
@@ -356,7 +356,7 @@ dwv.image.Image = function(geometry, buffer, numberOfFrames)
 
         // calculate slice size
         var mul = 1;
-        if( photometricInterpretation === "RGB" || photometricInterpretation === "YBR_FULL_422") {
+        if( photometricInterpretation === "RGB" || photometricInterpretation === "YBR_FULL") {
             mul = 3;
         }
         var sliceSize = mul * size.getSliceSize();

diff --git a/src/image/view.js b/src/image/view.js
@@ -726,7 +726,7 @@ dwv.image.View.prototype.generateImageData = function( array )
         }
         break;
 
-    case "YBR_FULL_422":
+    case "YBR_FULL":
         // theory:
         // http://dicom.nema.org/dicom/2013/output/chtml/part03/sect_C.7.html#sect_C.7.6.3.1.2
         // reverse equation:
@@ -764,9 +764,9 @@ dwv.image.View.prototype.generateImageData = function( array )
             g = y - 0.34414 * (cb - 128) - 0.71414 * (cr - 128);
             b = y + 1.772 * (cb - 128);
 
-            array.data[index] = windowLut.getValue(r);
-            array.data[index+1] = windowLut.getValue(g);
-            array.data[index+2] = windowLut.getValue(b);
+            array.data[index] = r;
+            array.data[index+1] = g;
+            array.data[index+2] = b;
             array.data[index+3] = 0xff;
             index += 4;