add sth

tkorays · May 23, 2014 · 363867e · 363867e
1 parent 782309e
commit 363867e
Show file tree

Hide file tree

Showing 12 changed files with 213 additions and 156 deletions.
diff --git a/.gitignore b/.gitignore
@@ -155,7 +155,7 @@ $RECYCLE.BIN/
 # Mac desktop service store files
 .DS_Store
 /FaceStorage_Test/face_hist.xml
-
+ext/cxxlib/
 *~
 *.swp
 *.swap
diff --git a/FaceStorage_Test/FaceStorage_Test.vcxproj.filters b/FaceStorage_Test/FaceStorage_Test.vcxproj.filters
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ext\tinyxml\tinystr.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinyxml.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinyxmlerror.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinyxmlparser.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="main.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\ext\tinyxml\tinystr.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ext\tinyxml\tinyxml.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\FaceStorage.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\FaceStorage_impl.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\FaceRecog.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\FaceRecog_impl.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\FrAdapter.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\CvFrAdapter.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\face\CvFrAdapter_impl.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="源文件">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="头文件">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="资源文件">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\ext\tinyxml\tinystr.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinyxml.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinyxmlerror.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinyxmlparser.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="main.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\ext\tinyxml\tinystr.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\tinyxml\tinyxml.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\FaceStorage.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\FaceStorage_impl.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\FaceRecog.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\FaceRecog_impl.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\FrAdapter.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\CvFrAdapter.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\face\CvFrAdapter_impl.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/face/CvFrAdapter.h b/face/CvFrAdapter.h
@@ -5,9 +5,9 @@
 #include "FrAdapter.h"
 #include "FaceStorage.h"
 
-#include <opencv2\core\core.hpp>
-#include <opencv2\highgui\highgui.hpp>
-#include <opencv2\contrib\contrib.hpp>
+#include <opencv2/core/core.hpp>
+#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/contrib/contrib.hpp>
 using namespace cv;
 
 // 使用opencv的人脸识别
@@ -33,4 +33,4 @@ class CvFrAdapter : public FrAdapter {
 
 #include "CvFrAdapter_impl.h"
 
-#endif // _TK_CVFRADAPTER_H_
+#endif // _TK_CVFRADAPTER_H_
diff --git a/face/FaceRecog.h b/face/FaceRecog.h
@@ -5,7 +5,7 @@
 using namespace std;
 
 
-#include <opencv2\core\core.hpp>
+#include <opencv2/core/core.hpp>
 using namespace cv;
 #include "FrAdapter.h"
 
@@ -23,4 +23,4 @@ class FaceRecog {
 
 #include "FaceRecog_impl.h"
 
-#endif // _TK_FACERECOG_H_
+#endif // _TK_FACERECOG_H_
diff --git a/face/FrAdapter.h b/face/FrAdapter.h
@@ -2,7 +2,7 @@
 #define _TK_FRADAPTER_H_
 #pragma once
 
-#include <opencv2\core\core.hpp>
+#include <opencv2/core/core.hpp>
 
 // ÊÊÅäÆ÷µÄ½Ó¿Ú
 class FrAdapter {
@@ -13,4 +13,4 @@ class FrAdapter {
 	virtual string getNameById(int id) = 0;
 };
 
-#endif // _TK_FRADAPTER_H_
+#endif // _TK_FRADAPTER_H_
diff --git a/face_recog_demo/face_recog_demo.vcxproj.filters b/face_recog_demo/face_recog_demo.vcxproj.filters
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="源文件">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="头文件">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="资源文件">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="face_recog.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinystr.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinyxml.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinyxmlerror.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ext\tinyxml\tinyxmlparser.cpp">
-      <Filter>源文件</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="lib_helper.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ext\tinyxml\tinystr.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ext\tinyxml\tinyxml.h">
-      <Filter>头文件</Filter>
-    </ClInclude>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="源文件">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="头文件">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="资源文件">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="face_recog.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinystr.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinyxml.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinyxmlerror.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+    <ClCompile Include="..\ext\tinyxml\tinyxmlparser.cpp">
+      <Filter>源文件</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="lib_helper.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\tinyxml\tinystr.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ext\tinyxml\tinyxml.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
diff --git a/fr_demo_linux/a.out b/fr_demo_linux/a.out
diff --git a/fr_demo_linux/cpl.sh b/fr_demo_linux/cpl.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+g++ -std=c++11 `pkg-config --cflags opencv`  -o fr \
+	./fr.cpp ../ext/tinyxml/tinystr.cpp ../ext/tinyxml/tinyxml.cpp \
+	../ext/tinyxml/tinyxmlerror.cpp ../ext/tinyxml/tinyxmlparser.cpp \
+	`pkg-config --libs opencv`
diff --git a/fr_demo_linux/fr b/fr_demo_linux/fr
diff --git a/fr_demo_linux/fr.cpp b/fr_demo_linux/fr.cpp
@@ -0,0 +1,51 @@
+/*
+ * =====================================================================================
+ *
+ *       Filename:  fr.cpp
+ *
+ *    Description:  face recognition
+ *
+ *        Version:  1.0
+ *        Created:  2014年05月23日 13时32分42秒
+ *       Revision:  none
+ *       Compiler:  gcc
+ *
+ *         Author:  tkorays (tk), [email protected]
+ *   Organization:  
+ *
+ * =====================================================================================
+ */
+//#include <opencv/core/core.h>
+//#include <opencv/highgui.h>
+//#include <opencv/contrib/contrib.h>
+//using namespace cv;
+
+#include "../face/FaceRecog.h"
+#include "../face/CvFrAdapter.h"
+
+#include <iostream>
+using namespace std;
+
+void check_status(bool status,string msg){
+	if(!status){
+		cout<<msg<<endl;
+		exit(0);
+	}
+}
+
+int main(int argc,char** argv){
+	string dir_prefix = "/home/tkorays/pic/face_data/";
+	FaceRecog fr;
+
+	CvFrAdapter cvfr;
+	cvfr.setFaceStorage(dir_prefix+"face_list.xml");
+	fr.setFrClass(&cvfr);
+
+	bool status = fr.train();
+	check_status(status,"Train failed...");
+
+	int ret = fr.pridect(imread(dir_prefix+"xujian/small/9.jpg",CV_LOAD_IMAGE_GRAYSCALE));
+	cout<<"The guy is: "+fr.getNameById(ret)<<endl;
+
+	return 0;
+}
diff --git a/fr_demo_linux/test b/fr_demo_linux/test