add CMakeLists.txt for building SeetaFace Alignment on linux and update README.

Author: jiezhang-zz

FaceAlignment/CMakeLists.txt

@@ -0,0 +1,40 @@
+cmake_minimum_required(VERSION 2.8.4)
+
+project(seeta_fa_lib)
+
+# Build options
+option(BUILD_EXAMPLES  "Set to ON to build examples"  ON)
+
+# Use C++11
+#set(CMAKE_CXX_STANDARD 11)
+#set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+message(STATUS "C++11 support has been enabled by default.")
+
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
+
+include_directories(include)
+
+set(src_files 
+    src/cfan.cpp
+    src/face_alignment.cpp
+    src/sift.cpp
+    )
+
+add_library(seeta_fa_lib SHARED ${src_files})
+set(fa_required_libs seeta_fa_lib)
+
+if (BUILD_EXAMPLES)
+    message(STATUS "Build with examples.")
+    find_package(OpenCV)
+    if (NOT OpenCV_FOUND)
+        message(WARNING "OpenCV not found. Test will not be built.")
+    else()
+        include_directories(${OpenCV_INCLUDE_DIRS} build)
+	link_directories(build)
+        list(APPEND fa_required_libs ${OpenCV_LIBS} seeta_facedet_lib)
+        add_executable(fa_test src/test/face_alignment_test.cpp)
+        target_link_libraries(fa_test ${fa_required_libs})
+    endif()
+endif()

FaceAlignment/README.md

@@ -33,6 +33,25 @@ As for speed, it takes about 5 milliseconds per face to predict the 5 facial poi
 5. Define `SEETA_EXPORTS` macro: (Project) Properities -> Configuration Properties -> C/C++ -> Preprocessor -> Preprocessor Definitions.
 6. Build.
 
+### Build in Linux
+
+``` 
+mkdir build
+``` 
+copy the "face detection lib" and "face_detection.h" to the directory "build" for building the test example.
+
+```
+cd build
+cmake ..
+make
+``` 
+
+If everything goes fine, move on to test the program. Note: you should copy the face detetion model [seeta_fd_frontal_v1.0.bin](../FaceDetection/model/seeta_fd_frontal_v1.0.bin) to the directory "build" before testing.
+
+```
+./fa_test
+``` 
+
 ### How to run SeetaFace Alignment
 
 This version is developed to detect five facial landmarks, i.e., two eyes' centers, nose tip and two mouth corners.

FaceAlignment/data/image_0001.png

@@ -30,7 +30,7 @@
  */
 
 #pragma once
-#include "math.h"
+#include <cmath>
 #include "sift.h"
 #include "common.h"
 

FaceAlignment/include/cfan.h

@@ -32,6 +32,7 @@
 #ifndef SEETA_FACE_ALIGNMENT_H_
 #define SEETA_FACE_ALIGNMENT_H_
 
+#include <cstdlib>
 #include "common.h"
 class CCFAN;
 

FaceAlignment/include/face_alignment.h

@@ -31,8 +31,7 @@
 
 
 #include "cfan.h"
-
-using namespace std;
+#include <string.h>
 
 /** A constructor.
   *  Initialize basic parameters.
@@ -168,10 +167,10 @@ void CCFAN::FacialPointLocate(const unsigned char *gray_im, int im_width, int im
   float extend_revised_y = 0.05;
 
   /*Compute the extended region of the detected face*/
-  int extend_lx = max(floor(left_x - extend_factor*bbox_w), 0);
-  int extend_rx = min(floor(right_x + extend_factor*bbox_w), im_width - 1);
-  int extend_ly = max(floor(left_y - (extend_factor - extend_revised_y)*bbox_h), 0);
-  int extend_ry = min(floor(right_y + (extend_factor + extend_revised_y)*bbox_h), im_height - 1);
+  int extend_lx = std::max(floor(left_x - extend_factor*bbox_w), double(0));
+  int extend_rx = std::min(floor(right_x + extend_factor*bbox_w), double(im_width - 1));
+  int extend_ly = std::max(floor(left_y - (extend_factor - extend_revised_y)*bbox_h), double(0));
+  int extend_ry = std::min(floor(right_y + (extend_factor + extend_revised_y)*bbox_h), double(im_height - 1));
 
   int face_w = extend_rx - extend_lx + 1;
   int face_h = extend_ry - extend_ly + 1;
@@ -206,7 +205,7 @@ void CCFAN::FacialPointLocate(const unsigned char *gray_im, int im_width, int im
   {
     for (int j = 0; j < pts_num_; j++)
     {
-      if (_isnan(fea[j * 128 + i]))
+      if (isnan(fea[j * 128 + i]))
       {
         re_fea[i*pts_num_ + j] = 0;
       }
@@ -282,7 +281,7 @@ void CCFAN::FacialPointLocate(const unsigned char *gray_im, int im_width, int im
   {
     for (int j = 0; j < pts_num_; j++)
     {
-      if (_isnan(fea[j * 128 + i]))
+      if (isnan(fea[j * 128 + i]))
       {
         re_fea[i*pts_num_ + j] = 0;
       }
@@ -394,10 +393,10 @@ void CCFAN::GetSubImg(const unsigned char *gray_im, int im_width, int im_height,
   memset(sub_img, 128, patch_size*patch_size);
   int center_x = floor(point_x + 0.5);
   int center_y = floor(point_y + 0.5);
-  int patch_left = max((center_x + 1) - patch_size / 2, 0);
-  int patch_right = min((center_x + 1) + patch_size / 2 - 1, im_width - 1);
-  int patch_top = max((center_y + 1) - patch_size / 2, 0);
-  int patch_bottom = min((center_y + 1) + patch_size / 2 - 1, im_height - 1);
+  int patch_left = std::max((center_x + 1) - patch_size / 2, 0);
+  int patch_right = std::min((center_x + 1) + patch_size / 2 - 1, im_width - 1);
+  int patch_top = std::max((center_y + 1) - patch_size / 2, 0);
+  int patch_bottom = std::min((center_y + 1) + patch_size / 2 - 1, im_height - 1);
 
   int lx = abs(patch_left - ((center_x + 1) - patch_size / 2));
   int rx = patch_size - abs(patch_right - ((center_x + 1) + patch_size / 2 - 1)) - 1;

FaceAlignment/src/cfan.cpp

@@ -31,6 +31,7 @@
  */
 
 #include "sift.h"
+#include <string.h>
 
 #define pi 3.1415926
 double SIFT::delta_gauss_x[25] = 

FaceAlignment/src/sift.cpp

@@ -50,17 +50,17 @@ int main(int argc, char** argv)
   detector.SetWindowStep(4, 4);
 
   // Initialize face alignment model 
-  seeta::FaceAlignment point_detector("seeta_fa_v1.1.bin");
+  seeta::FaceAlignment point_detector("../model/seeta_fa_v1.1.bin");
 
   //load image
   IplImage *img_grayscale = NULL;
-  img_grayscale = cvLoadImage("image_0001.png", 0);
+  img_grayscale = cvLoadImage("../data/image_0001.png", 0);
   if (img_grayscale == NULL)
   {
     return 0;
   }
 
-  IplImage *img_color = cvLoadImage("image_0001.png", 1);
+  IplImage *img_color = cvLoadImage("../data/image_0001.png", 1);
   int pts_num = 5;
   int im_width = img_grayscale->width;
   int im_height = img_grayscale->height;