Merge branch 'yw.1.2' into yangwu1.3

pansen

2019-04-03 adb08adc83dfe9dc5d6170c2322952d77a93c510

 QiaoJiaSystem/VideoToImage/main.cpp

@@ -27,12 +27,12 @@

int main(int argc, char **argv) {
    SAVE_APP_ARGS

    std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
#ifdef GLOG
        ENABLEGLOG(GET_STR_CONFIG("logPath").c_str());
#endif

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