mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-23 07:58:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
22,259 Commits 6 Branches 127 Tags 3 GiB
a9effeeb35
Commit Graph

360 Commits

Author SHA1 Message Date
ttagu99
3c797b0ca5 findcontour_example check image empty 2015-04-14 10:01:53 +09:00
Pavel Rojtberg
7c5084e385 - update documentation 
* correct the part about fixed aspect
    * improve formatting
    * add snippet markers to source
    * replace inline code by @snippet
  - do not run calibration twice when using a imageList
  - make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample
  - respect write extrinsic/ points flags
  - set the aspectRatio value when specified
  - fix writing of calibration settings. also update grammar.
  - fix intendation and remove some size_t -> int casts by using size_t
 2015-03-31 15:45:57 +02:00
Alexander Alekhin
50b99e5aef fix compilation on MSVS2010 2015-03-12 19:07:53 +03:00
Vadim Pisarevsky
22ad72d08e Merge pull request #3690 from theodr:moprh_lines_detection_tut 2015-03-02 11:36:15 +00:00
Vadim Pisarevsky
e9d30a9383 Merge pull request #3746 from theodr:pca_tutorial 2015-03-02 11:29:33 +00:00
theodore
79bc85fb09 Introduction to PCA tutorial 2015-02-26 15:53:03 +01:00
theodore
96c824f375 Morphology Lines Extraction Tutorial 2015-02-24 14:33:15 +01:00
Maksim Shabunin
79e8f0680c Updated ml module interfaces and documentation 2015-02-17 11:46:14 +03:00
Maksim Shabunin
da383e65e2 Remove deprecated methods from cv::Algorithm 2015-02-16 15:28:54 +03:00
tt
4ea2eceb70 Image Segmentation .cpp tutorial 
Distance Transform tutorial fixes

Distance Transform fixes v.2

Distance Transform fixes v.3

Distance Transform fixes v.4
 2015-01-27 16:44:52 +01:00
