mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,851 Commits 6 Branches 126 Tags 3 GiB
5e667ee53a
Commit Graph

10995 Commits

Author SHA1 Message Date
Alexander Karsakov
a48c1c8248 Added workaround for Nvidia: take into account that 3-channel vector type takes 4*elem_size in local memory. 2014-09-02 12:38:02 +04:00
Alexander Karsakov
214dab39f6 Fixed BORDER_REFLECT and BORDER_REFLECT_101 extrapolation for case x > 2*maxV 2014-09-02 11:53:31 +04:00
Vadim Pisarevsky
a125cd6c6d Merge pull request #3169 from znah:py_wrap 2014-09-01 18:01:12 +00:00
Ilya Lavrenov
5d3a128cd3 NEON impl on cv::convertScaleAba CV_32f 2014-09-01 17:04:36 +00:00
Vadim Pisarevsky
3bafe64666 Merge pull request #3170 from ElenaGvozdeva:ocl_fix 2014-09-01 10:40:02 +00:00
Vadim Pisarevsky
3e574cd26a Merge pull request #3173 from rokm:cuda-6.5 2014-09-01 10:38:43 +00:00
Vadim Pisarevsky
1f85ffa11b Merge pull request #3166 from akarsakov:ocl_native_sqrt 2014-09-01 10:36:50 +00:00
Alexander Mordvintsev
c1032b6232 remove structured_edge_detection.hpp from blacklist 
don't discard pure virtual methods in hdr_parser.py (was broken anyway)
 2014-09-01 13:55:41 +04:00
Maksim Shabunin
66ed9ddbe3 Added Ptr<T> support to Java wrappers 2014-09-01 11:24:44 +04:00
Dmitriy Anisimov
5f3ee657ce removed kdtree declaration from interface 2014-08-31 21:39:47 +04:00
Philipp Hasper
e310added4 Fixing Matx ostream operator 
cv::Matx could not be converted to c::Mat automatically
 2014-08-31 14:37:43 +02:00
Rok Mandeljc
eb3cb77296 Fixes for compiling with CUDA 6.5 
Based on commit feb74b125d from 2.4.9 branch.
 2014-08-29 23:09:02 +02:00
Alexander Alekhin
4d474d40e7 Merge pull request #3171 from akarsakov:amd_fft_fix 2014-08-29 16:28:31 +00:00
Ilya Lavrenov
71ec6144bd attempt to fix compilation of OpenCL cv::transpose for AMD 2014-08-29 16:59:30 +04:00
Alexander Karsakov
d4e6812be2 Added check AmdFft version to be sure that AmdFft binaries are available 2014-08-29 14:23:18 +04:00
Elena Gvozdeva
31ac73c315 fix for cv::memopTypeToStr 2014-08-29 14:18:52 +04:00
Alexander Alekhin
57fec2f2da OCL: enable clAmdFftGetVersion 2014-08-29 13:45:04 +04:00
Vadim Pisarevsky
6ccb7e169d Merge pull request #3163 from StevenPuttemans:fix_nonfree_items 2014-08-29 08:08:52 +00:00
Alexander Karsakov
491bf41356 Disabled native_sqrt for double, since it may be not implemented and gives compilation error. 2014-08-28 17:01:49 +04:00
StevenPuttemans
d27e440b2a continue fixing nonfree elements 
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
 2014-08-28 13:30:47 +02:00
