Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2

zhangjixing

2019-01-15 fa7e820c7715eb9294c9bae62c6f75fd3bda4f0d

 QiaoJiaSystem/VideoAnalysFromHC/main.cpp

@@ -66,7 +66,10 @@

int main(int argc, char **argv) {
    SAVE_APP_ARGS
    ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());

#ifdef GLOG
        ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
#endif

    appPref.setLongData("gpu.index", 0);
    appPref.setIntData("show.image", 0);