Marvin Smith
91fbe00caa Updated gdal tutorial to include comments. 2015-01-17 19:28:58 -08:00
Maksim Shabunin
b4050c775e Updated sample files documentation inclusions 2014-12-26 19:17:18 +03:00
Vadim Pisarevsky
c91b0e7ac4 Merge pull request #3217 from avdmitry:samples_cpp_data 2014-11-05 14:57:46 +00:00
Vadim Pisarevsky
d052d863eb Merge pull request #3315 from abak:seamless-refactor 2014-11-05 10:41:32 +00:00
Vadim Pisarevsky
d2b9dc5530 quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val) 2014-10-18 20:44:26 +04:00
Vadim Pisarevsky
d36b546df8 trying to fix strange compiler bug 2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
06d4aa6060 now all the samples and opencv_contrib compile! 2014-10-17 14:56:58 +04:00
Adrien BAK
82a5ff8540 fix warnings in samples 2014-10-15 11:09:33 +09:00
Dmitriy Anisimov
71348651eb fixed display_image tutorial sample 2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
ec03d6e6fc removed cpp/tutorial_code/images/ 2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
1007c06d44 initial commit 2014-09-23 07:45:51 +04:00
John Kua
fb0c0eaa7c Fixed bad non-ASCII character in how_to_scan_images.cpp which causes a compile error 2014-09-04 16:36:36 -07:00
Vadim Pisarevsky
b2cd954f24 Merge pull request #3042 from edgarriba:master 2014-08-20 13:18:37 +00:00
Vadim Pisarevsky
a223479107 Merge pull request #3099 from f-morozov:akaze_tutorial 2014-08-19 22:22:23 +00:00
f-morozov
886319c81d AKAZE fixes and tracking tutorial 2014-08-19 16:35:20 +04:00
edgarriba
7e2bb63378 Merge branch 'master' of https://github.com/Itseez/opencv 2014-08-18 22:30:00 +02: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
Vadim Pisarevsky
a602185fb6 Merge pull request #3097 from mshabunin:gdal-support 2014-08-13 19:26:10 +00:00
mshabunin
3ed89a8879 Merge with master and fix conflicts 2014-08-13 18:24:11 +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
edgarriba
301ed34142 removed old headers 2014-08-12 17:36:23 +02:00
edgarriba
7da9800694 removed old headers 2014-08-12 17:22:35 +02:00
edgarriba
4a214c08e5 removed old code 2014-08-12 17:07:38 +02:00
edgarriba
1dec1645e5 Merge branch 'master' of https://github.com/Itseez/opencv 2014-08-12 16:45:22 +02:00
Vadim Pisarevsky
31df47b6ea moved nonfree and a part of features2d to opencv_contrib/xfeatures2d 2014-08-11 23:26:39 +04:00
edgarriba
afdb67b462 SOLVEPNP_* flags 2014-08-11 16:28:09 +02:00
edgarriba
b7a19a9a5f Removed Timer 2014-08-11 11:06:05 +02:00
edgarriba
c7f6c0cb9f Fixed warnings + RANSAC confidence to double 2014-08-11 10:17:42 +02:00
Vadim Pisarevsky
d0137b6d2d moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib 2014-08-10 23:24:16 +04:00
edgarriba
bc250c2e3f bug fixed 2014-08-09 19:15:46 +02:00
edgarriba
80b4f99b1e bug fixed 2014-08-09 18:16:44 +02:00
edgarriba
d09b404178 tutorial update 2014-08-09 17:32:52 +02:00
edgarriba
7ecad71ab0 fixed warnings 2014-08-09 17:18:47 +02:00
edgarriba
8c4b8cc0b4 fixed warnings 2014-08-09 17:14:24 +02:00
edgarriba
3f5d3b2d40 video opening path modified 2014-08-08 15:36:27 +02:00
edgarriba
7d8a16ae39 remove unused tutorials 2014-08-08 14:45:43 +02:00
edgarriba
8b732e086d updated ransanc model 2014-08-08 13:52:15 +02:00
edgarriba
c07cd007eb Multi class tutorial compilation 2014-08-08 11:46:26 +02:00
edgarriba
8c08258cf2 moved headers 2014-08-07 13:06:24 +02:00
edgarriba
837f001789 update cmake 2014-08-07 11:55:17 +02:00
edgarriba
381574bdb7 Modified cmake 2014-08-07 11:33:32 +02:00
edgarriba
f1b6809eee Updated Utils functions 2014-08-06 10:05:26 +02:00
edgarriba
2881f2a096 Fixed warnings 2014-08-06 09:21:38 +02:00
edgarriba
d2665b655e Fixed warnings 2014-08-06 08:41:14 +02:00
edgarriba
e14f91dd37 Update headers 2014-08-06 08:18:11 +02:00
edgarriba
ddf5c86f3a Added code 2014-08-06 08:12:55 +02:00
edgarriba
57d2cb8962 deleted: src/CsvReader.cpp 
deleted:    src/CsvReader.h
	deleted:    src/CsvWriter.cpp
	deleted:    src/CsvWriter.h
	deleted:    src/Mesh.cpp
	deleted:    src/Mesh.h
	deleted:    src/Model.cpp
	deleted:    src/Model.h
	deleted:    src/ModelRegistration.cpp
	deleted:    src/ModelRegistration.h
	deleted:    src/PnPProblem.cpp
	deleted:    src/PnPProblem.h
	deleted:    src/RobustMatcher.cpp
	deleted:    src/RobustMatcher.h
	deleted:    src/Utils.cpp
	deleted:    src/Utils.h
	deleted:    src/main_detection.cpp
	deleted:    src/main_registration.cpp
	deleted:    src/main_verification.cpp
	deleted:    src/test_pnp.cpp
 2014-08-06 08:11:03 +02:00
edgarriba
43301096d3 Update tutorial 2014-08-05 20:06:47 +02:00
edgarriba
7b0be9cf8f Update code 2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1 Removed whitespaces 2014-08-05 17:02:06 +02:00
edgarriba
55819ae464 Tutorial code restructure 2014-08-05 15:48:54 +02:00
edgarriba
23785faf02 Update for NON BOOST libraries 2014-08-05 14:47:06 +02:00
edgarriba
16e750dd37 Update for Boost libraries 2014-08-05 14:02:23 +02:00
edgarriba
1727e0acf6 Update for Boost libraries 2014-08-05 14:00:23 +02:00
edgarriba
dfa3ccdea9 Update for Boost libraries 2014-08-05 13:43:01 +02:00
edgarriba
a3e74ec521 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
 2014-08-05 12:59:47 +02:00
