From 24b4bc79b938c3ffc14d0abe314d59301fa90964 Mon Sep 17 00:00:00 2001
From: chriskong93 <609027949@qq.com>
Date: Tue, 14 Jul 2020 17:03:11 +0800
Subject: [PATCH] update

---
 .gitattributes  | 0
 .gitignore      | 2 --
 CMakeLists.txt  | 2 --
 Onet.txt        | 0
 Pnet.txt        | 0
 README.md       | 0
 Rnet.txt        | 0
 src/facenet.cpp | 0
 src/facenet.h   | 0
 src/mtcnn.cpp   | 0
 src/mtcnn.h     | 0
 src/network.cpp | 0
 src/network.h   | 0
 src/pBox.cpp    | 0
 src/pBox.h      | 0
 src/pikaqiu.cpp | 7 +++----
 16 files changed, 3 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 .gitattributes
 mode change 100755 => 100644 .gitignore
 mode change 100755 => 100644 CMakeLists.txt
 mode change 100755 => 100644 Onet.txt
 mode change 100755 => 100644 Pnet.txt
 mode change 100755 => 100644 README.md
 mode change 100755 => 100644 Rnet.txt
 mode change 100755 => 100644 src/facenet.cpp
 mode change 100755 => 100644 src/facenet.h
 mode change 100755 => 100644 src/mtcnn.cpp
 mode change 100755 => 100644 src/mtcnn.h
 mode change 100755 => 100644 src/network.cpp
 mode change 100755 => 100644 src/network.h
 mode change 100755 => 100644 src/pBox.cpp
 mode change 100755 => 100644 src/pBox.h
 mode change 100755 => 100644 src/pikaqiu.cpp

diff --git a/.gitattributes b/.gitattributes
old mode 100755
new mode 100644
diff --git a/.gitignore b/.gitignore
old mode 100755
new mode 100644
index 35f9474..815a19d
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,7 @@
 .idea/
 cmake-build-debug/
-cmake-build-debug-mingw/
 cmake-build-default/
 cmake-build-release/
-cmake-build-release-mingw/
 images/
 model/
 model_128/
diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755
new mode 100644
index c629ef8..b1c2ebb
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,6 @@ set(QMAKE_CXXFLAGS "-std=c++11")
 find_package(OpenCV REQUIRED)
 
 #set(CMAKE_BUILD_TYPE Debug)
-
 AUX_SOURCE_DIRECTORY(./src DIR_SRCS)
 add_executable(main ${DIR_SRCS})
-#windows下为了自动找到opencv 需要添加环境变量OpenCV_DIR D:/opencv/build/
 target_link_libraries(main ${OpenCV_LIBS})
diff --git a/Onet.txt b/Onet.txt
old mode 100755
new mode 100644
diff --git a/Pnet.txt b/Pnet.txt
old mode 100755
new mode 100644
diff --git a/README.md b/README.md
old mode 100755
new mode 100644
diff --git a/Rnet.txt b/Rnet.txt
old mode 100755
new mode 100644
diff --git a/src/facenet.cpp b/src/facenet.cpp
old mode 100755
new mode 100644
diff --git a/src/facenet.h b/src/facenet.h
old mode 100755
new mode 100644
diff --git a/src/mtcnn.cpp b/src/mtcnn.cpp
old mode 100755
new mode 100644
diff --git a/src/mtcnn.h b/src/mtcnn.h
old mode 100755
new mode 100644
diff --git a/src/network.cpp b/src/network.cpp
old mode 100755
new mode 100644
diff --git a/src/network.h b/src/network.h
old mode 100755
new mode 100644
diff --git a/src/pBox.cpp b/src/pBox.cpp
old mode 100755
new mode 100644
diff --git a/src/pBox.h b/src/pBox.h
old mode 100755
new mode 100644
diff --git a/src/pikaqiu.cpp b/src/pikaqiu.cpp
old mode 100755
new mode 100644
index ec9f48d..cdf129d
--- a/src/pikaqiu.cpp
+++ b/src/pikaqiu.cpp
@@ -226,8 +226,8 @@ void test_facenet(Mat &image, vector<Rect> &vecRect, vector<mydataFmt> &n) {
  * 对比两张图两个人的emb
  */
 void test() {
-    Mat image0 = imread("../test_img/jason0.jpeg");
-    Mat image1 = imread("../test_img/jason1.jpeg");
+    Mat image0 = imread("../test_img/tom1.jpeg");
+    Mat image1 = imread("../test_img/tom0.jpeg");
     image0 = RS(image0);
     image1 = RS(image1);
 
@@ -270,8 +270,7 @@ void test() {
     start = clock() - start;
     //    cout<<"time is  "<<start/10e3<<endl;
     cout << "time is " << (double) start / CLOCKS_PER_SEC * 1000 << "ms" << endl;
-    waitKey(0);
-//    waitKey(5000);
+    waitKey(5000);
     image0.release();
     image1.release();
 }