From dfc8ab95177dfeb690184d72be17e532eb9e4202 Mon Sep 17 00:00:00 2001 From: Scott Klum Date: Fri, 22 Aug 2014 10:50:20 -0400 Subject: [PATCH] Fixed dependencies --- 3rdparty/stasm4.0.0/stasm/include/facedet.h | 3 +++ 3rdparty/stasm4.0.0/stasm/include/initasm.h | 2 ++ 3rdparty/stasm4.0.0/stasm/include/pinstart.h | 3 +++ 3rdparty/stasm4.0.0/stasm/include/shape17.h | 2 ++ 3rdparty/stasm4.0.0/stasm/include/shapehacks.h | 2 ++ 3rdparty/stasm4.0.0/stasm/include/shapemod.h | 1 + 3rdparty/stasm4.0.0/stasm/include/startshape.h | 3 +++ 3rdparty/stasm4.0.0/stasm/include/stasm_lib.h | 3 +++ 3rdparty/stasm4.0.0/stasm/src/misc.cpp | 5 ++++- 3rdparty/stasm4.0.0/stasm/src/pinstart.cpp | 7 ++++++- 3rdparty/stasm4.0.0/stasm/src/print.cpp | 5 ++++- 3rdparty/stasm4.0.0/stasm/src/shape17.cpp | 3 ++- 3rdparty/stasm4.0.0/stasm/src/shapehacks.cpp | 6 +++++- 3rdparty/stasm4.0.0/stasm/src/shapemod.cpp | 4 +++- 3rdparty/stasm4.0.0/stasm/src/startshape.cpp | 8 +++++++- 3rdparty/stasm4.0.0/stasm/src/stasm_lib.cpp | 12 +++++++++++- 16 files changed, 61 insertions(+), 8 deletions(-) diff --git a/3rdparty/stasm4.0.0/stasm/include/facedet.h b/3rdparty/stasm4.0.0/stasm/include/facedet.h index 101e250..e752c37 100755 --- a/3rdparty/stasm4.0.0/stasm/include/facedet.h +++ b/3rdparty/stasm4.0.0/stasm/include/facedet.h @@ -7,6 +7,9 @@ #include +#include "misc.h" +#include "print.h" + namespace stasm { class FaceDet diff --git a/3rdparty/stasm4.0.0/stasm/include/initasm.h b/3rdparty/stasm4.0.0/stasm/include/initasm.h index b6458b5..9485c67 100755 --- a/3rdparty/stasm4.0.0/stasm/include/initasm.h +++ b/3rdparty/stasm4.0.0/stasm/include/initasm.h @@ -5,6 +5,8 @@ #ifndef STASM_INITASM_H #define STASM_INITASM_H +#include "asm.h" + namespace stasm { void InitMods( diff --git a/3rdparty/stasm4.0.0/stasm/include/pinstart.h b/3rdparty/stasm4.0.0/stasm/include/pinstart.h index 5fcb304..2d9edd7 100755 --- a/3rdparty/stasm4.0.0/stasm/include/pinstart.h +++ b/3rdparty/stasm4.0.0/stasm/include/pinstart.h @@ -5,6 +5,9 @@ #ifndef STASM_PINSTART_H #define STASM_PINSTART_H +#include "misc.h" +#include "asm.h" + namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/include/shape17.h b/3rdparty/stasm4.0.0/stasm/include/shape17.h index 92ce6bb..f1362e6 100755 --- a/3rdparty/stasm4.0.0/stasm/include/shape17.h +++ b/3rdparty/stasm4.0.0/stasm/include/shape17.h @@ -5,6 +5,8 @@ #ifndef STASM_SHAPE17_H #define STASM_SHAPE17_H +#include "misc.h" + namespace stasm { enum LANDMARKS_17 // the 17 points that make up a Shape17 shape diff --git a/3rdparty/stasm4.0.0/stasm/include/shapehacks.h b/3rdparty/stasm4.0.0/stasm/include/shapehacks.h index 3525a18..10b4bbe 100755 --- a/3rdparty/stasm4.0.0/stasm/include/shapehacks.h +++ b/3rdparty/stasm4.0.0/stasm/include/shapehacks.h @@ -5,6 +5,8 @@ #ifndef STASM_SHAPEHACKS_H #define STASM_SHAPEHACKS_H +#include "misc.h" + namespace stasm { static const unsigned SHAPEHACKS_DEFAULT = 0x01; diff --git a/3rdparty/stasm4.0.0/stasm/include/shapemod.h b/3rdparty/stasm4.0.0/stasm/include/shapemod.h index c32d9cc..121e414 100755 --- a/3rdparty/stasm4.0.0/stasm/include/shapemod.h +++ b/3rdparty/stasm4.0.0/stasm/include/shapemod.h @@ -7,6 +7,7 @@ #include "stasm_lib.h" #include "shapehacks.h" +#include "misc.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/include/startshape.h b/3rdparty/stasm4.0.0/stasm/include/startshape.h index dfe9b5d..0ddcaea 100755 --- a/3rdparty/stasm4.0.0/stasm/include/startshape.h +++ b/3rdparty/stasm4.0.0/stasm/include/startshape.h @@ -6,6 +6,9 @@ #define STASM_startshape_H #include "stasmcascadeclassifier.h" +#include "misc.h" +#include "asm.h" +#include "facedet.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/include/stasm_lib.h b/3rdparty/stasm4.0.0/stasm/include/stasm_lib.h index ba56b55..375de24 100755 --- a/3rdparty/stasm4.0.0/stasm/include/stasm_lib.h +++ b/3rdparty/stasm4.0.0/stasm/include/stasm_lib.h @@ -64,6 +64,9 @@ #include "stasmcascadeclassifier.h" +#define TRACE_IMAGES 0 // 1 to generate debugging images + +static const char* const STASM_VERSION = "4.0.0"; static const int stasm_NLANDMARKS = 77; // number of landmarks extern const char* const stasm_VERSION; diff --git a/3rdparty/stasm4.0.0/stasm/src/misc.cpp b/3rdparty/stasm4.0.0/stasm/src/misc.cpp index 1f4db87..bc03fff 100755 --- a/3rdparty/stasm4.0.0/stasm/src/misc.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/misc.cpp @@ -2,7 +2,10 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "misc.h" +#include "err.h" +#include "print.h" +#include "asm.h" #include namespace stasm diff --git a/3rdparty/stasm4.0.0/stasm/src/pinstart.cpp b/3rdparty/stasm4.0.0/stasm/src/pinstart.cpp index e47be40..b93c389 100755 --- a/3rdparty/stasm4.0.0/stasm/src/pinstart.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/pinstart.cpp @@ -2,7 +2,12 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "pinstart.h" +#include "stasm_landmarks.h" +#include "faceroi.h" +#include "err.h" +#include "landmarks.h" +#include "print.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/src/print.cpp b/3rdparty/stasm4.0.0/stasm/src/print.cpp index 4c02497..fcc9cd4 100755 --- a/3rdparty/stasm4.0.0/stasm/src/print.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/print.cpp @@ -2,7 +2,10 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "print.h" +#include "err.h" +#include "misc.h" + #include namespace stasm diff --git a/3rdparty/stasm4.0.0/stasm/src/shape17.cpp b/3rdparty/stasm4.0.0/stasm/src/shape17.cpp index d1de9a3..14302db 100755 --- a/3rdparty/stasm4.0.0/stasm/src/shape17.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/shape17.cpp @@ -5,7 +5,8 @@ // That is, we use Shape17s as a lowest common denominator. A Shape17 // consists of the 17 points defined by Cristinacce's "me17" measure. -#include "stasm.h" +#include "shape17.h" +#include "err.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/src/shapehacks.cpp b/3rdparty/stasm4.0.0/stasm/src/shapehacks.cpp index 85f3078..7742e37 100755 --- a/3rdparty/stasm4.0.0/stasm/src/shapehacks.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/shapehacks.cpp @@ -9,7 +9,11 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "shapehacks.h" +#include "print.h" +#include "stasm_lib.h" +#include "eyedist.h" +#include "stasm_landmarks.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/src/shapemod.cpp b/3rdparty/stasm4.0.0/stasm/src/shapemod.cpp index 1b0a8dc..df57179 100755 --- a/3rdparty/stasm4.0.0/stasm/src/shapemod.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/shapemod.cpp @@ -2,7 +2,9 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "shapemod.h" +#include "landmarks.h" +#include "asm.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/src/startshape.cpp b/3rdparty/stasm4.0.0/stasm/src/startshape.cpp index 5439f53..02707e2 100755 --- a/3rdparty/stasm4.0.0/stasm/src/startshape.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/startshape.cpp @@ -27,7 +27,13 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "startshape.h" +#include "print.h" +#include "landmarks.h" +#include "stasm_landmarks.h" +#include "err.h" +#include "faceroi.h" +#include "eyedet.h" namespace stasm { diff --git a/3rdparty/stasm4.0.0/stasm/src/stasm_lib.cpp b/3rdparty/stasm4.0.0/stasm/src/stasm_lib.cpp index bfea3f9..64d2191 100755 --- a/3rdparty/stasm4.0.0/stasm/src/stasm_lib.cpp +++ b/3rdparty/stasm4.0.0/stasm/src/stasm_lib.cpp @@ -2,7 +2,17 @@ // // Copyright (C) 2005-2013, Stephen Milborrow -#include "stasm.h" +#include "stasm_lib.h" +#include "err.h" +#include "misc.h" +#include "asm.h" +#include "print.h" +#include "initasm.h" +#include "faceroi.h" +#include "pinstart.h" +#include "convshape.h" +#include "facedet.h" +#include "startshape.h" using namespace stasm; -- libgit2 0.21.4