Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

pansen

2019-01-10 0436e5443295395025f89f0d091aab1e9551d1a4

Merge branch 'ywv1.2' of ssh://192.168.1.226:29418/development/c++ into ywv1.2

# Conflicts:
#	QiaoJiaSystem/build/YoloServer

 QiaoJiaSystem/YoloServer/YoloDetectServerI.cpp

@@ -35,6 +35,9 @@
        //printf("Predicted in %f seconds.\n", what_time_is_it_now()-attime);
        int nboxes = 0;
        detection *dets = get_network_boxes(m_net, im.w, im.h, m_thresh, m_hier_thresh, 0, 1, &nboxes);
        if (nboxes > 30) {
            return objInfos;
        }
        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++) {

 QiaoJiaSystem/build/FaceDetectResourcesTest

Binary files differ

 QiaoJiaSystem/build/RapidStructureApp

Binary files differ

 QiaoJiaSystem/build/RapidStructureAppRtsp

Binary files differ

 QiaoJiaSystem/build/RecordVideo

Binary files differ

 QiaoJiaSystem/build/TestCilent

Binary files differ

 QiaoJiaSystem/build/config.db

Binary files differ