[ros-vision-opencv] 02/07: Merge tag 'upstream/1.12.2+ds'
Leopold Palomo-Avellaneda
leo at alaxarxa.net
Sun Oct 23 17:40:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
lepalom-guest pushed a commit to branch master
in repository ros-vision-opencv.
commit 8f410f472da537b0891f22daf896092151157ece
Merge: 1e86b70 50dab5e
Author: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
Date: Sat Oct 22 23:27:16 2016 +0200
Merge tag 'upstream/1.12.2+ds'
Upstream version 1.12.2+ds
.travis.sh | 77 ++++
.travis.yml | 54 +--
cv_bridge/CHANGELOG.rst | 65 +++
cv_bridge/include/cv_bridge/cv_bridge.h | 29 +-
cv_bridge/package.xml | 8 +-
cv_bridge/python/cv_bridge/__init__.py | 7 +
cv_bridge/python/cv_bridge/core.py | 117 ++++-
cv_bridge/src/cv_bridge.cpp | 95 +++--
cv_bridge/src/module.cpp | 49 +++
cv_bridge/src/module_opencv3.cpp | 1 +
cv_bridge/src/pycompat.hpp | 70 +++
cv_bridge/test/CMakeLists.txt | 2 +
cv_bridge/test/conversions.py | 85 ++++
cv_bridge/test/enumerants.py | 41 +-
cv_bridge/test/python_bindings.py | 26 ++
image_geometry/CHANGELOG.rst | 27 ++
image_geometry/CMakeLists.txt | 2 +-
image_geometry/package.xml | 9 +-
image_geometry/rosdoc.yaml | 2 +-
image_geometry/src/image_geometry/cameramodels.py | 6 +
image_geometry/src/pinhole_camera_model.cpp | 19 +-
image_geometry/test/utest.cpp | 91 ++++
opencv_apps/CHANGELOG.rst | 44 --
opencv_apps/CMakeLists.txt | 309 --------------
opencv_apps/cfg/CamShift.cfg | 46 --
opencv_apps/cfg/ContourMoments.cfg | 45 --
opencv_apps/cfg/ConvexHull.cfg | 45 --
opencv_apps/cfg/EdgeDetection.cfg | 50 ---
opencv_apps/cfg/FBackFlow.cfg | 42 --
opencv_apps/cfg/FaceDetection.cfg | 42 --
opencv_apps/cfg/FindContours.cfg | 45 --
opencv_apps/cfg/GeneralContours.cfg | 45 --
opencv_apps/cfg/GoodfeatureTrack.cfg | 44 --
opencv_apps/cfg/HoughCircles.cfg | 45 --
opencv_apps/cfg/HoughLines.cfg | 48 ---
opencv_apps/cfg/LKFlow.cfg | 42 --
opencv_apps/cfg/PeopleDetect.cfg | 42 --
opencv_apps/cfg/PhaseCorr.cfg | 42 --
opencv_apps/cfg/SegmentObjects.cfg | 42 --
opencv_apps/cfg/SimpleFlow.cfg | 44 --
opencv_apps/cfg/WatershedSegmentation.cfg | 42 --
opencv_apps/msg/Circle.msg | 3 -
opencv_apps/msg/CircleArray.msg | 2 -
opencv_apps/msg/CircleArrayStamped.msg | 3 -
opencv_apps/msg/Contour.msg | 1 -
opencv_apps/msg/ContourArray.msg | 1 -
opencv_apps/msg/ContourArrayStamped.msg | 3 -
opencv_apps/msg/Face.msg | 2 -
opencv_apps/msg/FaceArray.msg | 2 -
opencv_apps/msg/FaceArrayStamped.msg | 3 -
opencv_apps/msg/Flow.msg | 2 -
opencv_apps/msg/FlowArray.msg | 1 -
opencv_apps/msg/FlowArrayStamped.msg | 2 -
opencv_apps/msg/FlowStamped.msg | 2 -
opencv_apps/msg/Line.msg | 3 -
opencv_apps/msg/LineArray.msg | 1 -
opencv_apps/msg/LineArrayStamped.msg | 2 -
opencv_apps/msg/Moment.msg | 34 --
opencv_apps/msg/MomentArray.msg | 1 -
opencv_apps/msg/MomentArrayStamped.msg | 2 -
opencv_apps/msg/Point2D.msg | 3 -
opencv_apps/msg/Point2DArray.msg | 1 -
opencv_apps/msg/Point2DArrayStamped.msg | 2 -
opencv_apps/msg/Point2DStamped.msg | 3 -
opencv_apps/msg/Rect.msg | 6 -
opencv_apps/msg/RectArray.msg | 1 -
opencv_apps/msg/RectArrayStamped.msg | 4 -
opencv_apps/msg/RotatedRect.msg | 3 -
opencv_apps/msg/RotatedRectArray.msg | 1 -
opencv_apps/msg/RotatedRectArrayStamped.msg | 3 -
opencv_apps/msg/RotatedRectStamped.msg | 4 -
opencv_apps/msg/Size.msg | 3 -
opencv_apps/nodelet_plugins.xml | 79 ----
opencv_apps/package.xml | 41 --
opencv_apps/src/node/camshift.cpp | 55 ---
opencv_apps/src/node/contour_moments.cpp | 56 ---
opencv_apps/src/node/convex_hull.cpp | 56 ---
opencv_apps/src/node/edge_detection.cpp | 56 ---
opencv_apps/src/node/face_detection.cpp | 55 ---
opencv_apps/src/node/fback_flow.cpp | 55 ---
opencv_apps/src/node/find_contours.cpp | 56 ---
opencv_apps/src/node/general_contours.cpp | 56 ---
opencv_apps/src/node/goodfeature_track.cpp | 55 ---
opencv_apps/src/node/hough_circles.cpp | 55 ---
opencv_apps/src/node/hough_lines.cpp | 55 ---
opencv_apps/src/node/lk_flow.cpp | 55 ---
opencv_apps/src/node/people_detect.cpp | 55 ---
opencv_apps/src/node/phase_corr.cpp | 55 ---
opencv_apps/src/node/segment_objects.cpp | 55 ---
opencv_apps/src/node/simple_compressed_example.cpp | 55 ---
opencv_apps/src/node/simple_example.cpp | 55 ---
opencv_apps/src/node/simple_flow.cpp | 55 ---
opencv_apps/src/node/watershed_segmentation.cpp | 55 ---
opencv_apps/src/nodelet/camshift_nodelet.cpp | 472 ---------------------
.../src/nodelet/contour_moments_nodelet.cpp | 310 --------------
opencv_apps/src/nodelet/convex_hull_nodelet.cpp | 282 ------------
opencv_apps/src/nodelet/edge_detection_nodelet.cpp | 321 --------------
opencv_apps/src/nodelet/face_detection_nodelet.cpp | 271 ------------
opencv_apps/src/nodelet/fback_flow_nodelet.cpp | 264 ------------
opencv_apps/src/nodelet/find_contours_nodelet.cpp | 279 ------------
.../src/nodelet/general_contours_nodelet.cpp | 311 --------------
.../src/nodelet/goodfeature_track_nodelet.cpp | 282 ------------
opencv_apps/src/nodelet/hough_circles_nodelet.cpp | 295 -------------
opencv_apps/src/nodelet/hough_lines_nodelet.cpp | 318 --------------
opencv_apps/src/nodelet/lk_flow_nodelet.cpp | 370 ----------------
opencv_apps/src/nodelet/people_detect_nodelet.cpp | 264 ------------
opencv_apps/src/nodelet/phase_corr_nodelet.cpp | 261 ------------
.../src/nodelet/segment_objects_nodelet.cpp | 318 --------------
.../nodelet/simple_compressed_example_nodelet.cpp | 121 ------
opencv_apps/src/nodelet/simple_example_nodelet.cpp | 122 ------
opencv_apps/src/nodelet/simple_flow_nodelet.cpp | 297 -------------
.../src/nodelet/watershed_segmentation_nodelet.cpp | 380 -----------------
opencv_apps/test/CMakeLists.txt | 39 --
opencv_apps/test/test-camshift.test | 32 --
opencv_apps/test/test-contour_moments.test | 24 --
opencv_apps/test/test-convex_hull.test | 24 --
opencv_apps/test/test-edge_detection.test | 54 ---
opencv_apps/test/test-face_detection.test | 23 -
opencv_apps/test/test-fback_flow.test | 23 -
opencv_apps/test/test-find_contours.test | 24 --
opencv_apps/test/test-general_contours.test | 30 --
opencv_apps/test/test-goodfeature_track.test | 24 --
opencv_apps/test/test-hough_circles.test | 25 --
opencv_apps/test/test-hough_lines.test | 42 --
opencv_apps/test/test-lk_flow.test | 25 --
opencv_apps/test/test-people_detect.test | 23 -
opencv_apps/test/test-phase_corr.test | 23 -
opencv_apps/test/test-segment_objects.test | 24 --
opencv_apps/test/test-simple_flow.test | 24 --
opencv_apps/test/test-watershed_segmentation.test | 26 --
opencv_tests/CHANGELOG.rst | 41 ++
opencv_tests/nodes/broadcast.py | 53 ++-
opencv_tests/nodes/rosfacedetect.py | 48 ++-
opencv_tests/nodes/source.py | 75 ++--
opencv_tests/package.xml | 2 +-
vision_opencv/CHANGELOG.rst | 14 +
vision_opencv/package.xml | 4 +-
137 files changed, 892 insertions(+), 8652 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-vision-opencv.git
More information about the debian-science-commits
mailing list