From 9bbbe29c81aa9cd183e840232f2bd973937d1ef4 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期二, 15 一月 2019 17:17:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ywv1.2' into ywv1.2
---
QiaoJiaSystem/StructureApp/HiredisTool.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/StructureApp/HiredisTool.cpp b/QiaoJiaSystem/StructureApp/HiredisTool.cpp
index 2094325..a54a9bd 100644
--- a/QiaoJiaSystem/StructureApp/HiredisTool.cpp
+++ b/QiaoJiaSystem/StructureApp/HiredisTool.cpp
@@ -109,12 +109,12 @@
std::string content;
cv::Mat imgTep;
-
listRpop(file_name,content);
Json::Reader reader;
Json::Value value;
+
if(!reader.parse(content,value))
{
return ;
@@ -124,9 +124,12 @@
std::vector<uchar> data;
data.resize(str.size());
+
data.assign(str.begin(),str.end());
+
CvUtil::buffer2CvMat(data,imgTep);
- imgTep.copyTo(img);
+
+ imgTep.copyTo(img);
// return img;
}
--
Gitblit v1.8.0