Vadim Pisarevsky
21f1a0ee49 Merge pull request #3161 from ElenaGvozdeva:ocl_perf_gemm 2014-08-28 10:41:11 +00:00
Alexander Alekhin
b332152bef Merge pull request #2956 from ilya-lavrenov:tapi_accumulate 2014-08-28 09:08:51 +00:00
Alexander Karsakov
6b6c7ccfea Added accuracy tests with real and generated data 2014-08-27 17:58:48 +04:00
Alexander Karsakov
f7aadd07f6 Added getLines, fill_accum_local kernels 2014-08-27 17:57:22 +04:00
Vadim Pisarevsky
d66815978a Merge pull request #3117 from KruchDmitriy:canny_opt 2014-08-27 10:07:55 +00:00
Vadim Pisarevsky
4d9d7e6ded Merge pull request #3160 from akarsakov:ocl_dft_double_support 2014-08-27 10:06:34 +00:00
Alexander Karsakov
a89ff402fc Refactoring of OCL_FftPlan class 2014-08-27 10:33:25 +04:00
Vadim Pisarevsky
b5d073ad3f Merge pull request #3149 from StevenPuttemans:fix_nonfree_includes 2014-08-26 16:03:53 +00:00
Vadim Pisarevsky
7189112308 Merge pull request #3152 from PhilLab:VideoCaptureFix 2014-08-26 16:02:46 +00:00
Vadim Pisarevsky
89605fac04 Merge pull request #3155 from vbystricky:ocloptLaplacian 2014-08-26 16:01:44 +00:00
Elena Gvozdeva
46b6a095a2 changed perf test for ocl_gemm 2014-08-26 15:05:36 +04:00
VBystricky
9ee0789174 Fix issues 2014-08-26 14:39:11 +04:00
PhilLab
a0e4600364 VideoCapture did not detect an unopened camera 2014-08-26 09:42:46 +02:00
Alexander Alekhin
6d253a2068 Merge pull request #2921 from ilya-lavrenov:tapi_memop 2014-08-26 06:34:20 +00:00
StevenPuttemans
564a8ed208 adapted all nonfree header inclusion since it doesn't exist anymore as a module 2014-08-25 21:31:34 +02:00
Vadim Pisarevsky
b1d01dc757 Merge pull request #3157 from PhilLab:pnpFix 2014-08-25 18:11:10 +00:00
Vadim Pisarevsky
5301fe729e Merge pull request #3154 from PhilLab:patch-4 2014-08-25 18:09:27 +00:00
Vadim Pisarevsky
2211cfe783 Merge pull request #3151 from PhilLab:orbNoKeypoints 2014-08-25 17:10:45 +00:00
PhilLab
e95c33dd18 PnP solver: fixed element-wise access 2014-08-25 17:06:17 +02:00
Alexander Karsakov
3ae95150c7 Added double support for OCL version of DFT 2014-08-25 18:08:43 +04:00
vbystricky
e75cd74f5a Optimize OpenCL version of Laplacian filter for kernel size great than 3 2014-08-25 17:56:09 +04:00
Philipp Hasper
30742d21d8 CUDA optical flow stubs: missing parameter 2014-08-25 14:49:21 +02:00
Alexander Karsakov
038bfb98ec Added fill_accum kernel 2014-08-25 13:55:09 +04:00
Ilya Lavrenov
7017b1250a used new stratehy in cv::accumulate** 2014-08-25 11:25:54 +04:00
Ilya Lavrenov
2c6b7a52e9 improved cv::ocl::predictOptimalVectorWidth 2014-08-25 11:25:01 +04:00
Ilya Lavrenov
a350b76738 optimization of cv::accumulate** 2014-08-25 11:25:01 +04:00
Ilya Lavrenov
2f46cf5ddb changed base types for cv::memopTypeToStr 2014-08-25 11:23:46 +04:00
Philipp Hasper
9b1136518c ORB.cl : fixed redefinition of val 2014-08-23 19:07:14 +02:00
Dmitriy Anisimov
9ddb23e025 first implementation KNearest wrapper on KDTree 2014-08-23 18:41:32 +04:00
PhilLab
92826a0436 ORB crashed with no keypoints present 2014-08-23 14:02:15 +02:00
Alexander Karsakov
5c1f71de51 Added make_point_list kernel 2014-08-22 16:50:01 +04:00
Vadim Pisarevsky
e7539bd2c8 Merge pull request #3144 from ElenaGvozdeva:ocl_morphSmall 2014-08-22 12:14:06 +00:00
Vadim Pisarevsky
f624f92e7a Merge pull request #3142 from akarsakov:fix_cvtcolor_luv_rgb_master 2014-08-22 07:24:21 +00:00
U-KruchininD-ПК\KruchininD
6ed168d3af New optimization for canny 
new hysteresis

delete whitespaces

fix problem with mad24

Dynamic work group size

dynamic work group size

Fix problem with warnings

Fix some problems with border

Another one fix

Delete trailing whitespaces

some changes

fix problem with warning
 2014-08-22 11:22:15 +04:00
Vadim Pisarevsky
887a950243 Merge pull request #3116 from shubhra:master 2014-08-22 07:15:40 +00:00
Vadim Pisarevsky
0eb1c7edb1 Merge pull request #3127 from GravityJack:size-math-ops 2014-08-22 07:14:13 +00:00
Vadim Pisarevsky
b56933d9dc Merge pull request #3131 from znah:python_namespaces 2014-08-22 07:12:31 +00:00
Vadim Pisarevsky
1efc3cff36 Merge pull request #3124 from f-morozov:optim_pr 2014-08-22 07:04:43 +00:00
Elena Gvozdeva
7ad6b47bc9 fixed ocl_boxFilter 2014-08-22 10:31:13 +04:00
Marc Rollins
17e8d51124 Fixing uninitialized temporary. 2014-08-21 11:41:12 -07:00
Marc Rollins
703921e2fd Reverting pass-by-value changes to arithmetic operators. 2014-08-21 10:37:36 -07:00
Alexander Alekhin
d47a2988a9 Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix 2014-08-21 15:48:10 +00:00
Alexander Mordvintsev
c23d6b67ee blacklisted 'tracking' due to some linking problem 2014-08-21 18:45:50 +04:00
Alexander Mordvintsev
2a9e252f77 fix namespace conflicts (like cv::inpaint and cv::xphoto::inpaint) 
whitespace fix
 2014-08-21 17:33:21 +04:00
