Fix #158: premature widening of bitset array.

square · Aug 12, 2015 · 0be70ae · 0be70ae
1 parent c8766a2
commit 0be70ae
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/crossfilter.js b/crossfilter.js
@@ -1,5 +1,5 @@
 (function(exports){
-crossfilter.version = "1.3.11";
+crossfilter.version = "1.3.12";
 function crossfilter_identity(d) {
   return d;
 }
@@ -631,7 +631,7 @@ function crossfilter() {
     // Incorporate any existing data into this dimension, and make sure that the
     // filter bitset is wide enough to handle the new dimension.
     m |= one;
-    if (M >= 32 ? !one : m & (1 << M) - 1) {
+    if (M >= 32 ? !one : m & -(1 << M)) {
       filters = crossfilter_arrayWiden(filters, M <<= 1);
     }
     preAdd(data, 0, n);

diff --git a/crossfilter.min.js b/crossfilter.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crossfilter",
-  "version": "1.3.11",
+  "version": "1.3.12",
   "description": "Fast multidimensional filtering for coordinated views.",
   "keywords": [
     "square",
@@ -30,7 +30,7 @@
     "url": "http://github.com/square/crossfilter.git"
   },
   "devDependencies": {
-    "d3": "3.3",
+    "d3": "3",
     "vows": "0.7.0",
     "uglify-js": "2.4.0"
   },