From: Roman Donchenko Date: Tue, 27 Aug 2013 09:26:44 +0000 (+0400) Subject: Merge commit '43aec5ad' into merge-2.4 X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~3787^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c4bbb313c29daf0d10c34128cd6eac1de8111de;p=platform%2Fupstream%2Fopencv.git Merge commit '43aec5ad' into merge-2.4 Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVLegacyOptions.cmake modules/contrib/src/retina.cpp modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst modules/gpu/doc/video.rst modules/gpu/src/speckle_filtering.cpp modules/python/src2/cv2.cv.hpp modules/python/test/test2.py samples/python/watershed.py --- 2c4bbb313c29daf0d10c34128cd6eac1de8111de diff --cc doc/tutorials/introduction/linux_install/linux_install.rst index e8b96da,1e02b64..afa2951 --- a/doc/tutorials/introduction/linux_install/linux_install.rst +++ b/doc/tutorials/introduction/linux_install/linux_install.rst @@@ -80,4 -80,3 +80,5 @@@ Building OpenCV from Source Using CMake .. note:: If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter. + ++ If the size of the created library is a critical issue (like in case of an Android build) you can use the ``install/strip`` command to get the smallest size as possible. The *stripped* version appears to be twice as small. However, we do not recommend using this unless those extra megabytes do really matter. diff --cc include/opencv/cv.h index 5a517dc,77d0971..1ed020a --- a/include/opencv/cv.h +++ b/include/opencv/cv.h @@@ -72,5 -75,8 +72,4 @@@ #define CV_IMPL extern "C" #endif //CV_IMPL -#if defined(__cplusplus) -#include "opencv2/core/internal.hpp" -#endif //__cplusplus - #endif // __OPENCV_OLD_CV_H_ - diff --cc modules/ocl/perf/perf_calib3d.cpp index f9fe654,ff6c6f2..7b14988 --- a/modules/ocl/perf/perf_calib3d.cpp +++ b/modules/ocl/perf/perf_calib3d.cpp @@@ -48,30 -48,30 +48,30 @@@ ///////////// StereoMatchBM //////////////////////// PERFTEST(StereoMatchBM) { - Mat left_image = imread(abspath("aloeL.jpg"), cv::IMREAD_GRAYSCALE); - Mat right_image = imread(abspath("aloeR.jpg"), cv::IMREAD_GRAYSCALE); - Mat disp,dst; - ocl::oclMat d_left, d_right,d_disp; - int n_disp= 128; - int winSize =19; + Mat left_image = imread(abspath("aloeL.jpg"), cv::IMREAD_GRAYSCALE); + Mat right_image = imread(abspath("aloeR.jpg"), cv::IMREAD_GRAYSCALE); + Mat disp,dst; + ocl::oclMat d_left, d_right,d_disp; + int n_disp= 128; + int winSize =19; - SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg "; + SUBTEST << left_image.cols << 'x' << left_image.rows << "; aloeL.jpg ;"<< right_image.cols << 'x' << right_image.rows << "; aloeR.jpg "; - StereoBM bm(0, n_disp, winSize); - bm(left_image, right_image, dst); + Ptr bm = createStereoBM(n_disp, winSize); + bm->compute(left_image, right_image, dst); - CPU_ON; - bm(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); + d_left.upload(left_image); + d_right.upload(right_image); - ocl::StereoBM_OCL d_bm(0, n_disp, winSize); + ocl::StereoBM_OCL d_bm(0, n_disp, winSize); - WARMUP_ON; - d_bm(d_left, d_right, d_disp); - WARMUP_OFF; + WARMUP_ON; + d_bm(d_left, d_right, d_disp); + WARMUP_OFF; cv::Mat ocl_mat; d_disp.download(ocl_mat); diff --cc modules/ocl/test/test_kmeans.cpp index ab4e340,1ea0b1c..008acfa --- a/modules/ocl/test/test_kmeans.cpp +++ b/modules/ocl/test/test_kmeans.cpp @@@ -119,9 -119,9 +119,9 @@@ TEST_P(Kmeans, Mat) 1, flags, centers); ocl::kmeans(d_src, K, d_labels, - TermCriteria( CV_TERMCRIT_EPS+CV_TERMCRIT_ITER, 100, 0), + TermCriteria( TermCriteria::EPS + TermCriteria::MAX_ITER, 100, 0), 1, flags, d_centers); - + Mat dd_labels(d_labels); Mat dd_centers(d_centers); if(flags & KMEANS_USE_INITIAL_LABELS) diff --cc modules/photo/src/denoising.cpp index d61a05f,4762eda..b8bae12 --- a/modules/photo/src/denoising.cpp +++ b/modules/photo/src/denoising.cpp @@@ -236,7 -236,5 +236,5 @@@ void cv::fastNlMeansDenoisingColoredMul Mat dst_lab(srcImgs[0].size(), srcImgs[0].type()); mixChannels(l_ab_denoised, 2, &dst_lab, 1, from_to, 3); - cvtColor(dst_lab, dst, CV_Lab2LBGR); + cvtColor(dst_lab, dst, COLOR_Lab2LBGR); } - - diff --cc modules/videostab/src/precomp.hpp index 6911074,5febaaa..aa6026d --- a/modules/videostab/src/precomp.hpp +++ b/modules/videostab/src/precomp.hpp @@@ -64,5 -59,24 +64,4 @@@ inline float intensity(const cv::Point3 return 0.3f*bgr.x + 0.59f*bgr.y + 0.11f*bgr.z; } -template inline T& at(int index, T *items, int size) -{ - return items[cv::borderInterpolate(index, size, cv::BORDER_WRAP)]; -} - -template inline const T& at(int index, const T *items, int size) -{ - return items[cv::borderInterpolate(index, size, cv::BORDER_WRAP)]; -} - -template inline T& at(int index, std::vector &items) -{ - return at(index, &items[0], static_cast(items.size())); -} - -template inline const T& at(int index, const std::vector &items) -{ - return items[cv::borderInterpolate(index, static_cast(items.size()), cv::BORDER_WRAP)]; -} - #endif - diff --cc samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp index a0f6d12,f20669f..b45d60a --- a/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp +++ b/samples/cpp/tutorial_code/TrackingMotion/goodFeaturesToTrack_Demo.cpp @@@ -87,7 -87,6 +87,6 @@@ void goodFeaturesToTrack_Demo( int, voi { circle( copy, corners[i], r, Scalar(rng.uniform(0,255), rng.uniform(0,255), rng.uniform(0,255)), -1, 8, 0 ); } /// Show what you got - namedWindow( source_window, CV_WINDOW_AUTOSIZE ); + namedWindow( source_window, WINDOW_AUTOSIZE ); imshow( source_window, copy ); } - diff --cc samples/cpp/tutorial_code/introduction/display_image/display_image.cpp index 44ef32c,8990bac..847cd8f --- a/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp +++ b/samples/cpp/tutorial_code/introduction/display_image/display_image.cpp @@@ -22,9 -22,9 +22,9 @@@ int main( int argc, char** argv return -1; } - namedWindow( "Display window", CV_WINDOW_AUTOSIZE );// Create a window for display. - imshow( "Display window", image ); // Show our image inside it. + namedWindow( "Display window", WINDOW_AUTOSIZE ); // Create a window for display. + imshow( "Display window", image ); // Show our image inside it. - waitKey(0); // Wait for a keystroke in the window + waitKey(0); // Wait for a keystroke in the window return 0; - } + } diff --cc samples/python2/camshift.py index 910fd82,bc96588..7fb51fc --- a/samples/python2/camshift.py +++ b/samples/python2/camshift.py @@@ -117,10 -113,7 +117,9 @@@ class App(object) if __name__ == '__main__': import sys - try: video_src = sys.argv[1] - except: video_src = 0 + try: + video_src = sys.argv[1] + except: + video_src = 0 print __doc__ App(video_src).run() -