Subversion Repositories seema-scanner

Rev

Rev 21 | Rev 28 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 21 Rev 23
Line 17... Line 17...
17
        img.setColorTable(colorTable);
17
        img.setColorTable(colorTable);
18
        return img;
18
        return img;
19
    } else if(mat.type()==CV_8UC3) {
19
    } else if(mat.type()==CV_8UC3) {
20
        // Copy input Mat
20
        // Copy input Mat
21
        QImage img((const uchar*)mat.data, mat.cols, mat.rows, mat.step, QImage::Format_RGB888);
21
        QImage img((const uchar*)mat.data, mat.cols, mat.rows, mat.step, QImage::Format_RGB888);
22
        return img.rgbSwapped();
22
        return img;
23
    } else if(mat.type()==CV_16UC1) {
23
    } else if(mat.type()==CV_16UC1) {
24
        mat.convertTo(mat, CV_8UC1, 1.0/256.0);
24
        mat.convertTo(mat, CV_8UC1, 1.0/256.0);
25
        return cvMat2qImage(mat);
25
        return cvMat2qImage(mat);
-
 
26
    } else if(mat.type()==CV_16UC3) {
-
 
27
        mat.convertTo(mat, CV_8UC3, 1.0/256.0);
-
 
28
        return cvMat2qImage(mat);
26
    } else if(mat.type()==CV_32FC1) {
29
    } else if(mat.type()==CV_32FC1) {
27
        cv::Mat rgb(mat.size(), CV_32FC3);
30
        cv::Mat rgb(mat.size(), CV_32FC3);
28
        rgb.addref();
31
        rgb.addref();
29
        cv::cvtColor(mat, rgb, cv::COLOR_GRAY2RGB);
32
        cv::cvtColor(mat, rgb, cv::COLOR_GRAY2RGB);
30
        // Copy input Mat
33
        // Copy input Mat
31
        QImage img((const uchar*)rgb.data, rgb.cols, rgb.rows, rgb.step, QImage::Format_RGB32);
34
        QImage img((const uchar*)rgb.data, rgb.cols, rgb.rows, rgb.step, QImage::Format_RGB32);
32
        rgb.release();
35
        rgb.release();
33
        return img;
36
        return img;
34
    } else {
37
    } else {
35
        std::cerr << "MVVideoDialog: cv::Mat could not be converted to QImage!";
38
        std::cerr << "SMVideoWidget: cv::Mat could not be converted to QImage!";
36
        return QImage();
39
        return QImage();
37
    }
40
    }
38
}
41
}
39
 
42
 
40
 
43