Skip to content

Commit d260168

Browse files
committed
simplify 1d length detection
1 parent 938bb77 commit d260168

File tree

1 file changed

+4
-17
lines changed

1 file changed

+4
-17
lines changed

src/lib/array.js

+4-17
Original file line numberDiff line numberDiff line change
@@ -103,28 +103,15 @@ exports.decodeTypedArraySpec = function(vIn) {
103103
if(!T) throw new Error('Error in dtype: "' + dtype + '"');
104104
var BYTES_PER_ELEMENT = T.BYTES_PER_ELEMENT;
105105

106-
var shape;
107106
var buffer = v.vals;
108107
if(!isArrayBuffer(buffer)) {
109-
if(v.shape === undefined) {
110-
var len = buffer.length;
111-
var n = 0.75 * len;
112-
if(buffer[len - 2] === '=') {
113-
n -= 2;
114-
} else if(buffer[len - 1] === '=') {
115-
n -= 1;
116-
}
117-
118-
shape = [n / BYTES_PER_ELEMENT];
119-
}
120-
121108
buffer = b64decode(buffer);
122109
}
123-
124-
if(!shape) {
110+
var shape = v.shape === undefined ?
111+
// detect 1-d length
112+
[buffer.byteLength / BYTES_PER_ELEMENT] :
125113
// convert number to string and split to array
126-
shape = ('' + v.shape).split(',');
127-
}
114+
('' + v.shape).split(',');
128115

129116
var ndims = shape.length;
130117

0 commit comments

Comments
 (0)