Alexander Karsakov
3d222d313b Fixed range for 'v' channel for 8U images 2014-08-21 17:22:06 +04:00
Elena Gvozdeva
5302e56071 fix for ocl_morphSmall 2014-08-21 16:31:24 +04:00
Alexander Mordvintsev
74c77d826f base class name resolution 
fixed find_obj.py
 2014-08-21 14:51:03 +04:00
Vadim Pisarevsky
de2a8d3706 Merge pull request #3135 from thorikawa:fix-arithmetic-exception-with-ipp 2014-08-21 05:41:18 +00:00
f-morozov
0ae89fe2be AKAZE optimizations 2014-08-21 09:34:52 +04:00
Vadim Pisarevsky
5afaa6b1e7 Merge pull request #3129 from PhilLab:patch-2 2014-08-21 05:30:17 +00:00
Shubhra Pandit
7b2a1d15cc Doc changes for feature changes 1544 and 1557 2014-08-20 20:49:50 -04:00
Vadim Pisarevsky
44e04da79c Merge pull request #2942 from ernest-galbrun:tvl1_chambolle 2014-08-20 14:21:08 +00:00
Vadim Pisarevsky
b2cd954f24 Merge pull request #3042 from edgarriba:master 2014-08-20 13:18:37 +00:00
Poly Takahiro Horikawa
cb0ab87646 Fix arithmetic exception when pass an empty mat with IPP option on. 2014-08-19 19:19:53 -07:00
Vadim Pisarevsky
57a1343f10 Merge pull request #3133 from bmagyar:patch-1 2014-08-19 22:23:59 +00:00
Vadim Pisarevsky
a223479107 Merge pull request #3099 from f-morozov:akaze_tutorial 2014-08-19 22:22:23 +00:00
Bence Magyar
04b2d9a453 Fix color table 
Apart from not displaying the table, it breaks the doc build of https://github.com/Itseez/opencv_contrib/pull/70.
 2014-08-19 18:00:13 +02:00
Alexander Mordvintsev
40d0f853d6 removing modules from blacklist 2014-08-19 19:19:11 +04:00
Alexander Mordvintsev
c4c731c0aa fixing warnings 
keep old const names for compatibility
 2014-08-19 16:57:37 +04:00
Alexander Mordvintsev
c22dcb04af fixing warnings 2014-08-19 16:40:09 +04:00
Alexander Mordvintsev
e74cddfbd1 put consts into python submodules 
maintain set of visited namespaces in CppHeaderParser
WARNING: REMOVED const name conversion (SomeConstName -> SOME_CONST_NAME), discussion needed
 2014-08-19 16:40:09 +04:00
Alexander Mordvintsev
6d1c02ffed unified namespace population with 'init_submodule' 2014-08-19 16:40:08 +04:00
Alexander Mordvintsev
4a519a25f3 nested classes support 2014-08-19 16:40:08 +04:00
Alexander Mordvintsev
5ad7f9910f function namespaces partially work 2014-08-19 16:40:07 +04:00
Alexander Mordvintsev
e85e83f491 handling namespaces on parsing functions 
submodule method tables generation
 2014-08-19 16:40:06 +04:00
f-morozov
886319c81d AKAZE fixes and tracking tutorial 2014-08-19 16:35:20 +04:00
PhilLab
e09adc4fde Clarified parameter useExtrinsicGuess in solvePnP 2014-08-19 11:08:16 +02:00
Vadim Pisarevsky
8658aef3bf Merge pull request #3104 from dkanafeev:new_ipp_func_master 2014-08-19 09:06:45 +00:00
Vadim Pisarevsky
24163eb929 Merge pull request #3122 from akarsakov:cvtcolor_perf_test_fix 2014-08-19 09:01:35 +00:00
Vadim Pisarevsky
70679b49fc Merge pull request #3121 from akarsakov:ocl_dft_opt 2014-08-19 08:57:53 +00:00
Ernest Galbrun
2f077fcd99 fixed failing test in opencv_video 2014-08-19 10:00:03 +02:00
Alexander Smorkalov
f38ebba34d Build fix for NVIDIA Tegra optimizations integration. 2014-08-19 11:40:25 +04:00
edgarriba
deec233519 cleaned dls code 2014-08-19 00:56:13 +02:00
edgarriba
15704c384e cleaned dls code 2014-08-19 00:52:09 +02:00
edgarriba
2653d745fd updated sanity data 2014-08-19 00:35:22 +02:00
edgarriba
6ea73a5bff updated dls perf test 2014-08-19 00:22:08 +02:00
edgarriba
7e2bb63378 Merge branch 'master' of https://github.com/Itseez/opencv 2014-08-18 22:30:00 +02:00
edgarriba
620387fbe1 Update perf_pnp && ransac model points 2014-08-18 21:46:16 +02:00
Marc Rollins
8fc1848918 Simplifying arithmetic and comparison operator implementation. 
Implementing + and - in terms of += and -=.
Implementing != in terms of ==.
 2014-08-18 12:25:48 -07:00
