potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

don't use constructors for C API structures

Browse Source
This commit is contained in:
Alexander Alekhin
2018-09-06 14:34:16 +03:00
parent ad146e5a6b
commit 8a3c394d6a
70 changed files with 547 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap.cpp
+1 -1
View File
@@ -366,7 +366,7 @@ void VideoWriter::write(const Mat& image)
iwriter->write(image);
else
{
IplImage _img = image;
IplImage _img = cvIplImage(image);
cvWriteFrame(writer, &_img);
}
}
modules/videoio/src/cap_openni.cpp
+1 -1
View File
@@ -382,7 +382,7 @@ IplImage* CvCapture_OpenNI::OutputMap::getIplImagePtr()
if( mat.empty() )
return 0;
iplHeader = IplImage(mat);
iplHeader = cvIplImage(mat);
return &iplHeader;
}
modules/videoio/src/cap_openni2.cpp
+1 -1
View File
@@ -192,7 +192,7 @@ IplImage* CvCapture_OpenNI2::OutputMap::getIplImagePtr()
if( mat.empty() )
return 0;
iplHeader = IplImage(mat);
iplHeader = cvIplImage(mat);
return &iplHeader;
}
modules/videoio/src/cap_v4l.cpp
+2 -2
View File
@@ -551,7 +551,7 @@ static int v4l2_num_channels(__u32 palette) {
}
static void v4l2_create_frame(CvCaptureCAM_V4L *capture) {
CvSize size(capture->form.fmt.pix.width, capture->form.fmt.pix.height);
CvSize size = {capture->form.fmt.pix.width, capture->form.fmt.pix.height};
int channels = 3;
int depth = IPL_DEPTH_8U;
@@ -561,7 +561,7 @@ static void v4l2_create_frame(CvCaptureCAM_V4L *capture) {
switch(capture->palette) {
case V4L2_PIX_FMT_MJPEG:
case V4L2_PIX_FMT_JPEG:
size = CvSize(capture->buffers[capture->bufferIndex].length, 1);
size = cvSize(capture->buffers[capture->bufferIndex].length, 1);
break;
case V4L2_PIX_FMT_YVU420:
case V4L2_PIX_FMT_YUV420:
modules/videoio/src/videoio_registry.cpp
+4 -4
View File
@@ -659,22 +659,22 @@ void VideoWriter_create(CvVideoWriter*& writer, Ptr<IVideoWriter>& iwriter, Vide
#endif
#ifdef HAVE_VFW
case CAP_VFW:
CREATE_WRITER_LEGACY(cvCreateVideoWriter_VFW(filename.c_str(), fourcc, fps, frameSize, isColor))
CREATE_WRITER_LEGACY(cvCreateVideoWriter_VFW(filename.c_str(), fourcc, fps, cvSize(frameSize), isColor))
break;
#endif
#ifdef HAVE_AVFOUNDATION
case CAP_AVFOUNDATION:
CREATE_WRITER_LEGACY(cvCreateVideoWriter_AVFoundation(filename.c_str(), fourcc, fps, frameSize, isColor))
CREATE_WRITER_LEGACY(cvCreateVideoWriter_AVFoundation(filename.c_str(), fourcc, fps, cvSize(frameSize), isColor))
break;
#endif
#if defined(HAVE_QUICKTIME) || defined(HAVE_QTKIT)
case(CAP_QT):
CREATE_WRITER_LEGACY(cvCreateVideoWriter_QT(filename.c_str(), fourcc, fps, frameSize, isColor))
CREATE_WRITER_LEGACY(cvCreateVideoWriter_QT(filename.c_str(), fourcc, fps, cvSize(frameSize), isColor))
break;
#endif
#ifdef HAVE_GSTREAMER
case CAP_GSTREAMER:
CREATE_WRITER_LEGACY(cvCreateVideoWriter_GStreamer (filename.c_str(), fourcc, fps, frameSize, isColor))
CREATE_WRITER_LEGACY(cvCreateVideoWriter_GStreamer (filename.c_str(), fourcc, fps, cvSize(frameSize), isColor))
break;
#endif
case CAP_OPENCV_MJPEG: