| commit | 373730605cdd7ae9913b0ef32ef573cb06c9af9f | [log] [tgz] |
|---|---|---|
| author | gitbuildkicker <android-build@google.com> | Sun Oct 23 00:06:58 2016 -0700 |
| committer | gitbuildkicker <android-build@google.com> | Sun Oct 23 00:06:58 2016 -0700 |
| tree | d005d2840a6192d67f19a31efaf579c713267f4b | |
| parent | ced19e30cf3d6c7314104caef34378c3d07c5169 [diff] | |
| parent | 8dd0c162c598cb872823cc367074c0f636f848d1 [diff] |
merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/separate_rects.cpp b/separate_rects.cpp index 3d76e53..9fd1ae4 100644 --- a/separate_rects.cpp +++ b/separate_rects.cpp
@@ -85,7 +85,7 @@ // our output set of non-overlapping rectangles. Based of the algorithm found // at: http://stackoverflow.com/a/2755498 - if (in.size() > IdSet<TNum>::max_elements) { + if (in.size() > IdSet<TId>::max_elements) { return; }