Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pull upstream noetic #10

Open
wants to merge 33 commits into
base: noetic
Choose a base branch
from
Open

Conversation

floriantschopp
Copy link

No description provided.

kejxu and others added 30 commits March 28, 2020 13:21
* update macro names (#2)

* add exports.h and dll import/export macros
* windows bringup

* Correct binary locations for shared libraries.

* fix build break.

* fix cv_bridge_boost.pyd.

* remove hard-coded STATIC (#3)

* remove WINDOWS_EXPORT_ALL_SYMBOLS property (#4)

* add comment

Co-authored-by: shschaefer <[email protected]>
Co-authored-by: Sean Yen <[email protected]>
* Python3 and Opencv4 changes - noetic

Signed-off-by: ahcorde <[email protected]>

* image_geometry cmake_minimum_required to 3.0.2

Signed-off-by: ahcorde <[email protected]>

* vision_opencv cmake_minimum_required to 3.0.2

Signed-off-by: ahcorde <[email protected]>

* opencv_test cmake_minimum_required to 3.0.2, fixed launch file and python3 issues

Signed-off-by: ahcorde <[email protected]>

* Removed static_casst

Signed-off-by: ahcorde <[email protected]>

* import setup from setuptools instead of distutils-core

Signed-off-by: ahcorde <[email protected]>

* Updated travis.yml and travis.sh

Signed-off-by: ahcorde <[email protected]>

* do_numpy_import change signature to void * and returns nullptr

Signed-off-by: ahcorde <[email protected]>

* Updated keys

Signed-off-by: ahcorde <[email protected]>

* updated python3-numpy key

Signed-off-by: ahcorde <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
* Remove debug print

Signed-off-by: Shane Loretz <[email protected]>

* Find OpenCV 3 if 4 not available

Signed-off-by: Shane Loretz <[email protected]>

* Add typedef from OpenCV 4 if using OpenCV 3

Signed-off-by: Shane Loretz <[email protected]>

* Find boost python differs between buster and focal

Signed-off-by: Shane Loretz <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
As suggested by include-what-you-use
The equidistant distortion model is based on the following publication:

J. Kannala and S. Brandt (2006). A Generic Camera Model and Calibration Method for Conventional, Wide-Angle, and Fish-Eye Lenses, IEEE Transactions on Pattern Analysis and Machine Intelligence, vol. 28, no. 8, pp. 1335-1340

In OpenCV, this model is called the "fisheye" distortion model.
* Implement unrectifyImage()

Closes #355.

* Add K and P args to [un]rectifyPoint, projectPixelTo3dRay

This allows using different matrices than K_ and P_ (which already
include binning and ROI), and is required for unrectifyImage.

* initRectificationMaps: Handle empty roi size correctly

According to REP 104, roi.height (resp. roi.width) = 0 should be treated
the same as full resolution.
* Fix rectifyRoi when used with binning and/or ROI

The previous implementation used K_ and P_ (the matrices that include
binning and ROI). However, the ROI is specified in unbinned and
untransformed raw image coordinates (see REP-104), so rectifyRoi has to
use K_full_ and P_full_.

* test: Remove useless restoring of original state

Each test runs in its own test fixture, so restoring the original state
at the end of a test is not necessary.

* Don't overwrite rectified_roi_dirty flag

This fixes a problem with the following sequence:

1. fromCameraInfo is called with ROI A.  | rectified_roi_dirty = true
2. rectifiedRoi is called                | rectified_roi_dirty = false
3. fromCameraInfo is called with ROI B.  | rectified_roi_dirty = true
4. fromCameraInfo is called with ROI B.  | rectified_roi_dirty = false

The bug is that rectified_roi_dirty was incorrectly set to `false` by the last
line. If now rectifiedRoi is called again, the cached rectified_roi for
ROI A will be returned, but it should be recalculated based on ROI B.

This commit fixes that.
Signed-off-by: Michael Carroll <[email protected]>
Signed-off-by: Kenji Brameld <[email protected]>
- no longer using self._fx, etc
- self.fx(), etc, functions to replace self._fx and redundant calls to
  fx
- remove two unused imports
add fovX and fovY functions in python, cpp
Signed-off-by: Kenji Brameld <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.