Merge remote-tracking branch 'origin/1.3nsq' into 1.3nsq

pans

2019-04-16 051c6863dd418c9cfbca787e449fbdeadde977c7

 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);
    }
@@ -50,5 +50,6 @@
        ERR("shareMemory attach faild");
//        throw std::runtime_error("shareMemory attach faild");
    }
    return feature;

}