派生自 development/c++
parent: be058e6b | 补丁 | 提交 | show whitespace
pansen
2018-12-17 ac00f7d508e020e2e5d1a0d497f43155ed34e6a6 
解决编译错误.(yoloServer未解决)
20个文件已修改
292 ■■■■■ 已修改文件
QiaoJiaSystem/DataManagerServer/CMakeLists.txt 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceDetectServer/CMakeLists.txt 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceSearchServer/CMakeLists.txt 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/LocalDBTool/CMakeLists.txt 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/PerimeterAlarm/CMakeLists.txt 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/PerimeterElement.cpp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/PerimeterElement.h 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/StructureApp/YoloRpcElement.cpp 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/VideoServer/CMakeLists.txt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/YoloServer/CMakeLists.txt 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp 44 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/DataWebServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceDetectServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceExtractServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/FaceSearchServer 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/StructureApp 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/VideoAnalysFromHC 补丁 | 查看 | 原始文档 | blame | 历史
QiaoJiaSystem/build/syncDBClient 补丁 | 查看 | 原始文档 | blame | 历史 
 QiaoJiaSystem/DataManagerServer/CMakeLists.txt


@@ -36,7 +36,7 @@


    ../../../BasicPlatForm/libs/libuuid/include


    ../../../BasicPlatForm/libs/uniview/include




    ../../../Erlang/syncDBTool


    ../../syncDBTool




    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/incCn




@@ -54,28 +54,28 @@




link_directories(


    #glog


    ../../BasicPlatForm/libs/glog/lib


    ../../../BasicPlatForm/libs/glog/lib




    /usr/lib/erlang/lib/erl_interface-3.8.2/lib/


    /usr/local/cuda/lib64




    ../../BasicPlatForm/libs/opencv/lib


    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu


    ../../BasicPlatForm/libs/crul/lib


    ../../BasicPlatForm/libs/FastDFS/lib


    ../../BasicPlatForm/libs/jsoncpp/lib


    ../../BasicPlatForm/libs/ffmpeg/lib


    ../../BasicPlatForm/libs/libuuid/lib


    ../../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/cpu


    ../../../BasicPlatForm/libs/crul/lib


    ../../../BasicPlatForm/libs/FastDFS/lib


    ../../../BasicPlatForm/libs/jsoncpp/lib


    ../../../BasicPlatForm/libs/ffmpeg/lib


    ../../../BasicPlatForm/libs/libuuid/lib




    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/


    ../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/


    ../../BasicPlatForm/libs/uniview/lib


    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/


    ../../../BasicPlatForm/libs/hcTool/HCNetSDK64/lib/HCNetSDKCom/


    ../../../BasicPlatForm/libs/uniview/lib




    ../../BasicPlatForm/libs/libboost/lib


    ../../../BasicPlatForm/libs/libboost/lib






    ../../BasicPlatForm/basic/db/sqlite/


    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000


    ../../../BasicPlatForm/basic/db/sqlite/


    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000


)




add_executable(DataWebServer




 QiaoJiaSystem/FaceDetectServer/CMakeLists.txt


@@ -21,28 +21,28 @@


    )


include_directories(


    ./rpc


    ../../BasicPlatForm


    ../../BasicPlatForm/libs/opencv/include


    ../../BasicPlatForm/libs/jsoncpp/include


    ../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../BasicPlatForm/libs/ffmpeg/include


    ../../BasicPlatForm/wrapper/casia/include


    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include


    ../../../BasicPlatForm


    ../../../BasicPlatForm/libs/opencv/include


    ../../../BasicPlatForm/libs/jsoncpp/include


    ../../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../../BasicPlatForm/libs/ffmpeg/include


    ../../../BasicPlatForm/wrapper/casia/include


    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include


    /usr/include/x86_64-linux-gnu/qt5


    #glog


    ../../BasicPlatForm/libs/glog/include


    ../../../BasicPlatForm/libs/glog/include


)




link_directories(


    #glog


    ../../BasicPlatForm/libs/glog/lib


    ../../BasicPlatForm/libs/jsoncpp/lib


    ../../../BasicPlatForm/libs/glog/lib


    ../../../BasicPlatForm/libs/jsoncpp/lib


    /usr/local/cuda/lib64


    ../../BasicPlatForm/libs/openssl/lib/


    ../../BasicPlatForm/libs/Ice-3.7.0/lib64


    ../../BasicPlatForm/libs/openssl/lib


    ../../BasicPlatForm/libs/opencv/lib


    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu


    ../../../BasicPlatForm/libs/openssl/lib/


    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64


    ../../../BasicPlatForm/libs/openssl/lib


    ../../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/lib/gpu


)




