[ros-vision-opencv] 01/01: Merge tag 'upstream/1.12.0+ds'

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-vision-opencv.

commit 5aca9a423816a286de6ca208ff82ec4950f22af8
Merge: 79b3e7a 5c0d552
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun Jul 10 23:27:17 2016 +0200

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

 .travis.yml                                        |   9 +-
 cv_bridge/CHANGELOG.rst                            |  14 +
 cv_bridge/package.xml                              |   8 +-
 cv_bridge/python/cv_bridge/core.py                 |   8 +-
 image_geometry/CHANGELOG.rst                       |  10 +
 image_geometry/package.xml                         |   8 +-
 image_geometry/src/pinhole_camera_model.cpp        |  11 +-
 image_geometry/test/utest.cpp                      |  91 ++++++
 opencv_apps/CHANGELOG.rst                          |  17 ++
 opencv_apps/CMakeLists.txt                         |  14 +-
 opencv_apps/include/opencv_apps/nodelet.h          | 318 +++++++++++++++++++++
 opencv_apps/package.xml                            |   4 +-
 opencv_apps/src/nodelet/camshift_nodelet.cpp       |  75 ++---
 .../src/nodelet/contour_moments_nodelet.cpp        |  69 +----
 opencv_apps/src/nodelet/convex_hull_nodelet.cpp    |  68 +----
 opencv_apps/src/nodelet/edge_detection_nodelet.cpp |  68 +----
 opencv_apps/src/nodelet/face_detection_nodelet.cpp |  75 ++---
 opencv_apps/src/nodelet/fback_flow_nodelet.cpp     |  70 +----
 opencv_apps/src/nodelet/find_contours_nodelet.cpp  |  70 +----
 .../src/nodelet/general_contours_nodelet.cpp       |  70 +----
 .../src/nodelet/goodfeature_track_nodelet.cpp      |  68 +----
 opencv_apps/src/nodelet/hough_circles_nodelet.cpp  |  70 +----
 opencv_apps/src/nodelet/hough_lines_nodelet.cpp    |  68 +----
 opencv_apps/src/nodelet/lk_flow_nodelet.cpp        |  75 ++---
 opencv_apps/src/nodelet/nodelet.cpp                | 184 ++++++++++++
 opencv_apps/src/nodelet/people_detect_nodelet.cpp  |  72 +----
 opencv_apps/src/nodelet/phase_corr_nodelet.cpp     |  70 +----
 .../src/nodelet/segment_objects_nodelet.cpp        |  72 +----
 opencv_apps/src/nodelet/simple_flow_nodelet.cpp    |  67 +----
 .../src/nodelet/watershed_segmentation_nodelet.cpp |  71 +----
 opencv_apps/test/test-hough_lines.test             |   4 +-
 opencv_apps/test/test-people_detect.test           |   2 +-
 opencv_apps/test/test-simple_flow.test             |   4 +-
 opencv_tests/CHANGELOG.rst                         |   6 +
 opencv_tests/package.xml                           |   2 +-
 vision_opencv/CHANGELOG.rst                        |   8 +
 vision_opencv/package.xml                          |   4 +-
 37 files changed, 933 insertions(+), 991 deletions(-)

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