third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2021-04-01 21:48:52 +00:00
commit 12d80b9e64
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/python/bindings/CMakeLists.txt
View File

@ -29,12 +29,15 @@ foreach(m ${OPENCV_PYTHON_MODULES})
# both wrapping and C++ implementation
file(GLOB hdr2 ${OPENCV_MODULE_${m}_LOCATION}/misc/python/python_*.hpp)
list(SORT hdr2)
list(APPEND opencv_hdrs ${hdr2})
list(APPEND opencv_userdef_hdrs ${hdr2})
file(GLOB hdr ${OPENCV_MODULE_${m}_LOCATION}/misc/python/shadow*.hpp)
list(SORT hdr)
list(APPEND opencv_hdrs ${hdr})
file(GLOB userdef_hdrs ${OPENCV_MODULE_${m}_LOCATION}/misc/python/pyopencv*.hpp)
list(SORT userdef_hdrs)
list(APPEND opencv_userdef_hdrs ${userdef_hdrs})
endforeach(m)

1
modules/videoio/src/cap_dshow.cpp
View File

@ -2741,6 +2741,7 @@ int videoInput::start(int deviceID, videoDevice *VD){
}
VIDEOINFOHEADER *pVih = reinterpret_cast<VIDEOINFOHEADER*>(VD->pAmMediaType->pbFormat);
CV_Assert(pVih);
int currentWidth = HEADER(pVih)->biWidth;
int currentHeight = HEADER(pVih)->biHeight;