Commit dfc8ab95177dfeb690184d72be17e532eb9e4202

Authored by Scott Klum
1 parent 91c35ebf

Fixed dependencies

3rdparty/stasm4.0.0/stasm/include/facedet.h
... ... @@ -7,6 +7,9 @@
7 7  
8 8 #include <opencv2/objdetect/objdetect.hpp>
9 9  
  10 +#include "misc.h"
  11 +#include "print.h"
  12 +
10 13 namespace stasm
11 14 {
12 15 class FaceDet
... ...
3rdparty/stasm4.0.0/stasm/include/initasm.h
... ... @@ -5,6 +5,8 @@
5 5 #ifndef STASM_INITASM_H
6 6 #define STASM_INITASM_H
7 7  
  8 +#include "asm.h"
  9 +
8 10 namespace stasm
9 11 {
10 12 void InitMods(
... ...
3rdparty/stasm4.0.0/stasm/include/pinstart.h
... ... @@ -5,6 +5,9 @@
5 5 #ifndef STASM_PINSTART_H
6 6 #define STASM_PINSTART_H
7 7  
  8 +#include "misc.h"
  9 +#include "asm.h"
  10 +
8 11 namespace stasm
9 12 {
10 13  
... ...
3rdparty/stasm4.0.0/stasm/include/shape17.h
... ... @@ -5,6 +5,8 @@
5 5 #ifndef STASM_SHAPE17_H
6 6 #define STASM_SHAPE17_H
7 7  
  8 +#include "misc.h"
  9 +
8 10 namespace stasm
9 11 {
10 12 enum LANDMARKS_17 // the 17 points that make up a Shape17 shape
... ...
3rdparty/stasm4.0.0/stasm/include/shapehacks.h
... ... @@ -5,6 +5,8 @@
5 5 #ifndef STASM_SHAPEHACKS_H
6 6 #define STASM_SHAPEHACKS_H
7 7  
  8 +#include "misc.h"
  9 +
8 10 namespace stasm
9 11 {
10 12 static const unsigned SHAPEHACKS_DEFAULT = 0x01;
... ...
3rdparty/stasm4.0.0/stasm/include/shapemod.h
... ... @@ -7,6 +7,7 @@
7 7  
8 8 #include "stasm_lib.h"
9 9 #include "shapehacks.h"
  10 +#include "misc.h"
10 11  
11 12 namespace stasm
12 13 {
... ...
3rdparty/stasm4.0.0/stasm/include/startshape.h
... ... @@ -6,6 +6,9 @@
6 6 #define STASM_startshape_H
7 7  
8 8 #include "stasmcascadeclassifier.h"
  9 +#include "misc.h"
  10 +#include "asm.h"
  11 +#include "facedet.h"
9 12  
10 13 namespace stasm
11 14 {
... ...
3rdparty/stasm4.0.0/stasm/include/stasm_lib.h
... ... @@ -64,6 +64,9 @@
64 64  
65 65 #include "stasmcascadeclassifier.h"
66 66  
  67 +#define TRACE_IMAGES 0 // 1 to generate debugging images
  68 +
  69 +static const char* const STASM_VERSION = "4.0.0";
67 70 static const int stasm_NLANDMARKS = 77; // number of landmarks
68 71  
69 72 extern const char* const stasm_VERSION;
... ...
3rdparty/stasm4.0.0/stasm/src/misc.cpp
... ... @@ -2,7 +2,10 @@
2 2 //
3 3 // Copyright (C) 2005-2013, Stephen Milborrow
4 4  
5   -#include "stasm.h"
  5 +#include "misc.h"
  6 +#include "err.h"
  7 +#include "print.h"
  8 +#include "asm.h"
6 9 #include <sys/stat.h>
7 10  
8 11 namespace stasm
... ...
3rdparty/stasm4.0.0/stasm/src/pinstart.cpp
... ... @@ -2,7 +2,12 @@
2 2 //
3 3 // Copyright (C) 2005-2013, Stephen Milborrow
4 4  
5   -#include "stasm.h"
  5 +#include "pinstart.h"
  6 +#include "stasm_landmarks.h"
  7 +#include "faceroi.h"
  8 +#include "err.h"
  9 +#include "landmarks.h"
  10 +#include "print.h"
6 11  
7 12 namespace stasm
8 13 {
... ...
3rdparty/stasm4.0.0/stasm/src/print.cpp
... ... @@ -2,7 +2,10 @@
2 2 //
3 3 // Copyright (C) 2005-2013, Stephen Milborrow
4 4  
5   -#include "stasm.h"
  5 +#include "print.h"
  6 +#include "err.h"
  7 +#include "misc.h"
  8 +
6 9 #include <sys/stat.h>
7 10  
8 11 namespace stasm
... ...
3rdparty/stasm4.0.0/stasm/src/shape17.cpp
... ... @@ -5,7 +5,8 @@
5 5 // That is, we use Shape17s as a lowest common denominator. A Shape17
6 6 // consists of the 17 points defined by Cristinacce's "me17" measure.
7 7  
8   -#include "stasm.h"
  8 +#include "shape17.h"
  9 +#include "err.h"
9 10  
10 11 namespace stasm
11 12 {
... ...
3rdparty/stasm4.0.0/stasm/src/shapehacks.cpp
... ... @@ -9,7 +9,11 @@
9 9 //
10 10 // Copyright (C) 2005-2013, Stephen Milborrow
11 11  
12   -#include "stasm.h"
  12 +#include "shapehacks.h"
  13 +#include "print.h"
  14 +#include "stasm_lib.h"
  15 +#include "eyedist.h"
  16 +#include "stasm_landmarks.h"
13 17  
14 18 namespace stasm
15 19 {
... ...
3rdparty/stasm4.0.0/stasm/src/shapemod.cpp
... ... @@ -2,7 +2,9 @@
2 2 //
3 3 // Copyright (C) 2005-2013, Stephen Milborrow
4 4  
5   -#include "stasm.h"
  5 +#include "shapemod.h"
  6 +#include "landmarks.h"
  7 +#include "asm.h"
6 8  
7 9 namespace stasm
8 10 {
... ...
3rdparty/stasm4.0.0/stasm/src/startshape.cpp
... ... @@ -27,7 +27,13 @@
27 27 //
28 28 // Copyright (C) 2005-2013, Stephen Milborrow
29 29  
30   -#include "stasm.h"
  30 +#include "startshape.h"
  31 +#include "print.h"
  32 +#include "landmarks.h"
  33 +#include "stasm_landmarks.h"
  34 +#include "err.h"
  35 +#include "faceroi.h"
  36 +#include "eyedet.h"
31 37  
32 38 namespace stasm
33 39 {
... ...
3rdparty/stasm4.0.0/stasm/src/stasm_lib.cpp
... ... @@ -2,7 +2,17 @@
2 2 //
3 3 // Copyright (C) 2005-2013, Stephen Milborrow
4 4  
5   -#include "stasm.h"
  5 +#include "stasm_lib.h"
  6 +#include "err.h"
  7 +#include "misc.h"
  8 +#include "asm.h"
  9 +#include "print.h"
  10 +#include "initasm.h"
  11 +#include "faceroi.h"
  12 +#include "pinstart.h"
  13 +#include "convshape.h"
  14 +#include "facedet.h"
  15 +#include "startshape.h"
6 16  
7 17 using namespace stasm;
8 18  
... ...