mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-22 20:39:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7710 from alalek:debug_check_matrelease

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-11-25 14:24:23 +00:00
commit a53f93ff8d
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/calib3d/src/fisheye.cpp
View File

@ -1040,8 +1040,10 @@ double cv::fisheye::stereoCalibrate(InputArrayOfArrays objectPoints, InputArrayO
int b = cv::countNonZero(intrinsicRight.isEstimate); int b = cv::countNonZero(intrinsicRight.isEstimate);
cv::Mat deltas; cv::Mat deltas;
solve(J.t() * J, J.t()*e, deltas); solve(J.t() * J, J.t()*e, deltas);
intrinsicLeft = intrinsicLeft + deltas.rowRange(0, a); if (a > 0)
intrinsicRight = intrinsicRight + deltas.rowRange(a, a + b); intrinsicLeft = intrinsicLeft + deltas.rowRange(0, a);
if (b > 0)
intrinsicRight = intrinsicRight + deltas.rowRange(a, a + b);
omcur = omcur + cv::Vec3d(deltas.rowRange(a + b, a + b + 3)); omcur = omcur + cv::Vec3d(deltas.rowRange(a + b, a + b + 3));
Tcur = Tcur + cv::Vec3d(deltas.rowRange(a + b + 3, a + b + 6)); Tcur = Tcur + cv::Vec3d(deltas.rowRange(a + b + 3, a + b + 6));
for (int image_idx = 0; image_idx < n_images; ++image_idx) for (int image_idx = 0; image_idx < n_images; ++image_idx)

10
modules/core/include/opencv2/core/mat.inl.hpp
View File

@ -689,6 +689,16 @@ void Mat::release()
datastart = dataend = datalimit = data = 0; datastart = dataend = datalimit = data = 0;
for(int i = 0; i < dims; i++) for(int i = 0; i < dims; i++)
size.p[i] = 0; size.p[i] = 0;
#ifdef _DEBUG
flags = MAGIC_VAL;
dims = rows = cols = 0;
if(step.p != step.buf)
{
fastFree(step.p);
step.p = step.buf;
size.p = &rows;
}
#endif
} }
inline inline

2
modules/core/misc/java/test/MatTest.java
View File

@ -494,7 +494,7 @@ public class MatTest extends OpenCVTestCase {
public void testIsSubmatrix() { public void testIsSubmatrix() {
assertFalse(gray0.isSubmatrix()); assertFalse(gray0.isSubmatrix());
Mat subMat = gray0.submat(0, 0, gray0.rows() / 2, gray0.cols() / 2); Mat subMat = gray0.submat(0, gray0.rows() / 2, 0, gray0.cols() / 2);
assertTrue(subMat.isSubmatrix()); assertTrue(subMat.isSubmatrix());
} }