Marc Rollins
d3d9b538c7 Implementing division operators. 2014-08-18 11:48:38 -07:00
Marc Rollins
d7a8166720 Implementing *= operator. Implementing * in terms of it. 2014-08-18 11:42:10 -07:00
Dmitriy Anisimov
37b1a7560c first version of moving KDTree from core to ml 2014-08-18 22:40:31 +04:00
Maksim Shabunin
108caae216 Modified logistic regression module according to comments 
- Reworked documentation to reflect actual code
- Removed some unused variables
- Removed unnecessary 'cv::' modifiers
 2014-08-18 19:13:59 +04:00
Maksim Shabunin
4667e18831 Updated logistic regression example 
- Extracted common operations to separate functions.
- Activated first parameters set.
- Some output formatting.
- Fixed loop break condition in mini_batch_gradient function.
 2014-08-18 19:06:58 +04:00
Maksim Shabunin
3e26086f82 Reworked ML logistic regression implementation, initial version 2014-08-18 19:06:58 +04:00
Maksim Shabunin
71770eb790 Fixed ML module build after merge 2014-08-18 19:06:58 +04:00
Rahul Kavi
a23836231f fixed warnings in type conversions 
fixed warnings in type conversions from size_t to int (in getting size of number of unique classes in a training problem).
 2014-08-18 19:06:58 +04:00
Rahul Kavi
d20b2a5a97 removed extra comments in train method 2014-08-18 19:06:58 +04:00
Rahul Kavi
ae02ecec60 removed a couple of unnecessary comments in Logistic Regression training method 2014-08-18 19:06:58 +04:00
Rahul Kavi
f20db35b78 fixed logistic regression documentation warnings 2014-08-18 19:06:58 +04:00
Rahul Kavi
21de04b4a2 fixed default constructor for LogisticRegression class declaration 2014-08-18 19:06:58 +04:00
Rahul Kavi
65eb52a247 removed default value from LogisticRegression constructor function definition 2014-08-18 19:06:57 +04:00
Rahul Kavi
e7f14f3d0e fixed missing semicolon in logistic regression documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
3622de2621 updated mini_batch_size description for LogisticRegressionParams in documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
e4ef0e0ca8 fixed indentation in logistic regression documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
7c97dbc196 fixed indentation in logistic regression documentation 2014-08-18 19:06:57 +04:00
Rahul Kavi
aa35835cfc fixed white space in logistic regression prototype 2014-08-18 19:06:57 +04:00
Rahul Kavi
8995921cc5 fixed white space in logistic regression classifier 2014-08-18 19:06:57 +04:00
Rahul Kavi
a9df50eefc updated test for logistic regression 2014-08-18 19:06:57 +04:00
Rahul Kavi
b3b4e83aed updated logistic regression definition 2014-08-18 19:06:57 +04:00
Rahul Kavi
95ea09c3dc updated prototype for logistic regression classifier 2014-08-18 19:06:57 +04:00
Rahul Kavi
bf2ee3c58a updated prototype for logistic regression classifier 2014-08-18 19:06:52 +04:00
Rahul Kavi
3a6deb3ed3 updated documentation to reflect new api changes for logistic regression 2014-08-18 19:06:52 +04:00
Rahul Kavi
af88f0c067 updated documentation to do reflect changes to logistic regression class 2014-08-18 19:06:52 +04:00
Rahul Kavi
1652b2a443 fixed trailing whitespaces in LogisticRegression code. 2014-08-18 19:06:52 +04:00
Rahul Kavi
5bb43f69ab removed trailing whitespaces from predict function 2014-08-18 19:06:52 +04:00
Rahul Kavi
50031ffb15 removed trailing whitespaces from updated logistic regression definition 2014-08-18 19:06:52 +04:00
Rahul Kavi
78f3b0ad1f removed unnecessary semicolon in LogisticRegression class documentation 2014-08-18 19:06:52 +04:00
Rahul Kavi
56d715b091 fixed typedef for LogisticRegression. Updated LogisticRegression prototype with newer C++ API 2014-08-18 19:06:52 +04:00
Rahul Kavi
e4a90c19cc updated documentation to reflect newer changes to LogisticRegression class 2014-08-18 19:06:48 +04:00
Rahul Kavi
64aaa6e1ae updated test for logistic regression after changes to LogisticRegression class 2014-08-18 19:06:48 +04:00
Rahul Kavi
d5ad4f3255 added updated logistic regression prototype with newer C++ API 2014-08-18 19:06:48 +04:00
Rahul Kavi
0e13f33193 rewrote the code to update API, removed inheritance from CvStatModel. 2014-08-18 19:06:48 +04:00
Rahul Kavi
6c74439d56 fixed trailing white-space in logistic regression class 2014-08-18 19:06:48 +04:00
Rahul Kavi
6ae43a2243 added logistic regression classifier 2014-08-18 19:06:48 +04:00
Rahul Kavi
fcfeb2451b added logistic regression prototype 2014-08-18 19:06:48 +04:00
Rahul Kavi
3039ed7682 added test for logistic regression 2014-08-18 19:06:36 +04:00
Rahul Kavi
3bf6c3c2aa added documentation for logistic regression classifier 2014-08-18 19:06:36 +04:00
Rahul Kavi
b9902f39b7 added reference to logistic regression document 2014-08-18 19:06:36 +04:00
Alexander Karsakov
cf1ae3513f Fixed getConversionInfo() for YUV2RGBA_* conversions 2014-08-18 18:34:44 +04:00
Alexander Karsakov
fa818d03b8 Changed twiddle buffer creation to use OCL buffer pool (if possible) 2014-08-18 18:22:52 +04:00
Ernest Galbrun
6207d338dd merged new master branch 
changed tests for tvl1 optflow
correction of a bug preventing compilation with cuda (fmin changed to fminf)
 2014-08-18 15:29:45 +02:00
