From 068f71847e25216de351dccc75e492aec3309ce4 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Tue, 13 Sep 2016 09:46:41 +0200 Subject: [PATCH] Some inlining optimizations. --- xs/src/libslic3r/MultiPoint.cpp | 6 ------ xs/src/libslic3r/MultiPoint.hpp | 3 ++- xs/src/libslic3r/Point.cpp | 6 ------ xs/src/libslic3r/Point.hpp | 2 +- 4 files changed, 3 insertions(+), 14 deletions(-) diff --git a/xs/src/libslic3r/MultiPoint.cpp b/xs/src/libslic3r/MultiPoint.cpp index 0b7f8f3c21..5be53e5da0 100644 --- a/xs/src/libslic3r/MultiPoint.cpp +++ b/xs/src/libslic3r/MultiPoint.cpp @@ -74,12 +74,6 @@ MultiPoint::length() const return len; } -bool -MultiPoint::is_valid() const -{ - return this->points.size() >= 2; -} - int MultiPoint::find_point(const Point &point) const { diff --git a/xs/src/libslic3r/MultiPoint.hpp b/xs/src/libslic3r/MultiPoint.hpp index 08d2b86701..7cf41a8705 100644 --- a/xs/src/libslic3r/MultiPoint.hpp +++ b/xs/src/libslic3r/MultiPoint.hpp @@ -29,7 +29,8 @@ class MultiPoint virtual Point last_point() const = 0; virtual Lines lines() const = 0; double length() const; - bool is_valid() const; + bool is_valid() const { return this->points.size() >= 2; } + int find_point(const Point &point) const; bool has_boundary_point(const Point &point) const; BoundingBox bounding_box() const; diff --git a/xs/src/libslic3r/Point.cpp b/xs/src/libslic3r/Point.cpp index e3c7b22620..2a1668950f 100644 --- a/xs/src/libslic3r/Point.cpp +++ b/xs/src/libslic3r/Point.cpp @@ -78,12 +78,6 @@ Point::rotate(double angle, const Point ¢er) this->y = (coord_t)round( (double)center.y + c * dy + s * dx ); } -bool -Point::coincides_with(const Point &point) const -{ - return this->x == point.x && this->y == point.y; -} - bool Point::coincides_with_epsilon(const Point &point) const { diff --git a/xs/src/libslic3r/Point.hpp b/xs/src/libslic3r/Point.hpp index 45331aa714..9c23252cb6 100644 --- a/xs/src/libslic3r/Point.hpp +++ b/xs/src/libslic3r/Point.hpp @@ -44,7 +44,7 @@ class Point void translate(const Vector &vector); void rotate(double angle); void rotate(double angle, const Point ¢er); - bool coincides_with(const Point &point) const; + bool coincides_with(const Point &point) const { return this->x == point.x && this->y == point.y; } bool coincides_with_epsilon(const Point &point) const; int nearest_point_index(const Points &points) const; int nearest_point_index(const PointConstPtrs &points) const;