Merge pull request #524 from c64kernal/dev_small

Fix build breakage on MSVC due to implicit downcasting.
This commit is contained in:
Jeremy Cowles 2015-05-24 07:27:43 -07:00
commit 4b72d80fe4

View File

@ -100,8 +100,8 @@ public:
_weights[i] = 1.0;
}
_size = _sources.size();
_lastOffset = _sources.size() - 1;
_size = (int)_sources.size();
_lastOffset = (int)_sources.size() - 1;
}
template <class W, class WACCUM>
@ -260,11 +260,11 @@ private:
_sizes.resize(dst+1);
}
// Initialize the new stencil's meta-data (offset, size).
_indices[dst] = _sources.size();
_indices[dst] = (int)_sources.size();
_sizes[dst] = 0;
// Keep track of where the current stencil begins, which lets us
// avoid having to look it up later.
_lastOffset = _sources.size();
_lastOffset = (int)_sources.size();
}
// Cache the number of elements as an optimization, it's faster than
// calling size() on any of the vectors.