Vadim Pisarevsky
0ffc53bafe Merge pull request #3107 from vpisarev:fixed_win_build 2014-08-18 09:00:54 +00:00
Ernest Galbrun
fae69df9a9 Merge remote-tracking branch 'remotes/origin/master' into tvl1_chambolle 
Conflicts:
	modules/video/doc/motion_analysis_and_object_tracking.rst
 2014-08-17 22:08:12 +02:00
Shubhra Pandit
6ca893be23 Adding feature 1544 and 1557 
-cv::findHomography added a parameter for RANSAC iterations
 -cv::findHomography added a parameter for RANSAC confidence
 2014-08-17 13:06:06 -04:00
Vadim Pisarevsky
dea40e5e99 Merge pull request #3086 from fpuja:pragma_warning4127_fixing 2014-08-16 16:50:41 +00:00
Vadim Pisarevsky
e9729a9601 multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics 2014-08-16 00:29:10 +04:00
Vadim Pisarevsky
740c5234b1 fix compile problems with contributed ximgproc/xphoto 2014-08-15 18:00:41 +04:00
dkanafeev
1b0f0d7ead Intel Summer School 2014 
Switch branch to master.
New IPP func - ippiCopy
Conv: YUV2GRAY_420
 2014-08-15 12:54:31 +04:00