add_executable(${PROJECT_NAME}




 QiaoJiaSystem/FaceSearchServer/CMakeLists.txt


@@ -32,31 +32,31 @@


    ./CasiaFaceWrapper




    #glog


    ../../BasicPlatForm/libs/glog/include


    ../../../BasicPlatForm/libs/glog/include


    ../LocalDBTool


    ../../BasicPlatForm


    ../../BasicPlatForm/libs/crul/include


    ../../BasicPlatForm/libs/opencv/include


    ../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../BasicPlatForm/libs/ffmpeg/include


    ../../BasicPlatForm/libs/Casia_Face/FaceSdk/include


    ../../../BasicPlatForm


    ../../../BasicPlatForm/libs/crul/include


    ../../../BasicPlatForm/libs/opencv/include


    ../../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../../BasicPlatForm/libs/ffmpeg/include


    ../../../BasicPlatForm/libs/Casia_Face/FaceSdk/include


    #    ../../BasicPlatForm/libs/erlang/erl_interface/include






    ../../BasicPlatForm/libs/jsoncpp/include


    ../../BasicPlatForm/libs/crul/include


    ../../BasicPlatForm/libs/libuuid/include/


    ../../BasicPlatForm/basic/util/curl/


    ../../BasicPlatForm/basic/util/ShareMemory/


    ../../BasicPlatForm/basic/db/Elasticsearch/


    ../../BasicPlatForm/wrapper/casia/include


    ../../BasicPlatForm/libs/libboost/include


    ../../../BasicPlatForm/libs/jsoncpp/include


    ../../../BasicPlatForm/libs/crul/include


    ../../../BasicPlatForm/libs/libuuid/include/


    ../../../BasicPlatForm/basic/util/curl/


    ../../../BasicPlatForm/basic/util/ShareMemory/


    ../../../BasicPlatForm/basic/db/Elasticsearch/


    ../../../BasicPlatForm/wrapper/casia/include


    ../../../BasicPlatForm/libs/libboost/include






    ../../../Erlang/syncDBTool/


    ../../syncDBTool/




    ../../BasicPlatForm/basic/db/sqlite/


    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000


    ../../../BasicPlatForm/basic/db/sqlite/


    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000




    /usr/include/x86_64-linux-gnu/qt5


    /usr/include/x86_64-linux-gnu/qt5/QtCore/




 QiaoJiaSystem/FaceSearchServer/LoadFeaTool/CMakeLists.txt


@@ -11,7 +11,7 @@


    ../../../../BasicPlatForm/libs/glog/include


    ../../../../BasicPlatForm/libs/jsoncpp/include


    ../../../../BasicPlatForm/basic/util/ShareMemory/


    ../../../../Erlang/syncDBTool


    ../../../syncDBTool


)




