Commit Graph

19551 Commits

Author SHA1 Message Date
Alexander Alekhin
44bda8fbb7 Merge pull request #7044 from wolever:master 2016-08-09 12:59:38 +00:00
Alexander Alekhin
32c239085d Merge pull request #7067 from tomoaki0705:fixBuildErrorJetsonK1 2016-08-09 10:39:56 +00:00
Tomoaki Teshima
3debc78a5f fix build error on JetsonTK1
* avoid using vld1_f16 and vst1_f16 on gcc 4 series (Ubuntu 14.04)
  * guard correctly with #if
  * use static inline
2016-08-09 17:12:22 +09:00
Vadim Pisarevsky
c1d73e4fca Merge pull request #7059 from berak:doc_python_drawkeypoints 2016-08-08 15:31:11 +00:00
Vadim Pisarevsky
0d8a21efd5 Merge pull request #7016 from lewgate:bugfix_2 2016-08-08 15:20:11 +00:00
Vadim Pisarevsky
28d28a2607 Merge pull request #7024 from paroj:semanticidx 2016-08-08 15:19:36 +00:00
Vadim Pisarevsky
b316aa3710 Merge pull request #7043 from alalek:add_nonfree_flag 2016-08-08 15:18:49 +00:00
Vadim Pisarevsky
a95d63dab6 Merge pull request #7042 from alalek:update_6967 2016-08-08 15:17:48 +00:00
Vadim Pisarevsky
39ebca5dbf Merge pull request #7047 from tomoaki0705:brushUpFp16Cuda 2016-08-08 14:43:57 +00:00
Maksim Shabunin
ad974de165 Merge pull request #7066 from StevenPuttemans:fix_build_cuda_issues 2016-08-08 13:22:49 +00:00
Alexander Alekhin
2833aeb310 Merge pull request #7060 from catree:add_camera_model_doc 2016-08-08 11:49:41 +00:00
Alexander Alekhin
9c90b6271c Merge pull request #7040 from sovrasov:calib_tutorial_code_update 2016-08-08 11:38:20 +00:00
StevenPuttemans
2ad411f914 fixing issues 2016-08-08 12:12:35 +02:00
Vladislav Sovrasov
46c8b09453 Improvements in camera_calibration tutorial code 2016-08-08 12:07:04 +03:00
berak
d2a1994d71 python docs: fix missing output image in cv2.drawKeypoint examples 2016-08-08 08:14:26 +02:00
catree
74b899d8b0 Modify the figure of the pinhole camera model with pixels starting from the uv axis. 2016-08-08 03:31:31 +02:00
mschoeneck
5f30a0a076 Merge pull request #6958 from mschoeneck:Common-Canny-parallelization
* Common Canny parallelization added. TBB and single thread code removed. Final pass vectorized with SSE2 intrinsics.

* wrong #ifdef replaced with #if

* Merged to actual Canny version

* Merged common parallelized Canny with actual Canny implementation

* Remove 'Mutex *mutex' and pass 'Mutex mutex' from outside to parallelCanny

* Replaced extern Mutex with intern mutable Mutex.
2016-08-05 17:20:56 +03:00
Tomoaki Teshima
2db2d137ce follow the naming rule as other API
* stop using 'CUDA' prefix
  * add explanation
