Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/FaceDetectServer/FaceExtractServerI.cpp

@@ -6,8 +6,8 @@
#include <THFeature_i.h>

FaceExtractServerI::FaceExtractServerI() {
    long threadMax = appPref.getLongData("thread.max");
    long gpuIndex = appPref.getLongData("gpu.index");
    long threadMax = appPref.getIntData("thread.max");
    long gpuIndex = appPref.getIntData("gpu.index");
    for (int i = 0; i < threadMax; i++) {
        extractResourcesManager.pushResource(i);
    }