use double braces for array initialization as brace elision is implemented/supported differently in GCC and Clang

This commit is contained in:
Dennis Luxen 2014-10-29 10:39:23 -04:00
parent 8700007025
commit a28928e6ca

View File

@ -29,7 +29,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define DOUGLASPEUCKER_H_ #define DOUGLASPEUCKER_H_
#include <stack> #include <stack>
#include <utility>
#include <vector> #include <vector>
#include <array> #include <array>
@ -41,27 +40,28 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Note: points may also be pre-selected*/ * Note: points may also be pre-selected*/
struct SegmentInformation; struct SegmentInformation;
static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS = {
512440, // z0 static const std::array<int, 19> DOUGLAS_PEUCKER_THRESHOLDS {{
256720, // z1 512440, // z0
122560, // z2 256720, // z1
56780, // z3 122560, // z2
28800, // z4 56780, // z3
14400, // z5 28800, // z4
7200, // z6 14400, // z5
3200, // z7 7200, // z6
2400, // z8 3200, // z7
1000, // z9 2400, // z8
600, // z10 1000, // z9
120, // z11 600, // z10
60, // z12 120, // z11
45, // z13 60, // z12
36, // z14 45, // z13
20, // z15 36, // z14
8, // z16 20, // z15
6, // z17 8, // z16
4 // z18 6, // z17
}; 4 // z18
}};
class DouglasPeucker class DouglasPeucker
{ {