Vadim Pisarevsky
432b7cb235 Merge pull request #3032 from vpisarev:refactor_ml2 2014-08-04 14:51:38 +00:00
Vadim Pisarevsky
c20ff6ce19 made everything compile and even run somehow 2014-08-03 01:41:09 +04:00
Vadim Pisarevsky
05164bf713 Merge pull request #2608 from Siddharthk:master 2014-08-01 09:13:32 +00:00
f-morozov
7f82960897 AKAZE fixes, tests and tutorial 2014-07-30 18:02:08 +04:00
edgarriba
85ccac2633 Added help() 2014-07-30 15:23:52 +02:00
edgarriba
4a86900761 Added help() 2014-07-30 13:32:27 +02:00
edgarriba
69f1ee8732 Code tutorial 2014-07-30 13:08:19 +02:00
edgarriba
6ff58f02e2 Code tutorial 2014-07-30 12:57:18 +02:00
edgarriba
94968c81e0 Code tutorial 2014-07-30 12:57:11 +02:00
edgarriba
b58979d057 Code tutorial 2014-07-30 12:57:04 +02:00
edgarriba
38c2cc8521 Code tutorial 2014-07-30 12:56:55 +02:00
edgarriba
31bec45998 Code tutorial 2014-07-30 12:56:46 +02:00
edgarriba
b33a2f24fa Code tutorial 2014-07-30 12:56:30 +02:00
edgarriba
9d18f5c458 Code tutorial 2014-07-30 12:56:22 +02:00
edgarriba
6f5876f8f7 Code tutorial 2014-07-30 12:55:35 +02:00
edgarriba
2848f43acc Code tutorial 2014-07-30 12:54:49 +02:00
edgarriba
319dbd2eb7 Code tutorial 2014-07-30 12:53:43 +02:00
edgarriba
924e062426 Code tutorial 2014-07-30 12:53:24 +02:00
edgarriba
3b24aa2441 Code tutorial 2014-07-30 12:53:14 +02:00
edgarriba
be4c1afb0b Code tutorial 2014-07-30 12:53:06 +02:00
edgarriba
550e3721ae Code tutorial 2014-07-30 12:51:59 +02:00
edgarriba
64c164c111 Code tutorial 2014-07-30 12:39:46 +02:00
edgarriba
74e52df3cd Code tutorial 2014-07-30 12:33:27 +02:00
edgarriba
7334e54a63 Code tutorial 2014-07-30 12:31:19 +02:00
siddharth
88d05a89d4 removed build error 
Whitespaces removed
 2014-07-29 00:15:11 +05:30
siddharth
14d0b763ec changed demo tutorial path 2014-07-29 00:15:11 +05:30
vbystricky
d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
Marvin Smith
67e23ed972 Fixing double to uchar conversion warning. 2014-07-11 07:33:42 -07:00
vbystricky
4286f60387 Extract imgcodecs module from highgui 2014-07-07 16:28:08 +04:00
Marvin Smith
561703ca27 Fixed the compiler warnings for the demo program. 2014-07-01 17:04:28 -07:00
Marvin Smith
14548227ca Adding support for GDAL raster images. 2014-07-01 16:29:11 -07:00
侯骥
055adc2302 Update MatchTemplate_Demo.cpp 2014-06-11 10:29:30 +02:00
Elena Gvozdeva
f9c5289483 fixed 2014-04-07 18:53:07 +04:00
Elena Gvozdeva
037ac27ec8 Added SharedMatrix 2014-04-03 14:53:27 +04:00
Elena Gvozdeva
fa2d79a15b Added IPP Async converters, doc and sample 2014-04-01 16:47:29 +04:00
Roman Donchenko
cc05493730 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectAndroidSDK.cmake
	cmake/OpenCVGenAndroidMK.cmake
	cmake/OpenCVModule.cmake
	cmake/templates/OpenCV.mk.in
	cmake/templates/OpenCVConfig.cmake.in
	doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
	modules/cudabgsegm/src/cuda/mog.cu
	modules/imgproc/perf/opencl/perf_filters.cpp
	modules/imgproc/src/opencl/filterSep_singlePass.cl
	modules/nonfree/CMakeLists.txt
	modules/nonfree/perf/perf_precomp.hpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/opencl/bgfg_mog.cl
	modules/superres/CMakeLists.txt
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/cuda/btv_l1_gpu.cu
	modules/superres/src/frame_source.cpp
	modules/superres/src/input_array_utility.cpp
	modules/superres/src/optical_flow.cpp
	modules/superres/src/precomp.hpp
	samples/gpu/CMakeLists.txt
	samples/gpu/brox_optical_flow.cpp
	samples/gpu/super_resolution.cpp
 2014-03-24 19:02:16 +04:00
Roman Donchenko
a489d86e5f Merge pull request #2460 from berak:b_3598_24 2014-03-17 15:52:56 +04:00
berak
5f94a205d1 fixed h / s ranges in histogram_calculation tutorial 
literalinclude

literalinclude, dropped :lines:
 2014-03-17 11:01:02 +01:00
Ilya Lavrenov
5d206059a8 moved bioinspired to opencv_contrib 2014-01-21 18:02:53 +04:00
Anatoly Baksheev
130914d9f4 fixed documentation warnings 2014-01-21 02:15:37 +04:00
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
 2014-01-14 11:53:59 +04:00
Ilya Lavrenov
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +04:00
Roman Donchenko
3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
 2013-12-23 18:50:17 +04:00
Roman Donchenko
e49b8dee40 Merge pull request #1881 from pentschev:defaultNorm_master 2013-12-17 13:53:59 +04:00
StevenPuttemans
12c25b9310 Fixed suggestion of bugfix 3431 
Seems correct to me and builds fine
 2013-12-16 11:05:53 +01:00
