Fix merge conflicts

This commit is contained in:
Baichuan Su 2013-11-07 09:56:59 -08:00
parent befcbf56fe
commit 99a00d3dd9

View File

@ -289,7 +289,7 @@ OCL_TEST_P(CornerHarris, Mat)
cornerHarris(src_roi, dst_roi, blockSize, apertureSize, k, borderType);
ocl::cornerHarris(gsrc_roi, gdst_roi, blockSize, apertureSize, k, borderType);
Near(1e-5, true);
Near(1e-5);
}
}