[ros-vision-opencv] 01/01: Imported Upstream version 1.11.11
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Fri Feb 5 11:12:30 UTC 2016
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to annotated tag upstream/1.11.11
in repository ros-vision-opencv.
commit 01e85b19e3cacbfe4efceac07316be12964b2c65
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Fri Feb 5 10:11:48 2016 +0100
Imported Upstream version 1.11.11
---
cv_bridge/CHANGELOG.rst | 6 ++++++
cv_bridge/{ => doc}/conf.py | 7 +------
cv_bridge/{ => doc}/index.rst | 0
cv_bridge/{ => doc}/mainpage.dox | 0
cv_bridge/include/cv_bridge/cv_bridge.h | 5 ++---
cv_bridge/package.xml | 18 ++++++++++--------
cv_bridge/python/cv_bridge/core.py | 12 ++++++------
cv_bridge/rosdoc.yaml | 2 +-
image_geometry/CHANGELOG.rst | 6 ++++++
image_geometry/{ => doc}/conf.py | 7 +------
image_geometry/{ => doc}/index.rst | 2 +-
image_geometry/{ => doc}/mainpage.dox | 0
image_geometry/package.xml | 12 +++++++-----
image_geometry/rosdoc.yaml | 1 +
image_geometry/test/directed.py | 3 ---
opencv_apps/CHANGELOG.rst | 6 ++++++
opencv_apps/CMakeLists.txt | 22 ++++++++++++++++++----
opencv_apps/package.xml | 3 +--
opencv_apps/test/CMakeLists.txt | 5 ++++-
opencv_apps/test/test-lk_flow.test | 2 +-
opencv_tests/CHANGELOG.rst | 5 +++++
opencv_tests/package.xml | 6 +++---
vision_opencv/CHANGELOG.rst | 3 +++
vision_opencv/package.xml | 2 +-
24 files changed, 84 insertions(+), 51 deletions(-)
diff --git a/cv_bridge/CHANGELOG.rst b/cv_bridge/CHANGELOG.rst
index dc2e427..3805a63 100644
--- a/cv_bridge/CHANGELOG.rst
+++ b/cv_bridge/CHANGELOG.rst
@@ -2,6 +2,12 @@
Changelog for package cv_bridge
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.11 (2016-01-31)
+--------------------
+* clean up the doc files
+* fix a few warnings in doc jobs
+* Contributors: Vincent Rabaud
+
1.11.10 (2016-01-16)
--------------------
* fix OpenCV3 build
diff --git a/cv_bridge/conf.py b/cv_bridge/doc/conf.py
similarity index 96%
rename from cv_bridge/conf.py
rename to cv_bridge/doc/conf.py
index e27bc11..c2af74f 100644
--- a/cv_bridge/conf.py
+++ b/cv_bridge/doc/conf.py
@@ -11,8 +11,6 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import roslib
-roslib.load_manifest('cv_bridge')
import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
@@ -122,7 +120,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
@@ -199,8 +197,5 @@ latex_documents = [
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'http://docs.python.org/': None,
- 'http://opencv.willowgarage.com/documentation/': None,
- 'http://opencv.willowgarage.com/documentation/python/': None,
'http://docs.scipy.org/doc/numpy' : None,
- 'http://opencv.willowgarage.com/documentation/python' : None
}
diff --git a/cv_bridge/index.rst b/cv_bridge/doc/index.rst
similarity index 100%
rename from cv_bridge/index.rst
rename to cv_bridge/doc/index.rst
diff --git a/cv_bridge/mainpage.dox b/cv_bridge/doc/mainpage.dox
similarity index 100%
rename from cv_bridge/mainpage.dox
rename to cv_bridge/doc/mainpage.dox
diff --git a/cv_bridge/include/cv_bridge/cv_bridge.h b/cv_bridge/include/cv_bridge/cv_bridge.h
index 600816a..a3f2033 100644
--- a/cv_bridge/include/cv_bridge/cv_bridge.h
+++ b/cv_bridge/include/cv_bridge/cv_bridge.h
@@ -269,8 +269,7 @@ CvImagePtr cvtColor(const CvImageConstPtr& source,
*
* \param source A shared_ptr to a sensor_msgs::Image message
* \param encoding Either an encoding string that returns true in sensor_msgs::image_encodings::isColor
- * isMono or the mpty string. If it is the empty string,
- *
+ * isMono or the empty string as explained above.
* \param do_dynamic_scaling If true, the image is dynamically scaled between its minimum and maximum value
* before being converted to its final encoding.
* \param min_image_value Independently from do_dynamic_scaling, if min_image_value and max_image_value are
@@ -278,7 +277,7 @@ CvImagePtr cvtColor(const CvImageConstPtr& source,
* \param max_image_value Maximum image value
*/
CvImageConstPtr cvtColorForDisplay(const CvImageConstPtr& source,
- const std::string& encoding_out = std::string(),
+ const std::string& encoding = std::string(),
bool do_dynamic_scaling = false,
double min_image_value = 0.0,
double max_image_value = 0.0);
diff --git a/cv_bridge/package.xml b/cv_bridge/package.xml
index fac8a98..a5df57c 100644
--- a/cv_bridge/package.xml
+++ b/cv_bridge/package.xml
@@ -1,6 +1,6 @@
-<package>
+<package format="2">
<name>cv_bridge</name>
- <version>1.11.10</version>
+ <version>1.11.11</version>
<description>
This contains CvBridge, which converts between ROS
Image messages and OpenCV images.
@@ -26,12 +26,14 @@
<build_depend>rosconsole</build_depend>
<build_depend>sensor_msgs</build_depend>
- <run_depend>boost</run_depend>
- <run_depend>libopencv-dev</run_depend>
- <run_depend>python</run_depend>
- <run_depend>python-opencv</run_depend>
- <run_depend>rosconsole</run_depend>
- <run_depend>sensor_msgs</run_depend>
+ <exec_depend>boost</exec_depend>
+ <exec_depend>libopencv-dev</exec_depend>
+ <exec_depend>python</exec_depend>
+ <exec_depend>python-opencv</exec_depend>
+ <exec_depend>rosconsole</exec_depend>
+ <build_export_depend>sensor_msgs</build_export_depend>
<test_depend>rostest</test_depend>
+
+ <doc_depend>dvipng</doc_depend>
</package>
diff --git a/cv_bridge/python/cv_bridge/core.py b/cv_bridge/python/cv_bridge/core.py
index b725a37..9549c9c 100644
--- a/cv_bridge/python/cv_bridge/core.py
+++ b/cv_bridge/python/cv_bridge/core.py
@@ -92,21 +92,21 @@ class CvBridge:
def imgmsg_to_cv2(self, img_msg, desired_encoding = "passthrough"):
"""
- Convert a sensor_msgs::Image message to an OpenCV :ctype:`cv::Mat`.
+ Convert a sensor_msgs::Image message to an OpenCV :cpp:type:`cv::Mat`.
- :param img_msg: A sensor_msgs::Image message
+ :param img_msg: A :cpp:type:`sensor_msgs::Image` message
:param desired_encoding: The encoding of the image data, one of the following strings:
* ``"passthrough"``
* one of the standard strings in sensor_msgs/image_encodings.h
- :rtype: :ctype:`cv::Mat`
+ :rtype: :cpp:type:`cv::Mat`
:raises CvBridgeError: when conversion is not possible.
If desired_encoding is ``"passthrough"``, then the returned image has the same format as img_msg.
Otherwise desired_encoding must be one of the standard image encodings
- This function returns an OpenCV :ctype:`cv::Mat` message on success, or raises :exc:`cv_bridge.CvBridgeError` on failure.
+ This function returns an OpenCV :cpp:type:`cv::Mat` message on success, or raises :exc:`cv_bridge.CvBridgeError` on failure.
If the image only has one channel, the shape has size 2 (width and height)
"""
@@ -134,9 +134,9 @@ class CvBridge:
def cv2_to_imgmsg(self, cvim, encoding = "passthrough"):
"""
- Convert an OpenCV :ctype:`cv::Mat` type to a ROS sensor_msgs::Image message.
+ Convert an OpenCV :cpp:type:`cv::Mat` type to a ROS sensor_msgs::Image message.
- :param cvim: An OpenCV :ctype:`cv::Mat`
+ :param cvim: An OpenCV :cpp:type:`cv::Mat`
:param encoding: The encoding of the image data, one of the following strings:
* ``"passthrough"``
diff --git a/cv_bridge/rosdoc.yaml b/cv_bridge/rosdoc.yaml
index f9e5efd..0efc7fd 100644
--- a/cv_bridge/rosdoc.yaml
+++ b/cv_bridge/rosdoc.yaml
@@ -1,4 +1,3 @@
- - builder: rosmake
- builder: doxygen
name: C++ API
output_dir: c++
@@ -6,3 +5,4 @@
- builder: sphinx
name: Python API
output_dir: python
+ sphinx_root_dir: doc
diff --git a/image_geometry/CHANGELOG.rst b/image_geometry/CHANGELOG.rst
index d9f8358..b0158d5 100644
--- a/image_geometry/CHANGELOG.rst
+++ b/image_geometry/CHANGELOG.rst
@@ -2,6 +2,12 @@
Changelog for package image_geometry
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.11 (2016-01-31)
+--------------------
+* clean up the doc files
+* fix a few warnings in doc jobs
+* Contributors: Vincent Rabaud
+
1.11.10 (2016-01-16)
--------------------
diff --git a/image_geometry/conf.py b/image_geometry/doc/conf.py
similarity index 96%
rename from image_geometry/conf.py
rename to image_geometry/doc/conf.py
index 5a33b7d..ff05555 100644
--- a/image_geometry/conf.py
+++ b/image_geometry/doc/conf.py
@@ -11,8 +11,6 @@
# All configuration values have a default; values that are commented out
# serve to show the default.
-import roslib
-roslib.load_manifest('image_geometry')
import sys, os
# If extensions (or modules to document with autodoc) are in another directory,
@@ -122,7 +120,7 @@ html_theme = 'default'
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+#html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
@@ -198,9 +196,6 @@ latex_documents = [
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'http://docs.python.org/': None,
- 'http://opencv.willowgarage.com/documentation/': None,
- 'http://opencv.willowgarage.com/documentation/python/': None,
'http://docs.scipy.org/doc/numpy' : None,
- 'http://opencv.willowgarage.com/documentation/python' : None,
'http://www.ros.org/doc/api/tf/html/python/' : None
}
diff --git a/image_geometry/index.rst b/image_geometry/doc/index.rst
similarity index 63%
rename from image_geometry/index.rst
rename to image_geometry/doc/index.rst
index 74a8d47..08d0c10 100644
--- a/image_geometry/index.rst
+++ b/image_geometry/doc/index.rst
@@ -7,7 +7,7 @@ parameters from sensor_msgs/CameraInfo.
.. module:: image_geometry
.. autoclass:: image_geometry.PinholeCameraModel
- :members: fromCameraInfo, rectifyImage, rectifyPoint, unrectifyPoint, tfFrame, project3dToPixel, projectPixelTo3dRay, distortionCoeffs, intrinsicMatrix, projectionMatrix, rotationMatrix, cx, cy, fx, fy
+ :members: fromCameraInfo, rectifyImage, rectifyPoint, tfFrame, project3dToPixel, projectPixelTo3dRay, distortionCoeffs, intrinsicMatrix, projectionMatrix, rotationMatrix, cx, cy, fx, fy
.. autoclass:: image_geometry.StereoCameraModel
:members:
diff --git a/image_geometry/mainpage.dox b/image_geometry/doc/mainpage.dox
similarity index 100%
rename from image_geometry/mainpage.dox
rename to image_geometry/doc/mainpage.dox
diff --git a/image_geometry/package.xml b/image_geometry/package.xml
index dfa4d4e..f484464 100644
--- a/image_geometry/package.xml
+++ b/image_geometry/package.xml
@@ -1,6 +1,6 @@
-<package>
+<package format="2">
<name>image_geometry</name>
- <version>1.11.10</version>
+ <version>1.11.11</version>
<description>
`image_geometry` contains C++ and Python libraries for interpreting images
geometrically. It interfaces the calibration parameters in sensor_msgs/CameraInfo
@@ -22,7 +22,9 @@
<build_depend>python-opencv</build_depend>
<build_depend>sensor_msgs</build_depend>
- <run_depend>libopencv-dev</run_depend>
- <run_depend>python-opencv</run_depend>
- <run_depend>sensor_msgs</run_depend>
+ <exec_depend>libopencv-dev</exec_depend>
+ <exec_depend>python-opencv</exec_depend>
+ <build_export_depend>sensor_msgs</build_export_depend>
+
+ <doc_depend>dvipng</doc_depend>
</package>
diff --git a/image_geometry/rosdoc.yaml b/image_geometry/rosdoc.yaml
index d243f31..6f9ef15 100644
--- a/image_geometry/rosdoc.yaml
+++ b/image_geometry/rosdoc.yaml
@@ -5,3 +5,4 @@
name: C++ API
output_dir: c++
file_patterns: '*.c *.cpp *.h *.cc *.hh *.dox'
+ sphinx_root_dir: doc
diff --git a/image_geometry/test/directed.py b/image_geometry/test/directed.py
index bc27627..79ee137 100644
--- a/image_geometry/test/directed.py
+++ b/image_geometry/test/directed.py
@@ -1,6 +1,3 @@
-import roslib
-PKG = 'image_geometry'
-roslib.load_manifest(PKG)
import rostest
import rospy
import unittest
diff --git a/opencv_apps/CHANGELOG.rst b/opencv_apps/CHANGELOG.rst
index bdccbe8..dda30f2 100644
--- a/opencv_apps/CHANGELOG.rst
+++ b/opencv_apps/CHANGELOG.rst
@@ -2,6 +2,12 @@
Changelog for package opencv_apps
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.11 (2016-01-31)
+--------------------
+* check if opencv_contrib is available
+* Use respawn instead of watch
+* Contributors: Kei Okada, trainman419
+
1.11.10 (2016-01-16)
--------------------
* enable simple_flow on opencv3, https://github.com/ros-perception/vision_opencv/commit/8ed5ff5c48b4c3d270cd8216175cf6a8441cb046 can revert https://github.com/ros-perception/vision_opencv/commit/89a933aef7c11acdb75a17c46bfcb60389b25baa
diff --git a/opencv_apps/CMakeLists.txt b/opencv_apps/CMakeLists.txt
index fafec67..79865da 100644
--- a/opencv_apps/CMakeLists.txt
+++ b/opencv_apps/CMakeLists.txt
@@ -4,6 +4,10 @@ project(opencv_apps)
find_package(catkin REQUIRED COMPONENTS cv_bridge dynamic_reconfigure message_generation image_transport nodelet roscpp)
find_package(OpenCV REQUIRED)
+message(STATUS "OpenCV Components: ${OpenCV_LIB_COMPONENTS}")
+if(OpenCV_VERSION VERSION_LESS "3.0" OR TARGET opencv_optflow)
+ set(OPENCV_HAVE_OPTFLOW TRUE)
+endif()
# generate the dynamic_reconfigure config file
generate_dynamic_reconfigure_options(
@@ -70,6 +74,10 @@ catkin_package()
include_directories( ${catkin_INCLUDE_DIRS} ${OpenCV_INCLUDE_DIRS})
## Declare a cpp library
+if(OPENCV_HAVE_OPTFLOW)
+ list(APPEND ${PROJECT_NAME}_EXTRA_FILES src/nodelet/simple_flow_nodelet.cpp)
+endif()
+
add_library(${PROJECT_NAME} SHARED
# https://github.com/Itseez/opencv/blob/2.4/samples/cpp/tutorial_code
# ImgTrans
@@ -157,7 +165,10 @@ add_library(${PROJECT_NAME} SHARED
# rgbdodometry.cpp
src/nodelet/segment_objects_nodelet.cpp
## select3dobj.cpp
- src/nodelet/simple_flow_nodelet.cpp
+###
+### simple flow requires opencv-contrib https://github.com/ros-perception/vision_opencv/issues/108
+###
+### src/nodelet/simple_flow_nodelet.cpp
# squares.cpp
# starter_imagelist.cpp
# starter_video.cpp
@@ -266,9 +277,12 @@ target_link_libraries(segment_objects_exe ${catkin_LIBRARIES} ${OpenCV_LIBRARIES
# select3dobj.cpp
-add_executable(simple_flow_exe src/node/simple_flow.cpp)
-SET_TARGET_PROPERTIES(simple_flow_exe PROPERTIES OUTPUT_NAME simple_flow)
-target_link_libraries(simple_flow_exe ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
+# simple flow requires opencv-contrib https://github.com/ros-perception/vision_opencv/issues/108
+if(OPENCV_HAVE_OPTFLOW)
+ add_executable(simple_flow_exe src/node/simple_flow.cpp)
+ SET_TARGET_PROPERTIES(simple_flow_exe PROPERTIES OUTPUT_NAME simple_flow)
+ target_link_libraries(simple_flow_exe ${catkin_LIBRARIES} ${OpenCV_LIBRARIES})
+endif()
# starter_video.cpp
# videocapture_pvapi.cpp
diff --git a/opencv_apps/package.xml b/opencv_apps/package.xml
index 447b1f3..5d48b1e 100644
--- a/opencv_apps/package.xml
+++ b/opencv_apps/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>opencv_apps</name>
- <version>1.11.10</version>
+ <version>1.11.11</version>
<description>The opencv_apps package, most of code is taken from https://github.com/Itseez/opencv/tree/master/samples/cpp</description>
<maintainer email="kei.okada at gmail.com">Kei Okada</maintainer>
@@ -31,7 +31,6 @@
<test_depend>rosbag</test_depend>
<test_depend>rosservice</test_depend>
<test_depend>rostopic</test_depend>
- <test_depend>procps</test_depend>
<test_depend>image_proc</test_depend>
<test_depend>image_view</test_depend>
<test_depend>topic_tools</test_depend>
diff --git a/opencv_apps/test/CMakeLists.txt b/opencv_apps/test/CMakeLists.txt
index 4511a2e..dbfa7e8 100644
--- a/opencv_apps/test/CMakeLists.txt
+++ b/opencv_apps/test/CMakeLists.txt
@@ -30,7 +30,10 @@ add_rostest(test-lk_flow.test ARGS gui:=false)
add_rostest(test-people_detect.test ARGS gui:=false)
add_rostest(test-phase_corr.test ARGS gui:=false)
add_rostest(test-segment_objects.test ARGS gui:=false)
-add_rostest(test-simple_flow.test ARGS gui:=false)
+# simple flow requires opencv-contrib https://github.com/ros-perception/vision_opencv/issues/108
+if(OPENCV_HAVE_OPTFLOW)
+ add_rostest(test-simple_flow.test ARGS gui:=false)
+endif()
add_rostest(test-watershed_segmentation.test ARGS gui:=false)
diff --git a/opencv_apps/test/test-lk_flow.test b/opencv_apps/test/test-lk_flow.test
index d0f64b7..8c28e23 100644
--- a/opencv_apps/test/test-lk_flow.test
+++ b/opencv_apps/test/test-lk_flow.test
@@ -14,7 +14,7 @@
<param name="filename_format" value="$(find opencv_apps)/test/lk_flow.png"/>
</node>
<node name="lk_flow_initialize" pkg="rosservice" type="rosservice" args="call --wait lk_flow/initialize_points"
- launch-prefix="watch" />
+ respawn="true" respawn_delay="2" />
<param name="lk_flow_test/topic" value="lk_flow/flows" /> <!-- opencv_apps/FlowArrayStamped -->
<test test-name="lk_flow_test" pkg="rostest" type="hztest" name="lk_flow_test" >
<param name="hz" value="15" />
diff --git a/opencv_tests/CHANGELOG.rst b/opencv_tests/CHANGELOG.rst
index 9441efb..899ea96 100644
--- a/opencv_tests/CHANGELOG.rst
+++ b/opencv_tests/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package opencv_tests
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.11 (2016-01-31)
+--------------------
+* fix a few warnings in doc jobs
+* Contributors: Vincent Rabaud
+
1.11.10 (2016-01-16)
--------------------
diff --git a/opencv_tests/package.xml b/opencv_tests/package.xml
index 3b7db31..4cc2841 100644
--- a/opencv_tests/package.xml
+++ b/opencv_tests/package.xml
@@ -1,13 +1,13 @@
<package>
<name>opencv_tests</name>
- <version>1.11.10</version>
+ <version>1.11.11</version>
<description>
- opencv_tests
+ Tests the enumerants of the ROS Image message, and functionally tests the Python and C++ implementations of CvBridge.
</description>
<author>James Bowman</author>
<maintainer email="vincent.rabaud at gmail.com">Vincent Rabaud</maintainer>
<license>BSD</license>
- <url>http://pr.willowgarage.com/wiki/opencv_tests</url>
+ <url>http://wiki.ros.org/opencv_tests</url>
<buildtool_depend>catkin</buildtool_depend>
diff --git a/vision_opencv/CHANGELOG.rst b/vision_opencv/CHANGELOG.rst
index de069c4..a423932 100644
--- a/vision_opencv/CHANGELOG.rst
+++ b/vision_opencv/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package vision_opencv
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.11 (2016-01-31)
+--------------------
+
1.11.10 (2016-01-16)
--------------------
diff --git a/vision_opencv/package.xml b/vision_opencv/package.xml
index ff5618d..17c91db 100644
--- a/vision_opencv/package.xml
+++ b/vision_opencv/package.xml
@@ -1,6 +1,6 @@
<package>
<name>vision_opencv</name>
- <version>1.11.10</version>
+ <version>1.11.11</version>
<description>Packages for interfacing ROS with OpenCV, a library of programming functions for real time computer vision.</description>
<author>Patrick Mihelich</author>
<author>James Bowman</author>
--
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