Peter Andreas Entschev
6f3163f62d DescriptorExtractor: added defaultNorm() to return default norm type. 
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.

This was reported in feature report #2182 (http://code.opencv.org/issues/2182). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
 2013-12-09 09:54:42 -02:00
Roman Donchenko
d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
 2013-12-03 17:35:21 +04:00
Roman Donchenko
790f53f12a Merge pull request #1887 from jet47:android-cuda-6.0 2013-12-02 18:53:26 +04:00
Roman Donchenko
f7f194e5dd Merge pull request #1797 from moodoki:bugfix_3344 2013-12-02 17:53:34 +04:00
Vladislav Vinogradov
fc1d38ced8 fixed compilation of gpu-basics-similarity tutorial: 
initialize TIMES variable with some default value (10)
 2013-11-29 14:53:33 +04:00
Adrien BAK
38904c9a11 fix exception being thrown when no arguments are passed 2013-11-28 12:09:17 +09:00
Adrien BAK
094d7c4926 build fix 2013-11-28 11:42:44 +09:00
Roman Donchenko
9c2272d520 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	.gitignore
	CMakeLists.txt
	doc/CMakeLists.txt
	modules/calib3d/src/stereosgbm.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/highgui/src/cap_openni.cpp
	modules/ml/include/opencv2/ml/ml.hpp
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/optical_flow_farneback.cpp
	platforms/scripts/camera_build.conf
	platforms/scripts/cmake_android_all_cameras.py
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
 2013-11-26 15:05:26 +04:00
Adrien BAK
dda3b534ad fix indent 2013-11-26 16:09:59 +09:00
Adrien BAK
1c025be068 fix typos 2013-11-26 16:09:42 +09:00
Adrien BAK
514f1fae95 improved error handling 2013-11-26 16:09:29 +09:00
Adrien BAK
8a2de2ecca modified HoughCircleDemo to introduce variable params via trackbars 
Conflicts:
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
 2013-11-26 16:09:04 +09:00
StevenPuttemans
2427c03625 Wrong example at the visual studio tutorial. Fixed link, fixed sample 
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
 2013-11-22 10:41:17 +01:00
Roman Donchenko
aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
 2013-11-19 16:21:09 +04:00
StevenPuttemans
2b106db02f Applied all fixes related to translating C to C++ code 
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
 2013-11-17 20:34:50 +01:00
moodoki
b8de81749c Slight modification to example code for FLANN matcher with comment on #3344 2013-11-14 00:22:20 +08:00
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
 2013-10-15 20:08:52 +04:00
ilya-lavrenov
7a53910495 fixed warning on windows 2013-10-09 17:49:10 +04:00
Roman Donchenko
1ac1b9ae35 Merge pull request #1474 from f-morozov:for_pr 2013-10-02 11:49:54 +04:00
Roman Donchenko
4ec5c04504 Merge pull request #1315 from dbloisi:add_bs_tutorial 2013-10-01 15:29:38 +04:00
Fedor Morozov
c9ace38897 Docs updated, added InputArray, fixes for makePtr,... 2013-09-26 19:02:35 +04:00
Alexander Smorkalov
c6ab8cb6ee Merge pull request #1471 from ozantonkal:master 2013-09-25 17:19:39 +04:00
Fedor Morozov
f99be6bda6 Mergin itseez 2013-09-18 18:55:12 +04:00
Ozan Tonkal
8de46e1f81 removed trailing spaces 2013-09-18 12:50:55 +01:00
Ozan Tonkal
3165b526f2 merge with Itseez/opencv 2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff rename widgets from *Widgets to W* 2013-09-15 16:26:53 +02:00
Ozan Tonkal
56f9168ac1 support VTK 6.0.0: cmakelist.txt might need to be refactored 2013-09-08 19:07:15 +02:00
Ozan Tonkal
2969ec0274 transformations tutorial rst 2013-09-08 19:03:54 +02:00
Ozan Tonkal
5307339f85 tutorial code for makeTransformToGlobal, makeCameraPose, minor fixes in widget_pose tutorial 2013-09-08 19:03:54 +02:00
Ozan Tonkal
7116e22b52 some of the tutorials 2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172 delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial 2013-09-08 19:03:54 +02:00
Vladislav Vinogradov
0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
 2013-09-06 15:44:44 +04:00
Ozan Tonkal
f99e874704 tutorial: creating_widgets code 2013-09-05 21:03:40 +02:00
Ozan Tonkal
b60894c1dd launching viz tutorial 2013-09-05 21:03:40 +02:00
Roman Donchenko
62353b7980 Boring changes - samples. 2013-09-05 19:02:59 +04:00
Vladislav Vinogradov
fd88654b45 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
219b662127 renamed gpufilters -> cudafilters 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +04:00