Vadim Pisarevsky
daaa5a1824 removed duplicated Hershey fonts 2014-08-15 12:09:16 +04:00
Vadim Pisarevsky
dfbeaddc72 Merge pull request #3106 from LeszekSwirski:fix-gemm-buf-allocate 2014-08-15 05:44:54 +00:00
jaco
dbb0fcdc7a #pragma warning4127 fixation modified 2 2014-08-14 19:27:53 +02:00
Roman Donchenko
fb9a143429 Set status to alpha 2014-08-14 19:17:29 +04:00
Leszek Swirski
de806330fd Fix reallocation of D buffer in gemm 2014-08-14 15:54:54 +01:00
Alexander Alekhin
52ac61d87c Merge pull request #3088 from vbystricky:ocl_enableNormEtc 2014-08-14 14:34:40 +00:00
vbystricky
942ff5be57 Disable OpenCL version of minMaxIdx with mask on AMD devices 2014-08-14 17:39:41 +04:00
Vadim Pisarevsky
95a4943762 Merge pull request #3103 from vpisarev:core_imgproc_optim_rearrangements 2014-08-14 13:39:01 +00:00
Vadim Pisarevsky
ed8a7fa541 Merge pull request #3101 from akarsakov:ipp_thresh_fix 2014-08-14 11:42:14 +00:00
Vadim Pisarevsky
0e46b4cd03 Merge pull request #3102 from akarsakov:ocl_denoising_fix 2014-08-14 10:59:32 +00:00
Vadim Pisarevsky
75487d43f5 fixed trailing whitespaces 2014-08-14 14:53:02 +04:00
Vadim Pisarevsky
9a5aa4b23c trying to solve compile problems; temporarily disabled some tests for just added optimization algo's 2014-08-14 14:37:30 +04:00
Alexander Alekhin
cf4a536440 Merge pull request #3098 from jet47:fix-cuda-compilation 2014-08-14 10:05:49 +00:00
Vadim Pisarevsky
00b2124876 fixing more compile problems with Java bindings etc 2014-08-14 13:48:52 +04:00
Vadim Pisarevsky
4530c7ad08 trying to fix builds 2014-08-14 13:18:04 +04:00
Vadim Pisarevsky
f7243be79c Merge pull request #3090 from akarsakov:ocl_reduce_fix 2014-08-14 08:52:18 +00:00
Vadim Pisarevsky
5240a03217 Merge pull request #3100 from vpisarev:disabled_neon_split_merge_on_ios 2014-08-14 08:51:44 +00:00
Vadim Pisarevsky
257463719b removed optim module; moved its functionality to core and photo modules; moved drawing functions from core to imgproc. Removed FilterEngine etc. from public API 2014-08-14 12:50:07 +04:00
vbystricky
aab6f6c56f Set sync=true in ocl_minMaxIdx kernel call. For tests 2014-08-14 12:14:56 +04:00
Alexander Karsakov
75ede6e17c Minimal image size is set to 5*5 for OCL path of fastNlMeansDenoising and fastNlMeansDenoisingColored since it breaks tests with test_loop_times=30 and in general doesn't make sense for computation on GPU. 2014-08-14 12:14:33 +04:00
Alexander Karsakov
8760a344ec Fixed incorrect pointer conversion for in-place threshold 2014-08-14 11:02:55 +04:00
Vadim Pisarevsky
6f86c9f118 another mac-related fix, let's squeeze it in this PR too 2014-08-14 10:45:47 +04:00
Vadim Pisarevsky
5d8098a2c3 avoid compiler warnings 2014-08-14 10:06:10 +04:00
VBystricky
c5632d412e Change epsilon for NORM_INF_2args accuracy tests 2014-08-13 23:50:32 +04:00
Vadim Pisarevsky
a602185fb6 Merge pull request #3097 from mshabunin:gdal-support 2014-08-13 19:26:10 +00:00
Vadim Pisarevsky
5f590ebed0 Merge pull request #3094 from Adil-Ibragimov:minor_fixes_in_Mat-data 2014-08-13 18:28:51 +00:00
Vadim Pisarevsky
71ff228ad3 Merge pull request #3089 from Adil-Ibragimov:fix_cuda_constness 2014-08-13 18:09:42 +00:00
Vadim Pisarevsky
a37876ab95 fixed build of iOS framework another time; clang does not like the new NEON-optimized split/merge 2014-08-13 19:59:26 +04:00
jaco
b81dcbdf2a #pragma warning4127 fixation modified 
Now use cleaner approach:

#pragma warning( push )
#pragma warning( disable: ThatWarning )
//code with ThatWarning here
#pragma warning( pop )
 2014-08-13 17:59:16 +02:00
Vladislav Vinogradov
9786e0a760 fix cudabgsegm module compilation 2014-08-13 19:20:23 +04:00
vbystricky
1fe403f461 Enable OpenCL version of norm and convertScaleAbs or 32F data 
Fix error in minmaxloc.cl
Change test for convertScaleAbs
Fix minMaxIdx for _src2 align
Change epsilon on the tests
 2014-08-13 18:33:01 +04:00
mshabunin
3ed89a8879 Merge with master and fix conflicts 2014-08-13 18:24:11 +04:00
Adil Ibragimov
9ac06a9333 fix for gcc 2014-08-13 16:34:18 +04:00
Vadim Pisarevsky
d97f9fc477 now the tests pass with loop_times==30 2014-08-13 16:32:01 +04:00
Adil Ibragimov
8a4a1bb018 Several type of formal refactoring: 
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
 2014-08-13 15:21:35 +04:00
