From adb08adc83dfe9dc5d6170c2322952d77a93c510 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期三, 03 四月 2019 09:54:33 +0800
Subject: [PATCH] Merge branch 'yw.1.2' into yangwu1.3
---
QiaoJiaSystem/PerimeterAlarm/main.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/PerimeterAlarm/main.cpp b/QiaoJiaSystem/PerimeterAlarm/main.cpp
index d54f890..868ca18 100644
--- a/QiaoJiaSystem/PerimeterAlarm/main.cpp
+++ b/QiaoJiaSystem/PerimeterAlarm/main.cpp
@@ -9,7 +9,7 @@
int main(int argc, char **argv) {
SAVE_APP_ARGS;
-
+ std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
#ifdef GLOG
ENABLEGLOG("./log/");
#endif
@@ -18,7 +18,7 @@
std::string src_path = "/home/basic/瑙嗛/test";
- appPref.setLongData("gpu.index", 0);
+ appPref.setIntData("gpu.index", 0);
appPref.setIntData("show.image", 1);
//yolo server
--
Gitblit v1.8.0