From 25f94726888e19d6efed7b393217d9f56a0ca767 Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期五, 15 三月 2019 18:44:46 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug
---
QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp b/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
index 9b9fe3a..fa5f80a 100644
--- a/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
+++ b/QiaoJiaSystem/FaceSearchServer/CasiaFaceWrapper/CasiaFaceWrapperN.cpp
@@ -13,8 +13,8 @@
std::atomic_int CasiaFaceWrapperN::instanceCount(0);
CasiaFaceWrapperN::CasiaFaceWrapperN() {
- threadMax = appPref.getLongData("thread.max");
-// long gpuIndex = appPref.getLongData("gpu.index");
+ threadMax = appPref.getIntData("thread.max");
+// long gpuIndex = appPref.getIntData("gpu.index");
// for(int i = 0;i<threadMax;i++){
// resourcesManager.pushResource(i);
// }
--
Gitblit v1.8.0