Merge branch 'pixelposition' into 'master'

Rename forgotten Pixel to PixelPosition

See merge request !121

src/facets/facet.cc

@@ -17,7 +17,7 @@
 #include <boost/geometry/geometries/linestring.hpp>
 #include <boost/geometry/algorithms/is_convex.hpp>
 
-// Even though Pixels are int, let boost perform the intersection
+// Even though PixelPositions are int, let boost perform the intersection
 // calculations based on floats to avoid rounding issues
 BOOST_GEOMETRY_REGISTER_POINT_2D(schaapcommon::facets::PixelPosition, float,
                                  cs::cartesian, x, y)
@@ -55,8 +55,8 @@ std::vector<std::pair<int, int>> Facet::HorizontalIntersections(
   int x2 = 0;
   size_t i;
   for (i = 0; i != pixels_.size(); ++i) {
-    const Pixel& p1 = pixels_[i];
-    const Pixel& p2 = pixels_[(i + 1) % pixels_.size()];
+    const PixelPosition& p1 = pixels_[i];
+    const PixelPosition& p2 = pixels_[(i + 1) % pixels_.size()];
     if ((p1.y <= y_intersect && p2.y > y_intersect) ||
         (p2.y <= y_intersect && p1.y > y_intersect)) {
       int x;