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

pansen

2019-01-15 9bbbe29c81aa9cd183e840232f2bd973937d1ef4

 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;

}