Skip to content

Commit

Permalink
use roslaunch >= 1.12.1 for roslaunch-check launch/face_detection.launch
Browse files Browse the repository at this point in the history
  • Loading branch information
k-okada committed Feb 15, 2025
1 parent 24aee47 commit ec4f401
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ rosdep update
if [ "$OPENCV_VERSION" == 3 ]; then rosinstall_generator image_pipeline --upstream >> .rosinstall.opencv3; fi # need to recompile image_proc
if [ "$OPENCV_VERSION" == 3 ]; then rosinstall_generator compressed_image_transport --upstream >> .rosinstall.opencv3; fi # need to recompile compressed_image_transport
if [ "$OPENCV_VERSION" == 3 ]; then rosinstall_generator vision_opencv --upstream >> .rosinstall.opencv3; fi # need to recompile visoin_opencv
if [ "$OPENCV_VERSION" == 3 ]; then wstool merge .rosinstall.opencv3 || [ ! -s .rosinstall.opencv3 ] || vcs import . < .rosinstall.opencv3 ; fi # need to recompile visoin_opencv
if [ "$ROS_DISTRO" == "indigo" ]; then ROS_DISTRO=kinetic rosinstall_generator roslaunch >> .rosinstall.opencv3; fi # face_detection.launch requires roslaunch-check >= 1.12.1
if [[ "$OPENCV_VERSION" == 3 || "$ROS_DISTRO" == "indigo" ]]; then wstool merge .rosinstall.opencv3 || [ ! -s .rosinstall.opencv3 ] || vcs import . < .rosinstall.opencv3 ; fi # need to recompile visoin_opencv
git config --global --add safe.directory $CI_SOURCE_PATH
git config --global --add safe.directory ~/catkin_ws/src || echo "OK"
wstool up || vcs pull
Expand Down
1 change: 1 addition & 0 deletions launch/face_detection.launch
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
name="eyes_cascade_name" default="/usr/share/opencv4/haarcascades/haarcascade_eye_tree_eyeglasses.xml" doc="Eye dtection cascade Filename" />

<!-- if all use_opencv3 is true, but all other variable is false, then use /usr/share/opencv -->
<!-- eval requires roslaunch >= 1.12.1 -->
<arg if="$(eval use_opencv3 and not use_opencv3_1 and not use_opencv3_2 and not use_opencv3_3 and not use_opencv4)"
name="face_cascade_name" default="/usr/share/opencv/haarcascades/haarcascade_frontalface_alt.xml" doc="Face dtection cascade Filename" />
<arg if="$(eval use_opencv3 and not use_opencv3_1 and not use_opencv3_2 and not use_opencv3_3 and not use_opencv4)"
Expand Down

0 comments on commit ec4f401

Please sign in to comment.