2016-08-05 22:14:55 +09:00
Alexander Alekhin
b12286329f imgproc: sepFilter: update OpenCL condition
Problem is observed with test_loop_times=100
in corner cases like 93x1 or similar
2016-08-05 12:27:24 +03:00
Alexander Alekhin
2812762d6b imgproc: disable IPP for GaussianBlur in case of ROI 2016-08-05 12:27:18 +03:00
matze
37cccf17c0 imgproc: Prefer OCL calculation before IPP in GaussianBlur. 2016-08-05 12:27:16 +03:00
David Wolever
b42288c2de
Cleaner fix for crash on double-stop of CvVideoCamera 2016-08-04 12:44:07 -04:00
Alexander Alekhin
18e7afdfd9 cmake: add OPENCV_ENABLE_NONFREE option and macro 2016-08-04 19:23:49 +03:00
Vadim Pisarevsky
35d0a45df6 Merge pull request #7020 from StevenPuttemans:add_scale_option 2016-08-04 13:37:29 +00:00
Vadim Pisarevsky
d67e6f5cc9 Merge pull request #7029 from wolever:master 2016-08-04 13:34:55 +00:00
Maksim Shabunin
1ae9a5d1d8 Merge pull request #7038 from StevenPuttemans:fix_module_including 2016-08-04 13:23:41 +00:00
Vadim Pisarevsky
29afb83f24 Merge pull request #7039 from vpisarev:2_small_fixes 2016-08-04 12:13:35 +00:00
Vadim Pisarevsky
d7ee62f03b 1. fix warning from Xcode 7.x
2. fixed parsing of "cat[range_spec]ord[range_spec]" type specification string when using ml::TrainData::loadFromCSV(). Thanks to A. Kaehler for reporting it
2016-08-04 12:52:10 +03:00
StevenPuttemans
e42750c63c fix including of correct header files #7027 2016-08-04 11:32:33 +02:00
Alexander Alekhin
b2698f24b0 Merge pull request #7033 from tomoaki0705:brushUpFp16 2016-08-04 09:31:52 +00:00
Vadim Pisarevsky
7eee5cb724 Merge pull request #7026 from sovrasov:calib_points_number 2016-08-04 09:14:03 +00:00
Vadim Pisarevsky
b8d743bf50 Merge pull request #6970 from K-Shinotsuka:issue6 2016-08-03 18:50:00 +00:00
Vadim Pisarevsky
0a7e53da0a Merge pull request #7010 from K-Shinotsuka:issue10 2016-08-03 18:44:02 +00:00
Vadim Pisarevsky
03d6c5e473 Merge pull request #7011 from K-Shinotsuka:issue11 2016-08-03 18:34:08 +00:00
Alexander Alekhin
6a69852df1 Merge pull request #7030 from jpaveggio:patch-1 2016-08-03 10:20:23 +00:00
k-shinotsuka
1a18a33688 improve SumSqr_SIMD<schar, int, int>() 2016-08-03 19:17:51 +09:00
Tomoaki Teshima
87ca607fd4 brush up convertFp16
* raise an error when wrong bit depth passed
  * raise an build error when wrong depth is specified for cvtScaleHalf_
  * remove unnecessary safe check in cvtScaleHalf_
  * use intrinsic instead of direct pointer access
  * update the explanation
2016-08-03 17:27:45 +09:00
Juan Pablo Aveggio
ba5f9d68c4 Update bagofwords.cpp 2016-08-02 20:53:05 -03:00
David Wolever
3d19de2b58
Fix crash on double-stop of CvVideoCamera 2016-08-02 17:52:02 -04:00
k-shinotsuka
0b4e06ad3c improve SumSqr_SIMD<uchar, int, int>() 2016-08-02 23:46:03 +09:00
k-shinotsuka
5775ace5e0 improve thresh_8u() 2016-08-02 23:35:14 +09:00
Vadim Pisarevsky
fc742da6e3 Merge pull request #6959 from LeoBras:Better_StereoBM 2016-08-02 14:30:02 +00:00
Jeff McBride
562c15cbe9 Don't assume all images have the same number of calibration points
Cast to (int) to avoid warnings

Add test for different points number case in fisheye calibration function
2016-08-02 17:21:17 +03:00
Pavel Rojtberg
15dabc11b5 Mat: use row/ col instead of i0/ i1 for parameter names in 2D case
this improves documentation when using an IDE and reflects that Mats are
row major.
2016-08-02 13:57:51 +02:00
StevenPuttemans
d8698fc359 allow for screen size related resizing 2016-08-02 10:44:01 +02:00
Alexander Alekhin
da2810918c Merge pull request #6991 from tomoaki0705:featureGpuMatFp16 2016-08-02 08:39:25 +00:00
Alexander Alekhin
4f7b3e8a56 Merge pull request #7018 from catree:add_camera_model_doc 2016-08-01 13:27:34 +00:00
catree
6e931aaab7 Add pinhole camera model illustration in calib3d documentation. 2016-08-01 02:25:45 +02:00
Tomoaki Teshima
2974b049e7 cudev: add feature to convert FP32(float) from/to FP16(half) on GPU
* add feature of Fp16 on GPU (cudev)
  * add test
  * leave template function as unimplemented to raise error
2016-08-01 00:55:16 +09:00
lewgate
4ae4a705d5 Fix a bug for seam_finders.cpp when computing the source and destination points of the seam 2016-07-31 17:13:23 +08:00