Vadim Pisarevsky
30111a786a Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum 2014-08-13 10:51:46 +00:00
Vadim Pisarevsky
3cd7941098 Merge pull request #3083 from akarsakov:ocl_transpose_check_locmem 2014-08-13 10:50:51 +00:00
Vadim Pisarevsky
01bd4961e3 Merge pull request #3081 from akarsakov:small_fixes 2014-08-13 10:50:33 +00:00
Alexander Karsakov
c3100eeb19 Fixed buffer initialization in reduce kernel. Enabled OCL version of reduce for SUM, MAX, MIN modes. 2014-08-13 12:03:06 +04:00
Adil Ibragimov
dfd0b297ce datastart must be non-const in CUDA. 2014-08-13 11:11:33 +04:00
Alexander Alekhin
28f3a44e33 Merge pull request #3080 from ElenaGvozdeva:ocl_stich 2014-08-12 16:52:41 +00:00
edgarriba
3c3d695d4d Perf test update 2014-08-12 18:29:43 +02:00
edgarriba
12f8d8069d removed old code 2014-08-12 16:49:19 +02:00
edgarriba
1dec1645e5 Merge branch 'master' of https://github.com/Itseez/opencv 2014-08-12 16:45:22 +02:00
edgarriba
de2861e7a9 DLS performance modifications 2014-08-12 16:20:22 +02:00
edgarriba
d1f4f6f4b8 DLS performance modifications 2014-08-12 16:15:19 +02:00
Alexander Karsakov
713ddb89bd Set minimum matrix size for AmdBlas::gemm to 20 since it works incorrect for small sizes 2014-08-12 18:02:29 +04:00
Vadim Pisarevsky
c97c0be4f2 Merge pull request #3082 from ElenaGvozdeva:ocl_morphSmall 2014-08-12 13:56:59 +00:00
Vadim Pisarevsky
5505aa28ce Merge pull request #3078 from vpisarev:refactor_features2d_take3 2014-08-12 13:56:17 +00:00
jaco
58b3bc2d7e #pragma warning4127 fixed for cvstd.inl.hpp 2014-08-12 15:28:39 +02:00
Nick D'Ademo
91676de638 Change decimation enum values so they can be used in resolution calculations. 
BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
 2014-08-12 15:18:11 +02:00
Alexander Karsakov
b4d3b34acf Disabled ippiFilterBoxBorder_* in case maskSize equal roiSize for any dimension 2014-08-12 16:38:11 +04:00
Elena Gvozdeva
1c7ee88b84 fixed test for ocl PlaneWarperTest 2014-08-12 16:37:34 +04:00
Alexander Karsakov
3deea1c3ce Added check required local memory size for non-inplace transpose kernel 2014-08-12 16:26:08 +04:00
Vadim Pisarevsky
5119564579 Merge pull request #3033 from nathanjackson:clahe_datatypes 2014-08-12 10:45:29 +00:00
Vadim Pisarevsky
1629d50999 removed some more trailing whitespaces 2014-08-12 14:33:18 +04:00
Alexander Karsakov
5898dcae4a Added ROUNDING_EPS for identical rounding after dividing on different platforms 2014-08-12 14:28:48 +04:00
Alexander Alekhin
da806cc3e7 Merge pull request #3073 from vbystricky:ocl_fixMinMaxLoc 2014-08-12 10:21:41 +00:00
Elena Gvozdeva
8124d10526 fixed Erode and Dilate in case of kernel = Mat() 2014-08-12 12:19:13 +04:00
vbystricky
6fb282aa39 Remove mul24, for CV8UC3 3840x2160 it generates implementation specific result 2014-08-12 11:25:23 +04:00
Alexander Karsakov
10b3d00fd1 Increased epsilon for passing test with IPPICV 2014-08-12 10:42:42 +04:00
Vadim Pisarevsky
bca4eb5e00 fixed more doc builder warnings 2014-08-12 10:40:23 +04:00
Alexander Karsakov
f3dfdfef8a Fixed warning with "uninitialized local variable" 2014-08-12 10:35:15 +04:00
Nathan Jackson
563200fbf6 CPU (non-OpenCL) CLAHE now supports CV_16UC1. 2014-08-11 18:25:08 -04:00
Vadim Pisarevsky
d119afafdb removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later) 2014-08-12 00:30:06 +04:00
Vadim Pisarevsky
fe7b48aa8f removed the stuff that's now in xfeatures2d; temporarily added dummy definition of SIFT to make doc builder pass (will remove it later) 2014-08-12 00:29:56 +04:00
Vadim Pisarevsky
27d2d3cbac fixed doc builder complains and the test failures 2014-08-12 00:03:40 +04:00
Vadim Pisarevsky
31df47b6ea moved nonfree and a part of features2d to opencv_contrib/xfeatures2d 2014-08-11 23:26:39 +04:00
Vadim Pisarevsky
f937f4d951 Merge pull request #3077 from kenlck:master 2014-08-11 16:41:30 +00:00
Vadim Pisarevsky
6df1198e8b Merge pull request #3071 from mshabunin:stitch-fix 2014-08-11 16:08:40 +00:00
edgarriba
dccc10ff12 DLS perf 2014-08-11 17:53:43 +02:00
edgarriba
2666da892f DLS perf update 2014-08-11 17:09:26 +02:00
Alexander Alekhin
8fd61c9aa6 Merge pull request #3075 from akarsakov:ipp_imgproc_fix 2014-08-11 15:02:53 +00:00
Alexander Alekhin
73115233bb Merge pull request #3074 from ElenaGvozdeva:ocl_lut 2014-08-11 15:01:25 +00:00
edgarriba
cc81b4a5cd SOLVEPNP_* flags whitespace 2014-08-11 16:31:28 +02:00
edgarriba
afdb67b462 SOLVEPNP_* flags 2014-08-11 16:28:09 +02:00
Vadim Pisarevsky
8202ab37d8 Merge pull request #3072 from nickdademo:pvapi_decimation_binning 2014-08-11 14:04:38 +00:00
Alexander Alekhin
b7d1a70919 Merge pull request #3063 from akarsakov:ocl_warps_check 2014-08-11 13:20:11 +00:00
Low Chin Kian
911e1bd1e4 Allow full range IPv4 support, up to 255.255.255.255 
Signed-off-by: Low Chin Kian <kenlck1990@gmail.com>
 2014-08-11 21:08:37 +08:00
