projects
/
facial-landmarks-for-cubism.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove references to dlib and OpenCV. Added TODOs to use with OSF.
[facial-landmarks-for-cubism.git]
/
src
/
math_utils.h
diff --git
a/src/math_utils.h
b/src/math_utils.h
index
d465c87
..
f6b3d19
100644
(file)
--- a/
src/math_utils.h
+++ b/
src/math_utils.h
@@
-27,7
+27,6
@@
SOFTWARE.
#include <cmath>
#include <initializer_list>
#include <cmath>
#include <initializer_list>
-#include <dlib/image_processing.h>
static const double PI = 3.14159265358979;
static const double PI = 3.14159265358979;
@@
-47,20
+46,21
@@
static double avg(T container, double defaultValue = 0)
return sum / container.size();
}
return sum / container.size();
}
+
template<class... Args>
template<class... Args>
-static
dlib::p
oint centroid(Args&... args)
+static
P
oint centroid(Args&... args)
{
std::size_t numArgs = sizeof...(args);
{
std::size_t numArgs = sizeof...(args);
- if (numArgs == 0) return
dlib::p
oint(0, 0);
+ if (numArgs == 0) return
P
oint(0, 0);
double sumX = 0, sumY = 0;
for (auto point : {args...})
{
double sumX = 0, sumY = 0;
for (auto point : {args...})
{
- sumX += point.x
()
;
- sumY += point.y
()
;
+ sumX += point.x;
+ sumY += point.y;
}
}
- return
dlib::p
oint(sumX / numArgs, sumY / numArgs);
+ return
P
oint(sumX / numArgs, sumY / numArgs);
}
static inline double sq(double x)
}
static inline double sq(double x)
@@
-88,10
+88,10
@@
static inline double degToRad(double deg)
return deg * PI / 180;
}
return deg * PI / 180;
}
-double dist(
dlib::point& p1, dlib::p
oint& p2)
+double dist(
Point& p1, P
oint& p2)
{
{
- double xDist = p1.x
() - p2.x()
;
- double yDist = p1.y
() - p2.y()
;
+ double xDist = p1.x
- p2.x
;
+ double yDist = p1.y
- p2.y
;
return std::hypot(xDist, yDist);
}
return std::hypot(xDist, yDist);
}