[ros-vision-opencv] 02/05: Merge tag 'upstream/1.11.10+ds'

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke-guest pushed a commit to annotated tag debian/1.11.10+ds-1
in repository ros-vision-opencv.

commit 62bf4ce32e5c4fbb205f77a46e1565a4d8b6e3a6
Merge: a334a96 2cbd01a
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jan 19 10:22:50 2016 +0100

    Merge tag 'upstream/1.11.10+ds'
    
    Upstream version 1.11.10+ds

 .travis.yml                                        |   5 +-
 cv_bridge/CHANGELOG.rst                            |  12 ++
 cv_bridge/include/cv_bridge/cv_bridge.h            |   5 +-
 cv_bridge/include/cv_bridge/rgb_colors.h           | 211 +++++++++++++++++++++
 cv_bridge/package.xml                              |   2 +-
 cv_bridge/src/CMakeLists.txt                       |   4 +-
 cv_bridge/src/cv_bridge.cpp                        |  85 +++++----
 cv_bridge/src/rgb_colors.cpp                       | 202 ++++++++++++++++++++
 cv_bridge/test/CMakeLists.txt                      |   2 +-
 cv_bridge/test/test_rgb_colors.cpp                 |  19 ++
 image_geometry/CHANGELOG.rst                       |   3 +
 image_geometry/package.xml                         |   2 +-
 opencv_apps/CHANGELOG.rst                          |  16 ++
 opencv_apps/CMakeLists.txt                         |  17 +-
 opencv_apps/package.xml                            |  11 +-
 .../src/nodelet/contour_moments_nodelet.cpp        |   6 +-
 opencv_apps/src/nodelet/convex_hull_nodelet.cpp    |   2 +-
 opencv_apps/src/nodelet/fback_flow_nodelet.cpp     |   4 +-
 .../src/nodelet/goodfeature_track_nodelet.cpp      |  22 ++-
 opencv_apps/src/nodelet/hough_lines_nodelet.cpp    |   2 +-
 opencv_apps/src/nodelet/lk_flow_nodelet.cpp        |   6 +-
 opencv_apps/src/nodelet/phase_corr_nodelet.cpp     |  19 +-
 .../src/nodelet/segment_objects_nodelet.cpp        |   6 +-
 opencv_apps/src/nodelet/simple_flow_nodelet.cpp    |  21 +-
 .../src/nodelet/watershed_segmentation_nodelet.cpp |  38 +++-
 opencv_apps/test/CMakeLists.txt                    |  36 ++++
 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                         |   3 +
 opencv_tests/package.xml                           |   2 +-
 vision_opencv/CHANGELOG.rst                        |   3 +
 vision_opencv/package.xml                          |   2 +-
 47 files changed, 1149 insertions(+), 89 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-vision-opencv.git