Elena Gvozdeva
b73b28ab9c fix for ocl_lut 2014-08-11 16:21:55 +04:00
vbystricky
dfe5fff2f5 Restore OpenCL branch for minmaxLoc on float data 2014-08-11 15:57:29 +04:00
Alexander Karsakov
498da24b8b Disabled some IPP calls of cvtColor since it breaks OCL accuracy tests 
with test_loop_times=30
 2014-08-11 15:52:53 +04:00
Alexander Karsakov
835b5e2179 Disabled ippiConvert_32f16s_C1R since it breaks OCL accuracy tests of remap with test_loop_times=30. 2014-08-11 15:50:06 +04:00
Alexander Karsakov
6b0e63b652 Enabled IPPMorphReplicate in case BORDER_CONSTANT only for 3x3 kernels. 2014-08-11 15:37:05 +04:00
Nick D'Ademo
2b94bcffb9 Added get and set for additional PVAPI properties: DecimationHorizontal, DecimationVertical, BinningX, BinningY 2014-08-11 13:30:36 +02:00
mshabunin
c54b8f9b00 Merge remote-tracking branch 'master' into stitch-fix 
* 'master' of github.com:itseez/opencv: (82 commits)
  moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
  added some basic functionality needed by the new face module (moved from the old "contrib")
  moved to the new opencv_contrib/face module
  fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
  Fixed review comment from Vadim Pisarevsky
  modified farneback sample to use T-API
  ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
  small fix for GaussianBlur ocl test
  fix binary package build
  small fix for ocl_resize
  fix IOS framework
  fixed test ocl_MatchTemplate for sparse matrix
  Fixed typos
  fixing error, wrong template method param.
  fixing Mac build
  some formal changes (generally adding constness)
  Fixed choice of kercn and rowsPerWI for non-Intel device.
  fixed nDiffs for CalcBackProject
  fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
  Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
  ...

Conflicts:
	modules/core/include/opencv2/core/mat.inl.hpp
 2014-08-11 14:50:08 +04:00
edgarriba
90b3086f4a RANSAC test confidence 0.99 2014-08-11 12:31:10 +02:00
Vadim Pisarevsky
07744af790 Merge pull request #3066 from vpisarev:minor_fixes 2014-08-11 10:27:30 +00:00
edgarriba
6c8b11afee DLS test 2014-08-11 11:31:18 +02:00
edgarriba
d7f0b9de25 DLS test 2014-08-11 11:02:00 +02:00
Vadim Pisarevsky
0f66e2757b Merge pull request #3069 from vpisarev:refactor_video 2014-08-11 08:47:59 +00:00
edgarriba
c7f6c0cb9f Fixed warnings + RANSAC confidence to double 2014-08-11 10:17:42 +02:00
edgarriba
213241c06a DLS test update 2014-08-11 09:44:24 +02:00
Vadim Pisarevsky
8368d54d36 Merge pull request #3061 from ElenaGvozdeva:ocl_resize 2014-08-11 06:41:48 +00:00
Vadim Pisarevsky
9ef373f6a5 Merge pull request #3038 from yury-gorbachev:core_arithm_neon 2014-08-10 20:20:04 +00:00
Vadim Pisarevsky
d0137b6d2d moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib 2014-08-10 23:24:16 +04:00
Vadim Pisarevsky
4de4ff5682 Merge pull request #3067 from vpisarev:minor_fixes2 2014-08-10 10:52:57 +00:00
Vadim Pisarevsky
e2f24f43c9 added some basic functionality needed by the new face module (moved from the old "contrib") 2014-08-10 01:54:16 +04:00
Vadim Pisarevsky
05e7c29de5 fixed various warnings and obvious errors reported by clang compiler and the coverity tool. 2014-08-10 00:10:05 +04:00
edgarriba
2d26f60192 test dls 2014-08-09 21:54:22 +02:00
edgarriba
3780de9d98 test for DLS 2014-08-09 21:26:38 +02:00