Upgrade Wagyu to bfbf2893

This commit is contained in:
Eric Fischer
2017-01-04 16:33:43 -08:00
parent e53c8ed7e6
commit bdac4d4e80
37 changed files with 678 additions and 953 deletions
+9 -14
View File
@@ -2,13 +2,13 @@
#include <assert.h>
#include <cmath>
#include <deque>
#include <list>
#include <map>
#include <mapbox/geometry/wagyu/point.hpp>
#include <set>
#include <sstream>
#include <vector>
#include <deque>
#include <mapbox/geometry/wagyu/point.hpp>
#ifdef DEBUG
#include <execinfo.h>
@@ -46,10 +46,9 @@ struct ring {
ring_list<T> children;
point_ptr<T> points;
point_ptr<T> bottom_point;
bool is_open;
ring( ring const& ) = delete;
ring& operator=(ring const& ) = delete;
ring(ring const&) = delete;
ring& operator=(ring const&) = delete;
ring()
: ring_index(0),
@@ -58,8 +57,7 @@ struct ring {
parent(nullptr),
children(),
points(nullptr),
bottom_point(nullptr),
is_open(false) {
bottom_point(nullptr) {
}
};
@@ -74,7 +72,7 @@ using hot_pixel_rev_itr = typename hot_pixel_vector<T>::reverse_iterator;
template <typename T>
struct ring_manager {
ring_list<T> children;
std::vector<point_ptr<T>> all_points;
hot_pixel_vector<T> hot_pixels;
@@ -84,8 +82,8 @@ struct ring_manager {
std::vector<point<T>> storage;
std::size_t index;
ring_manager( ring_manager const& ) = delete;
ring_manager& operator=(ring_manager const& ) = delete;
ring_manager(ring_manager const&) = delete;
ring_manager& operator=(ring_manager const&) = delete;
ring_manager()
: children(),
@@ -328,12 +326,9 @@ void reverse_ring(point_ptr<T> pp) {
}
template <typename T>
double area_from_point(point_ptr<T> op, std::size_t & size) {
double area_from_point(point_ptr<T> op, std::size_t& size) {
point_ptr<T> startOp = op;
size = 1;
if (!op) {
return 0.0;
}
double a = 0.0;
do {
++size;