link_directories(


@@ -31,6 +31,8 @@


target_link_libraries(


    syncDBClient


    glog


    Qt5Core


    Qt5Sql


    ei


    erl_interface_st


    ei_st




 QiaoJiaSystem/LocalDBTool/CMakeLists.txt


@@ -13,16 +13,16 @@


include_directories(


    ./




    ../../BasicPlatForm


    ../../../BasicPlatForm




    ../../BasicPlatForm/basic/util/app


    ../../../BasicPlatForm/basic/util/app




    ../../BasicPlatForm/basic/db/sqlite/


    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000


    ../../../BasicPlatForm/basic/db/sqlite/


    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000




    ../../BasicPlatForm/libs/libuuid/include


    ../../BasicPlatForm/libs/glog/include


    ../../BasicPlatForm/libs/jsoncpp/include


    ../../../BasicPlatForm/libs/libuuid/include


    ../../../BasicPlatForm/libs/glog/include


    ../../../BasicPlatForm/libs/jsoncpp/include




    /usr/include/x86_64-linux-gnu/qt5


    /usr/include/x86_64-linux-gnu/qt5/QtCore/


@@ -31,10 +31,10 @@


)




link_directories(


    ../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000


    ../../BasicPlatForm/libs/libuuid/lib


    ../../BasicPlatForm/libs/glog/lib


    ../../BasicPlatForm/libs/jsoncpp/lib


    ../../../BasicPlatForm/basic/db/sqlite/sqlite-v-3220000


    ../../../BasicPlatForm/libs/libuuid/lib


    ../../../BasicPlatForm/libs/glog/lib


    ../../../BasicPlatForm/libs/jsoncpp/lib




)






 QiaoJiaSystem/PerimeterAlarm/CMakeLists.txt


@@ -22,19 +22,18 @@


 #   ../netsoundbox/rpc/NetSoundBox.cpp








#    rpc/AlarmInfo.cpp






    ../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp


    ../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp


    ../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp


    ../../BasicPlatForm/basic/util/BASE64/Base64.cpp


    ../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp


    ../../BasicPlatForm/basic/pipe/TimerElement.cpp


    ../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp


    ../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp


    ../../BasicPlatForm/basic/util/net_config/net_config.cpp


    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/FfmpegElement.cpp


    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/VideoChangeScore.cpp


    ../../../BasicPlatForm/basic/pipe_element/ImageFactoryElement.cpp


    ../../../BasicPlatForm/basic/util/BASE64/Base64.cpp


    ../../../BasicPlatForm/basic/util/fastdfs/FastdfsClient.cpp


    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp


    ../../../BasicPlatForm/basic/db/Elasticsearch/EsDBTool.cpp


    ../../../BasicPlatForm/basic/util/curl/HttpRequestWithCrul.hpp


    ../../../BasicPlatForm/basic/util/net_config/net_config.cpp


    )




SET(LIBS


@@ -74,38 +73,38 @@


#    ../Alarm/rpc






    ../../BasicPlatForm


    ../../BasicPlatForm/libs/opencv/include


    ../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../BasicPlatForm/libs/ffmpeg/include


    ../../BasicPlatForm/libs/jsoncpp/include


    ../../../BasicPlatForm


    ../../../BasicPlatForm/libs/opencv/include


    ../../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../../BasicPlatForm/libs/ffmpeg/include


    ../../../BasicPlatForm/libs/jsoncpp/include




    ../../BasicPlatForm/basic/util/net_config/


    ../../BasicPlatForm/basic/util/fastdfs/


    ../../BasicPlatForm/libs/FastDFS/include


    ../../BasicPlatForm/libs/FastDFS/include/fastdfs


    ../../BasicPlatForm/libs/FastDFS/include/fastcommon


    ../../../BasicPlatForm/basic/util/net_config/


    ../../../BasicPlatForm/basic/util/fastdfs/


    ../../../BasicPlatForm/libs/FastDFS/include


    ../../../BasicPlatForm/libs/FastDFS/include/fastdfs


    ../../../BasicPlatForm/libs/FastDFS/include/fastcommon




    ../../BasicPlatForm/basic/pipe/


    ../../BasicPlatForm/libs/crul/include


    ../../BasicPlatForm/basic/util/curl/


    ../../BasicPlatForm/libs/libuuid/include


    ../../BasicPlatForm/libs/glog/include


    ../../../BasicPlatForm/basic/pipe/


    ../../../BasicPlatForm/libs/crul/include


    ../../../BasicPlatForm/basic/util/curl/


    ../../../BasicPlatForm/libs/libuuid/include


    ../../../BasicPlatForm/libs/glog/include


    /usr/include/x86_64-linux-gnu/qt5


)




link_directories(


    /usr/local/cuda/lib64


    ../../BasicPlatForm/libs/Ice-3.7.0/lib64


    ../../BasicPlatForm/libs/openssl/lib


    ../../BasicPlatForm/libs/opencv/lib


    ../../BasicPlatForm/libs/ffmpeg/lib


    ../../BasicPlatForm/libs/jsoncpp/lib


    ../../BasicPlatForm/libs/FastDFS/lib


    ../../BasicPlatForm/libs/libuuid/lib


    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64


    ../../../BasicPlatForm/libs/openssl/lib


    ../../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/ffmpeg/lib


    ../../../BasicPlatForm/libs/jsoncpp/lib


    ../../../BasicPlatForm/libs/FastDFS/lib


    ../../../BasicPlatForm/libs/libuuid/lib




    ../../BasicPlatForm/libs/glog/lib


    ../../BasicPlatForm/libs/crul/lib


    ../../../BasicPlatForm/libs/glog/lib


    ../../../BasicPlatForm/libs/crul/lib


)




add_executable(${PROJECT_NAME}




 QiaoJiaSystem/StructureApp/PerimeterElement.cpp


@@ -1,5 +1,5 @@


#include "PerimeterElement.h"


#include <basic/event/EventBus.hpp>


//#include <basic/event/EventBus.hpp>


#include <basic/debug/Debug.h>


#include <iostream>


#include <opencv2/opencv.hpp>




 QiaoJiaSystem/StructureApp/PerimeterElement.h


@@ -1,7 +1,8 @@


#ifndef PERIMETERELEMENT


#define PERIMETERELEMENT




#include <basic/pipe/PipeElement.h>


#include <basic/event/EventHandler.hpp>


//#include <basic/event/EventHandler.hpp>


#include <opencv2/opencv.hpp>


#include <Ice/Ice.h>


#include <YoloServer.h>


@@ -10,15 +11,17 @@


#include <QJsonArray>


#include <RapidStructureApp/TriggerElement.h>


#include <basic/util/fastdfs/FastFds.hpp>


class PerimeterElement : public basic::PipeElement


{




class PerimeterElement : public basic::PipeElement {


public:


    PerimeterElement(int alarm_people_num=1);




public:


    ~PerimeterElement();




    //是否有矩形


    bool hasRects();




    //设置ROI区域


    void setMask(std::string mask);




@@ -60,7 +63,6 @@


    std::string uploadImgToFdfs(cv::Mat& image);




    bool saveInfoToEs(const std::string& imgUrl,const ::YoloDetect::ObjInfo& obj);








private:




 QiaoJiaSystem/StructureApp/YoloRpcElement.cpp


@@ -10,7 +10,6 @@


#include <uuid/uuid.h>


#include <jsoncpp/json/json.h>




#include <basic/db/ES/es/ManagerEsDB.h>


#include <QtCore/QJsonDocument>


#include <QtCore/QJsonObject>






 QiaoJiaSystem/VideoServer/CMakeLists.txt


@@ -16,14 +16,14 @@


    /usr/include/x86_64-linux-gnu/qt5/QtCore/


    /usr/include/x86_64-linux-gnu/qt5/QtSql/




    ../../BasicPlatForm/


    ../../../BasicPlatForm/


    ./QiaoJia/DB


    ./QiaoJia/dispatchTool


)




link_directories(


    /usr/local/cuda/lib64


    ../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/opencv/lib


    )




add_executable(${PROJECT_NAME}




 QiaoJiaSystem/YoloServer/CMakeLists.txt


@@ -22,43 +22,43 @@


    )


include_directories(


    ./rpc


    ../../BasicPlatForm


    ../../BasicPlatForm/libs/opencv/include


    ../../BasicPlatForm/libs/jsoncpp/include


    ../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../BasicPlatForm/libs/ffmpeg/include


    ../../BasicPlatForm/libs/DarkNet/include


    ../../../BasicPlatForm


    ../../../BasicPlatForm/libs/opencv/include


    ../../../BasicPlatForm/libs/jsoncpp/include


    ../../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../../BasicPlatForm/libs/ffmpeg/include


    ../../../BasicPlatForm/libs/DarkNet/include


    /usr/local/cuda/include/


    /usr/include/x86_64-linux-gnu/qt5




    #glog


    ../../BasicPlatForm/libs/glog/include


    ../../../BasicPlatForm/libs/glog/include


)




link_directories(


    /usr/local/cuda/lib64


    ../../BasicPlatForm/libs/jsoncpp/lib


    ../../BasicPlatForm/libs/openssl/lib/


    ../../BasicPlatForm/libs/Ice-3.7.0/lib64


    ../../BasicPlatForm/libs/opencv/lib


    ../../BasicPlatForm/libs/DarkNet/lib


    ../../../BasicPlatForm/libs/jsoncpp/lib


    ../../../BasicPlatForm/libs/openssl/lib/


    ../../../BasicPlatForm/libs/Ice-3.7.0/lib64


    ../../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/DarkNet/lib


    #glog


    ../../BasicPlatForm/libs/glog/lib


    ../../../BasicPlatForm/libs/glog/lib


)




link_directories(


    /usr/local/cuda/lib64


    ../../BasicPlatForm/libs/opencv/lib


    ../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../BasicPlatForm/libs/DarkNet


    ../../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../../BasicPlatForm/libs/DarkNet


)




link_directories(


    /usr/local/cuda/lib64


    ../../BasicPlatForm/libs/opencv/lib


    ../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../BasicPlatForm/libs/DarkNet/lib


    ../../BasicPlatForm/libs/ffmpeg/lib


    ../../../BasicPlatForm/libs/opencv/lib


    ../../../BasicPlatForm/libs/Ice-3.7.0/include


    ../../../BasicPlatForm/libs/DarkNet/lib


    ../../../BasicPlatForm/libs/ffmpeg/lib


)




add_executable(${PROJECT_NAME}




 QiaoJiaSystem/YoloServer/YoloDetectClientTest.cpp


@@ -53,7 +53,7 @@


    ImageDrawElement m_imageDrawElement;


};




using namespace std;


//using namespace std;


int main(int argc, char *argv[])


{


    SAVE_APP_ARGS




 QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp


@@ -5,16 +5,15 @@


#include <QtCore/QSharedMemory>


#include <basic/timer_counter/Clocktimer.h>




YoloDetectServerI::YoloDetectServerI():m_thresh(0.5),m_hier_thresh(0.5),m_nms(0.5),names(nullptr),alphabet(nullptr),


    m_thdInit(init,this),m_bInitThd(false)


{


YoloDetectServerI::YoloDetectServerI() : m_thresh(0.5), m_hier_thresh(0.5), m_nms(0.5), names(nullptr),


                                         alphabet(nullptr),


                                         m_thdInit(init, this), m_bInitThd(false) {


}




YoloDetectServerI::~YoloDetectServerI()


{}


YoloDetectServerI::~YoloDetectServerI() {}




::YoloDetect::ObjInfos YoloDetectServerI::YoloDetect(::Ice::Int w, ::Ice::Int h, const ::std::string& shM, const ::Ice::Current&)


{


::YoloDetect::ObjInfos


YoloDetectServerI::YoloDetect(::Ice::Int w, ::Ice::Int h, const ::std::string &shM, const ::Ice::Current &) {


    ClockTimer ct("YoloDetectServerI::YoloDetect");


    ::YoloDetect::ObjInfos objInfos;


    if(!m_bInitThd) return objInfos;


@@ -38,8 +37,7 @@


        detection *dets = get_network_boxes(m_net, im.w, im.h, m_thresh, m_hier_thresh, 0, 1, &nboxes);


        if (m_nms) do_nms_sort(dets, nboxes, l.classes, m_nms);


        //  draw_detections(im, dets, nboxes, m_thresh, names, alphabet, l.classes);


        for(int i=0;i<nboxes;i++)


        {


        for (int i = 0; i < nboxes; i++) {


            ::YoloDetect::ObjInfo objInfo;


            std::vector<float> vec(80);


            memcpy(&vec[0],dets[i].prob,sizeof(float)*80);


@@ -81,8 +79,7 @@


    return objInfos;


}




int YoloDetectServerI::init(void* arg)


{


int YoloDetectServerI::init(void *arg) {


    YoloDetectServerI* p = (YoloDetectServerI*)arg;




    p->m_thresh = appPref.getFloatData("thresh.detect");


@@ -107,10 +104,26 @@


    return 0;


}




cv::Mat YoloDetectServerI::bufferToMat(const int w,const int h,const int channels,const void* buffer)


{


cv::Mat YoloDetectServerI::bufferToMat(const int w, const int h, const int channels, const void *buffer) {


    int nType = -1;


    switch(channels){case 1:{nType=CV_8UC1;break;}case 2:{nType=CV_8UC2;break;}case 3:{nType=CV_8UC3;break;}default:{nType=CV_8UC3;break;}}


    switch (channels) {


        case 1: {


            nType = CV_8UC1;


            break;


        }


        case 2: {


            nType = CV_8UC2;


            break;


        }


        case 3: {


            nType = CV_8UC3;


            break;


        }


        default: {


            nType = CV_8UC3;


            break;


        }


    }


    cv::Mat mat(h,w,nType,(void*)buffer);


    return mat;


}


@@ -157,8 +170,7 @@


    return im;


}




YoloDetect::stringData YoloDetectServerI::getCocoData(const Ice::Current &)


{


YoloDetect::stringData YoloDetectServerI::getCocoData(const Ice::Current &) {


    YoloDetect::stringData retval;


    std::fstream fs("./data/coco.names");


    std::string str;




 QiaoJiaSystem/build/DataWebServer

Binary files differ



 QiaoJiaSystem/build/FaceDetectServer

Binary files differ



 QiaoJiaSystem/build/FaceExtractServer

Binary files differ



 QiaoJiaSystem/build/FaceSearchServer

Binary files differ



 QiaoJiaSystem/build/StructureApp

Binary files differ



 QiaoJiaSystem/build/VideoAnalysFromHC

Binary files differ



 QiaoJiaSystem/build/syncDBClient

Binary files differ