Return NaN when encountering unregular value length number. Do not

throw. Fixes #112.
ivmartel · Sep 30, 2014 · 5446bc3 · 5446bc3
1 parent 89f03d6
commit 5446bc3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/dicom/dicomParser.js b/src/dicom/dicomParser.js
@@ -84,8 +84,8 @@ dwv.dicom.DataReader = function(buffer, isLittleEndian)
             return this.readFloat32(byteOffset, isLittleEndian);
         }
         else { 
-            console.log("Non number: '"+this.readString(byteOffset, nBytes)+"'");
-            throw new Error("Unsupported number size.");
+            console.warn("Non number: '"+this.readString(byteOffset, nBytes)+"' of "+nBytes+" bytes.");
+            return Number.NaN;
         }
     };
     /**
@@ -340,7 +340,11 @@ dwv.dicom.DicomParser.prototype.readDataElement = function(reader, offset, impli
     var dataOffset = offset+tagOffset+vrOffset+vlOffset;
     if( vr === "US" || vr === "UL")
     {
-        data = [reader.readNumber( dataOffset, vl )];
+        var num = reader.readNumber( dataOffset, vl );
+        if ( isNaN(num) ) {
+            console.warn("Not a number returned for tag: "+tag.name);
+        }
+        data = [num];
     }
     else if( vr === "OW" )
     {