diff --git a/modules/python/bindings/CMakeLists.txt b/modules/python/bindings/CMakeLists.txt index 7057be77d0..442107b135 100644 --- a/modules/python/bindings/CMakeLists.txt +++ b/modules/python/bindings/CMakeLists.txt @@ -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) diff --git a/modules/videoio/src/cap_dshow.cpp b/modules/videoio/src/cap_dshow.cpp index 0c92217be7..d3abc3694f 100644 --- a/modules/videoio/src/cap_dshow.cpp +++ b/modules/videoio/src/cap_dshow.cpp @@ -2741,6 +2741,7 @@ int videoInput::start(int deviceID, videoDevice *VD){ } VIDEOINFOHEADER *pVih = reinterpret_cast(VD->pAmMediaType->pbFormat); + CV_Assert(pVih); int currentWidth = HEADER(pVih)->biWidth; int currentHeight = HEADER(pVih)->biHeight;