diff --git a/detection/api/CMakeLists.txt b/detection/api/CMakeLists.txt index bf1b109..7116443 100644 --- a/detection/api/CMakeLists.txt +++ b/detection/api/CMakeLists.txt @@ -30,7 +30,7 @@ project(openmpf-cpp-component-api) set(CMAKE_CXX_STANDARD 17) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio) diff --git a/detection/api/include/SeekStrategy.h b/detection/api/include/SeekStrategy.h index 52143e6..aba45ba 100644 --- a/detection/api/include/SeekStrategy.h +++ b/detection/api/include/SeekStrategy.h @@ -93,7 +93,7 @@ namespace MPF { namespace COMPONENT { // frame, it uses cv::VideoCapture::grab to advance cv::VideoCapture's position. // This means that when you need to advance 16 or fewer frames, it is more efficient to // just use cv::VideoCapture::grab. - // https://github.com/opencv/opencv/blob/4.5.0/modules/videoio/src/cap_ffmpeg_impl.hpp#L1459 + // https://github.com/opencv/opencv/blob/4.9.0/modules/videoio/src/cap_ffmpeg_impl.hpp#L1959 static constexpr int SET_POS_MIN_FRAMES = 16; }; }} diff --git a/detection/examples/AudioOnlyComponent/CMakeLists.txt b/detection/examples/AudioOnlyComponent/CMakeLists.txt index 037723d..ffd9e8d 100644 --- a/detection/examples/AudioOnlyComponent/CMakeLists.txt +++ b/detection/examples/AudioOnlyComponent/CMakeLists.txt @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake) find_package(mpfComponentInterface REQUIRED) find_package(mpfDetectionComponentApi REQUIRED) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core) +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core) set(AUDIO_ONLY_COMPONENT_SOURCES AudioOnly.cpp AudioOnly.h) diff --git a/detection/examples/AudioOnlyComponent/README.md b/detection/examples/AudioOnlyComponent/README.md index f03de8e..3f1ee4d 100644 --- a/detection/examples/AudioOnlyComponent/README.md +++ b/detection/examples/AudioOnlyComponent/README.md @@ -1,6 +1,6 @@ # BUILD -NOTE: To build and run this component, OpenCV 4.5.0 +NOTE: To build and run this component, OpenCV 4.9.0 must be installed first. NOTE: You must build the MPF Component API library before @@ -8,9 +8,12 @@ NOTE: You must build the MPF Component API library before in the README at the top-level component API directory. -Before you build, edit the src/CMakeLists.txt file, and change -the "find_package" command so that the PATHS option specifies -the root directory of your OpenCV 4.5.0 installation. +The CMakeLists.txt file for this example is written to look for +OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local +installation is in a different location, edit the CMakeLists.txt +file in this directory to change the `find_package` command so +that the PATHS option specifies the root directory of your +OpenCV 4.9.0 installation. Run the following commands: ``` diff --git a/detection/examples/GenericComponent/CMakeLists.txt b/detection/examples/GenericComponent/CMakeLists.txt index 09e91a9..b97e851 100644 --- a/detection/examples/GenericComponent/CMakeLists.txt +++ b/detection/examples/GenericComponent/CMakeLists.txt @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake) find_package(mpfComponentInterface REQUIRED) find_package(mpfDetectionComponentApi REQUIRED) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core) +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core) set(GENERIC_COMPONENT_SOURCES GenericComponent.cpp GenericComponent.h) diff --git a/detection/examples/GenericComponent/README.md b/detection/examples/GenericComponent/README.md index 8db22b5..71e8af9 100644 --- a/detection/examples/GenericComponent/README.md +++ b/detection/examples/GenericComponent/README.md @@ -1,6 +1,6 @@ # BUILD -NOTE: To build and run this component, OpenCV 4.5.0 +NOTE: To build and run this component, OpenCV 4.9.0 must be installed first. NOTE: You must build the MPF Component API library before @@ -8,9 +8,12 @@ NOTE: You must build the MPF Component API library before in the README at the top-level component API directory. -Before you build, edit the src/CMakeLists.txt file, and change -the "find_package" command so that the PATHS option specifies -the root directory of your OpenCV 4.5.0 installation. +The CMakeLists.txt file for this example is written to look for +OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local +installation is in a different location, edit the CMakeLists.txt +file in this directory to change the `find_package` command so +that the PATHS option specifies the root directory of your +OpenCV 4.9.0 installation. Run the following commands: ``` diff --git a/detection/examples/HelloWorldComponent/CMakeLists.txt b/detection/examples/HelloWorldComponent/CMakeLists.txt index 6b0b05a..c586160 100644 --- a/detection/examples/HelloWorldComponent/CMakeLists.txt +++ b/detection/examples/HelloWorldComponent/CMakeLists.txt @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake) find_package(mpfComponentInterface REQUIRED) find_package(mpfDetectionComponentApi REQUIRED) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core) +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core) find_package(PkgConfig) pkg_search_module(LOG4CXX REQUIRED liblog4cxx) diff --git a/detection/examples/HelloWorldComponent/README.md b/detection/examples/HelloWorldComponent/README.md index e038a53..ecbfd82 100644 --- a/detection/examples/HelloWorldComponent/README.md +++ b/detection/examples/HelloWorldComponent/README.md @@ -1,6 +1,6 @@ # BUILD -NOTE: To build and run this component, OpenCV 4.5.0 +NOTE: To build and run this component, OpenCV 4.9.0 must be installed first. NOTE: You must build the MPF Component API library before @@ -8,9 +8,12 @@ NOTE: You must build the MPF Component API library before in the README at the top-level component API directory. -Before you build, edit the src/CMakeLists.txt file, and change -the "find_package" command so that the PATHS option specifies -the root directory of your OpenCV 4.5.0 installation. +The CMakeLists.txt file for this example is written to look for +OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local +installation is in a different location, edit the CMakeLists.txt +file in this directory to change the `find_package` command so +that the PATHS option specifies the root directory of your +OpenCV 4.9.0 installation. Run the following commands: ``` diff --git a/detection/examples/ImageTransformerComponent/CMakeLists.txt b/detection/examples/ImageTransformerComponent/CMakeLists.txt index f115942..32e1050 100644 --- a/detection/examples/ImageTransformerComponent/CMakeLists.txt +++ b/detection/examples/ImageTransformerComponent/CMakeLists.txt @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake) find_package(mpfComponentInterface REQUIRED) find_package(mpfDetectionComponentApi REQUIRED) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core opencv_highgui) +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_highgui) set(IMAGE_TRANSFORMER_COMPONENT_SOURCES ImageTransformerComponent.h ImageTransformerComponent.cpp) diff --git a/detection/examples/ImageTransformerComponent/README.md b/detection/examples/ImageTransformerComponent/README.md index a8391d3..40882f3 100644 --- a/detection/examples/ImageTransformerComponent/README.md +++ b/detection/examples/ImageTransformerComponent/README.md @@ -1,6 +1,6 @@ # BUILD -NOTE: To build and run this component, OpenCV 4.5.0 +NOTE: To build and run this component, OpenCV 4.9.0 must be installed first. NOTE: You must build the MPF Component API library before @@ -8,9 +8,12 @@ NOTE: You must build the MPF Component API library before in the README at the top-level component API directory. -Before you build, edit the src/CMakeLists.txt file, and change -the "find_package" command so that the PATHS option specifies -the root directory of your OpenCV 4.5.0 installation. +The CMakeLists.txt file for this example is written to look for +OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local +installation is in a different location, edit the CMakeLists.txt +file in this directory to change the `find_package` command so +that the PATHS option specifies the root directory of your +OpenCV 4.9.0 installation. Run the following commands: ``` diff --git a/detection/examples/VideoCaptureComponent/CMakeLists.txt b/detection/examples/VideoCaptureComponent/CMakeLists.txt index c8c1837..b01fdfa 100644 --- a/detection/examples/VideoCaptureComponent/CMakeLists.txt +++ b/detection/examples/VideoCaptureComponent/CMakeLists.txt @@ -34,7 +34,7 @@ include(../ComponentSetup.cmake) find_package(mpfComponentInterface REQUIRED) find_package(mpfDetectionComponentApi REQUIRED) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 COMPONENTS opencv_core opencv_highgui) +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_highgui) set(VIDEO_CAPTURE_COMPONENT_SOURCES VideoCaptureComponent.h VideoCaptureComponent.cpp) diff --git a/detection/examples/VideoCaptureComponent/README.md b/detection/examples/VideoCaptureComponent/README.md index bb1e303..19d18e5 100644 --- a/detection/examples/VideoCaptureComponent/README.md +++ b/detection/examples/VideoCaptureComponent/README.md @@ -1,6 +1,6 @@ # BUILD -NOTE: To build and run this component, OpenCV 4.5.0 and +NOTE: To build and run this component, OpenCV 4.9.0 and ffmpeg must be installed first. NOTE: You must build the MPF Component API library before @@ -8,9 +8,12 @@ NOTE: You must build the MPF Component API library before in the README at the top-level component API directory. -Before you build, edit the src/CMakeLists.txt file, and change -the "find_package" command so that the PATHS option specifies -the root directory of your OpenCV 4.5.0 installation. +The CMakeLists.txt file for this example is written to look for +OpenCV 4.9.0 installed at `/opt/opencv-4.9.0`. If your local +installation is in a different location, edit the CMakeLists.txt +file in this directory to change the `find_package` command so +that the PATHS option specifies the root directory of your +OpenCV 4.9.0 installation. Run the following commands: ``` diff --git a/detection/testUtils/CMakeLists.txt b/detection/testUtils/CMakeLists.txt index b290fa2..c2429fa 100644 --- a/detection/testUtils/CMakeLists.txt +++ b/detection/testUtils/CMakeLists.txt @@ -30,7 +30,7 @@ project(openmpf-cpp-component-test-utils) set(CMAKE_CXX_STANDARD 17) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio opencv_highgui) include_directories(include) diff --git a/detection/utils/CMakeLists.txt b/detection/utils/CMakeLists.txt index f426611..723f92d 100644 --- a/detection/utils/CMakeLists.txt +++ b/detection/utils/CMakeLists.txt @@ -29,7 +29,7 @@ project(openmpf-cpp-component-utils) set(CMAKE_CXX_STANDARD 17) -find_package(OpenCV 4.5.5 EXACT REQUIRED PATHS /opt/opencv-4.5.5 +find_package(OpenCV 4.9.0 EXACT REQUIRED PATHS /opt/opencv-4.9.0 COMPONENTS opencv_core opencv_imgcodecs opencv_imgproc opencv_videoio) find_package(PkgConfig)