From dd25f416a6c318064ab371abbf038527ae3328f4 Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Tue, 27 Aug 2013 17:13:40 +0400 Subject: [PATCH] War on Whitespace, master edition: tabs. --- modules/objdetect/src/hog.cpp | 2 +- modules/ocl/perf/perf_calib3d.cpp | 10 +++++----- samples/cpp/image_sequence.cpp | 4 ++-- samples/python2/houghcircles.py | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/objdetect/src/hog.cpp b/modules/objdetect/src/hog.cpp index 0fca47f287..80b5972597 100644 --- a/modules/objdetect/src/hog.cpp +++ b/modules/objdetect/src/hog.cpp @@ -820,7 +820,7 @@ const float* HOGCache::getBlock(Point pt, float* buf) int h0 = h[0], h1 = h[1]; __m128 _a0 = _mm_set1_ps(a[0]), _a1 = _mm_set1_ps(a[1]); - __m128 _w = _mm_mul_ps(_mm_set1_ps(pk.gradWeight), _mm_loadu_ps(pk.histWeights)); + __m128 _w = _mm_mul_ps(_mm_set1_ps(pk.gradWeight), _mm_loadu_ps(pk.histWeights)); __m128 _t0 = _mm_mul_ps(_a0, _w), _t1 = _mm_mul_ps(_a1, _w); _mm_storeu_ps(hist0, _t0); diff --git a/modules/ocl/perf/perf_calib3d.cpp b/modules/ocl/perf/perf_calib3d.cpp index 7b14988a20..d1a642edc8 100644 --- a/modules/ocl/perf/perf_calib3d.cpp +++ b/modules/ocl/perf/perf_calib3d.cpp @@ -57,12 +57,12 @@ PERFTEST(StereoMatchBM) SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg "; - Ptr bm = createStereoBM(n_disp, winSize); - bm->compute(left_image, right_image, dst); + Ptr bm = createStereoBM(n_disp, winSize); + bm->compute(left_image, right_image, dst); - CPU_ON; - bm->compute(left_image, right_image, dst); - CPU_OFF; + CPU_ON; + bm->compute(left_image, right_image, dst); + CPU_OFF; d_left.upload(left_image); d_right.upload(right_image); diff --git a/samples/cpp/image_sequence.cpp b/samples/cpp/image_sequence.cpp index e4815ebeaa..d943621611 100644 --- a/samples/cpp/image_sequence.cpp +++ b/samples/cpp/image_sequence.cpp @@ -10,8 +10,8 @@ static void help(char** argv) { cout << "\nThis sample shows you how to read a sequence of images using the VideoCapture interface.\n" << "Usage: " << argv[0] << " (example mask: example_%%02d.jpg)\n" - << "Image mask defines the name variation for the input images that have to be read as a sequence. \n" - << "Using the mask example_%%02d.jpg will read in images labeled as 'example_00.jpg', 'example_01.jpg', etc." + << "Image mask defines the name variation for the input images that have to be read as a sequence. \n" + << "Using the mask example_%%02d.jpg will read in images labeled as 'example_00.jpg', 'example_01.jpg', etc." << endl; } diff --git a/samples/python2/houghcircles.py b/samples/python2/houghcircles.py index 392e4e1c54..38ed6f3032 100755 --- a/samples/python2/houghcircles.py +++ b/samples/python2/houghcircles.py @@ -13,9 +13,9 @@ import sys print __doc__ try: - fn = sys.argv[1] + fn = sys.argv[1] except: - fn = "../cpp/board.jpg" + fn = "../cpp/board.jpg" src = cv2.imread(fn, 1) img = cv2.cvtColor(src, cv2.COLOR_BGR2GRAY)