mirror of
https://github.com/opencv/opencv.git
synced 2026-07-21 19:33:03 +04:00
Merge pull request #29487 from Functionhx:fix/docs-combined
Fix calibration tutorial docs, decomposeProjectionMatrix, and convertMaps performance claims #29487 Fixes #25655, #26791, #27277. Three doc fixes: 1. Calibration tutorial: rows/cols swapped, fixed np.mgrid consistency 2. decomposeProjectionMatrix: clarified transVect is camera center in homogeneous coordinates 3. convertMaps: replaced overstated 2x speed claim ### Pull Request Readiness Checklist - [x] I agree to contribute under Apache 2 License - [x] Not based on GPL/incompatible license - [x] PR proposed to proper branch (4.x) - [x] Reference to original bug report and related work - [ ] Accuracy test, performance test, test data: N/A (doc-only) - [x] Feature well documented and sample code buildable
This commit is contained in:
@@ -881,7 +881,8 @@ CV_EXPORTS_W Vec3d RQDecomp3x3( InputArray src, OutputArray mtxR, OutputArray mt
|
||||
@param projMatrix 3x4 input projection matrix P.
|
||||
@param cameraMatrix Output 3x3 camera intrinsic matrix \f$\cameramatrix{A}\f$.
|
||||
@param rotMatrix Output 3x3 external rotation matrix R.
|
||||
@param transVect Output 4x1 translation vector T.
|
||||
@param transVect Output 4x1 vector representing the camera position in homogeneous coordinates.
|
||||
To obtain the translation vector, use t = -rotMatrix * transVect[:3].
|
||||
@param rotMatrixX Optional 3x3 rotation matrix around x-axis.
|
||||
@param rotMatrixY Optional 3x3 rotation matrix around y-axis.
|
||||
@param rotMatrixZ Optional 3x3 rotation matrix around z-axis.
|
||||
|
||||
@@ -2529,9 +2529,11 @@ with the WARP_RELATIVE_MAP flag :
|
||||
where values of pixels with non-integer coordinates are computed using one of available
|
||||
interpolation methods. \f$map_x\f$ and \f$map_y\f$ can be encoded as separate floating-point maps
|
||||
in \f$map_1\f$ and \f$map_2\f$ respectively, or interleaved floating-point maps of \f$(x,y)\f$ in
|
||||
\f$map_1\f$, or fixed-point maps created by using #convertMaps. The reason you might want to
|
||||
convert from floating to fixed-point representations of a map is that they can yield much faster
|
||||
(\~2x) remapping operations. In the converted case, \f$map_1\f$ contains pairs (cvFloor(x),
|
||||
\f$map_1\f$, or fixed-point maps created by using #convertMaps. Fixed-point maps
|
||||
use a more compact representation, which can reduce memory bandwidth and benefit
|
||||
repeated remap calls that reuse the same map. Performance gains vary by hardware
|
||||
and are typically modest; measure before converting. In the converted case,
|
||||
\f$map_1\f$ contains pairs (cvFloor(x),
|
||||
cvFloor(y)) and \f$map_2\f$ contains indices in a table of interpolation coefficients.
|
||||
|
||||
This function cannot operate in-place.
|
||||
@@ -2540,7 +2542,7 @@ This function cannot operate in-place.
|
||||
@param dst Destination image. It has the same size as map1 and the same type as src .
|
||||
@param map1 The first map of either (x,y) points or just x values having the type CV_16SC2 ,
|
||||
CV_32FC1, or CV_32FC2. See #convertMaps for details on converting a floating point
|
||||
representation to fixed-point for speed.
|
||||
representation to fixed-point.
|
||||
@param map2 The second map of y values having the type CV_16UC1, CV_32FC1, or none (empty map
|
||||
if map1 is (x,y) points), respectively.
|
||||
@param interpolation Interpolation method (see #InterpolationFlags). The methods #INTER_AREA
|
||||
|
||||
Reference in New Issue
Block a user