generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tegra-optimized Canny

Browse Source
This commit is contained in:
Andrey Kamaev 2011-11-11 14:45:53 +00:00
parent 330357f7dd
commit 4136855ba8
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/imgproc/perf/perf_canny.cpp
View File

@ -11,10 +11,10 @@ typedef perf::TestBaseWithParam<Img_Aperture_L2_thresholds_t> Img_Aperture_L2_th
PERF_TEST_P( Img_Aperture_L2_thresholds, canny,
testing::Combine(
testing::Values( "cv/shared/lena.jpg", "stitching/b1.jpg" ),
testing::Values( "cv/shared/lena.jpg", "stitching/b1.jpg", "cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png" ),
testing::Values( 3, 5 ),
testing::Bool(),
testing::Values( make_tuple(50.0, 100.0), make_tuple(0.0, 50.0) )
testing::Values( make_tuple(50.0, 100.0), make_tuple(0.0, 50.0), make_tuple(100.0, 120.0) )
)
)
{

5
modules/imgproc/src/canny.cpp
View File

@ -45,6 +45,11 @@ CV_IMPL void cvCanny( const void* srcarr, void* dstarr,
double low_thresh, double high_thresh,
int aperture_size )
{
#ifdef HAVE_TEGRA_OPTIMIZATION
if (tegra::canny(cv::cvarrToMat(srcarr), cv::cvarrToMat(dstarr), low_thresh, high_thresh,
aperture_size & ~CV_CANNY_L2_GRADIENT, (aperture_size & CV_CANNY_L2_GRADIENT) == CV_CANNY_L2_GRADIENT))
return;
#endif
cv::Ptr<CvMat> dx, dy;
cv::AutoBuffer<char> buffer;
std::vector<uchar*> stack;

4
modules/ts/misc/concatlogs.py
View File

@ -1,5 +1,5 @@
from optparse import OptionParser
import glob, sys, os
import glob, sys, os, re
if __name__ == "__main__":
parser = OptionParser()
@ -29,7 +29,7 @@ if __name__ == "__main__":
continue
idx1 = text.find("<tbody>") + len("<tbody>")
idx2 = html.rfind("</tbody>")
html = html[:idx2] + text[idx1:]
html = html[:idx2] + re.sub(r"[ \t\n\r]+", " ", text[idx1:])
except:
pass