Vadim Pisarevsky
3f37e034a0
another fix in opencv_world
2014-10-17 16:09:09 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
01d3848f17
all the tests now pass except for MSER
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
Vadim Pisarevsky
09df1a286b
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
2014-10-17 14:56:58 +04:00
Pavel Vlasov
45958eaabc
Implementation detector and selector for IPP and OpenCL;
...
IPP can be switched on and off on runtime;
Optional implementation collector was added (switched off by default in CMake). Gathers data of implementation used in functions and report this info through performance TS;
TS modifications for implementations control;
2014-10-15 14:24:41 +04:00
abidrahmank
797143d515
extending stitching module for Java and Python bindings
2014-09-27 19:35:49 +04:00
Dmitry Gribanov
8a1d3929cc
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-15 17:04:08 +04:00
Dmitry Gribanov
ee0da48bd2
Feature based stitching's wave correction bugfix.
...
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
2014-09-12 18:07:54 +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
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
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
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
Alexander Alekhin
28f3a44e33
Merge pull request #3080 from ElenaGvozdeva:ocl_stich
2014-08-12 16:52:41 +00:00
Elena Gvozdeva
1c7ee88b84
fixed test for ocl PlaneWarperTest
2014-08-12 16:37:34 +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
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Vadim Pisarevsky
e98c9a7ce3
Merge pull request #2968 from LeonidBeynenson:bugfix_crash_gpu_feature_matcher_in_stitcher
2014-07-29 13:48:19 +00:00
Vadim Pisarevsky
277802483f
Merge pull request #2987 from anishp:master
2014-07-28 21:15:39 +00:00
Vadim Pisarevsky
ee90b88dd7
Merge pull request #2720 from pglotov:master
2014-07-25 12:54:22 +00:00
Anish Pednekar
d2493393db
added macro guard to enable overriding ENABLE_LOG
2014-07-20 21:06:37 +05:30
Petr Glotov
7a77cf584a
added timelapse
2014-07-15 09:32:47 -07:00
LeonidBeynenson
8578f9c565
Added a TODO comment about changes which should be done in GpuMatcher::match
2014-07-15 13:27:59 +04:00
Vadim Pisarevsky
b1793e2fb9
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
2014-07-15 08:09:04 +00:00
Leonid Beynenson
cce2d9927e
Fixed bug which caused crash of GPU version of feature matcher in stitcher
...
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
2014-07-11 16:37:30 +04:00
Leonid Beynenson
79878a57a9
Fixed bug in cv::detail::waveCorrect
...
The function makes wave correction of a stitched panorama.
Earlier it gave wrong results for panorama made from 1 frame.
2014-07-11 15:47:41 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Adi Shavit
7674f3ddbf
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2014-07-03 22:14:58 +03:00
Ilya Lavrenov
f3440888ef
optimized stitching warpers
2014-05-15 16:28:34 +04:00
Alexander Alekhin
71f871fafd
replaced sanity check condition for stitching perf test
2014-04-30 18:02:06 +04:00
Andrey Pavlenko
925178749a
removing SuppressWarning
and CV_OPENCL_RUN
2014-04-11 13:09:19 +04:00
Alexander Alekhin
588658d1a3
tapi: stitching: fix documentation
2014-04-11 13:09:17 +04:00
Alexander Alekhin
026b13b3db
TAPI: stitching: blender: fix OpenCL path & adjust test condition
2014-04-11 13:09:16 +04:00
Alexander Alekhin
e6cc1be7e8
stitching: allow to use dynamic DescriptorMatcher
2014-04-11 13:01:13 +04:00
Alexander Alekhin
06738468af
TAPI: stiching: add custom OpenCL kernels for MultiBandBlender
2014-04-11 13:01:12 +04:00
Alexander Alekhin
c22d92c1cb
stitching: extend logging
2014-04-11 13:01:11 +04:00
Alexander Alekhin
a7f69a37e3
stitching: use BORDER_CONSTANT in warp
2014-04-11 13:01:10 +04:00
Alexander Alekhin
c4a31a1ab1
TAPI: stitching: optimize compare operation
2014-04-11 13:01:10 +04:00
Alexander Alekhin
7a5c1babde
TAPI: stitching: optimize exposure
2014-04-11 13:01:09 +04:00
Alexander Alekhin
2737e3c99b
TAPI: stitching: workaround for problem getUMat() call
2014-04-11 13:01:08 +04:00
Alexander Alekhin
c1ea6f3c42
TAPI: stitching: improve warpers
2014-04-11 13:01:07 +04:00
Alexander Alekhin
1d9808e5d5
TAPI: stitching, replaced Mat->UMat/_Array
2014-04-11 13:01:06 +04:00
Alexander Alekhin
8b6c5ade0e
TAPI: added perf test for stitching
2014-04-11 13:01:05 +04:00
Ilya Lavrenov
4a63b3dd90
cv2cvtest part2
2014-04-09 13:08:51 +04:00
Alexander Alekhin
ddd3c062b5
TAPI: fix perf test for warpers
2014-02-20 13:09:06 +04:00
Alexander Alekhin
bf4f15fb5f
TAPI: fix OpenCL warpers and test
2014-02-19 15:30:43 +04:00
Roman Donchenko
72aabb8a84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVGenAndroidMK.cmake
cmake/templates/OpenCV.mk.in
doc/tutorials/viz/creating_widgets/creating_widgets.rst
doc/tutorials/viz/launching_viz/launching_viz.rst
doc/tutorials/viz/table_of_content_viz/images/image_effects.png
doc/tutorials/viz/transformations/transformations.rst
doc/tutorials/viz/widget_pose/widget_pose.rst
modules/core/include/opencv2/core/affine.hpp
modules/core/include/opencv2/core/core.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/cuda/canny.cu
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_color.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_gpumat.cpp
modules/gpu/test/test_hough.cpp
modules/nonfree/CMakeLists.txt
modules/nonfree/include/opencv2/nonfree/gpu.hpp
modules/nonfree/perf/perf_gpu.cpp
modules/nonfree/src/cuda/surf.cu
modules/nonfree/src/precomp.hpp
modules/nonfree/src/surf_gpu.cpp
modules/nonfree/test/test_gpu.cpp
modules/ocl/perf/perf_haar.cpp
modules/stitching/CMakeLists.txt
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
modules/stitching/include/opencv2/stitching/warpers.hpp
modules/stitching/src/blenders.cpp
modules/stitching/src/matchers.cpp
modules/stitching/src/precomp.hpp
modules/stitching/src/seam_finders.cpp
modules/stitching/src/stitcher.cpp
modules/stitching/src/warpers.cpp
modules/viz/doc/widget.rst
modules/viz/include/opencv2/viz/types.hpp
modules/viz/include/opencv2/viz/viz3d.hpp
modules/viz/include/opencv2/viz/widget_accessor.hpp
modules/viz/src/precomp.hpp
modules/viz/src/shapes.cpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkCloudMatSource.h
modules/viz/test/test_precomp.hpp
modules/viz/test/tests_simple.cpp
samples/android/tutorial-4-cuda/CMakeLists.txt
samples/android/tutorial-4-cuda/jni/Android.mk
samples/android/tutorial-4-cuda/src/org/opencv/samples/tutorial4/Tutorial4Activity.java
samples/cpp/stitching_detailed.cpp
samples/cpp/tutorial_code/viz/creating_widgets.cpp
samples/cpp/tutorial_code/viz/launching_viz.cpp
samples/cpp/tutorial_code/viz/transformations.cpp
samples/cpp/tutorial_code/viz/widget_pose.cpp
2014-02-11 12:05:01 +04:00
Vladislav Vinogradov
a138e5a6a5
turn on CUDA part of stitching module on Android for non-dynamic build
2014-02-03 12:35:24 +04:00
Ilya Lavrenov
7184925105
fix
2014-01-25 11:50:28 +04:00
Andrey Pavlenko
665d9cb29c
Merge pull request #2168 from ilya-lavrenov:tapi_perf_stitching
2014-01-22 10:14:38 +04:00
Ilya Lavrenov
3db33979e1
added perf tests for stitching warpers
2014-01-19 12:01:01 +04:00
Ilya Lavrenov
37789f015a
deleted excess semicolons, commas
2014-01-18 01:31:33 +04:00
Ilya Lavrenov
7852b2f155
updated docs according to the last changes
2014-01-10 18:19:26 +04:00
Ilya Lavrenov
8f9ccc099b
replaced Mat by Input/Output arrays
2014-01-10 18:16:56 +04:00
Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
Alexander Smorkalov
c48777a1c3
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
2013-12-27 11:18:10 +04:00
Alexander Smorkalov
bc72f4d2a2
Code review fixes.
2013-12-23 11:34:46 +04:00
Alexander Smorkalov
069f3d8d9a
Build fixes for GPU module.
2013-12-19 19:12:18 +04:00
Roman Donchenko
cc7a13ea57
Named GraphCutSeamFinderBase to allow its usage in makePtr.
...
Sequel to bcb6f038
.
2013-10-08 18:13:56 +04: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
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
259ceb7eaa
renamed gpufeatures2d -> cudafeatures2d
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
219b662127
renamed gpufilters -> cudafilters
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
2c4bbb313c
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
2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Miroslav Kobetski
b595d73d6d
defined uint for non-windows platforms too. replaced isnan for cvIsNaN.
2013-08-14 17:16:52 +02:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Roman Donchenko
d9f71b762f
Deleted almost all of the precomp.cpp files.
...
Looks like we don't actually use them; when creating precompiled headers
with Visual C++, a dummy .cpp is created at build time.
2013-08-08 12:43:07 +04:00
StevenPuttemans
ed76b2f98f
Like mentioned by Andrei Pavlenko after merging pullrequest #1206 , a wrong
...
ReST directive was used. Also fixed some other ReST directives that were
not correct and removed some warnings during buildbot checks.
2013-08-07 14:49:33 +02:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Andrey Pavlenko
6a40067424
Merge pull request #1206 from StevenPuttemans:feature_3169
2013-07-31 14:31:21 +04:00
StevenPuttemans
0c5244103f
Added all *.cpp samples reference to the 2.4.6 documentation as discussed in feature #3169
...
- Used lunix style slashes - works on most systems
- Removed all trailing whitespaces
2013-07-31 11:20:05 +02:00
Roman Donchenko
ac39bfb4cc
Remove HAVE_CVCONFIG_H - it's always defined.
2013-07-10 16:02:07 +04:00
Alexey Spizhevoy
dcb049df6a
fixed docs
2013-07-05 10:16:22 +04:00
Alexey Spizhevoy
2a48f7c035
fixed include for Windows
2013-07-05 09:44:32 +04:00
Alexey Spizhevoy
406f342dc3
updated docs
2013-07-04 17:41:39 +04:00
Alexey Spizhevoy
027065a5a1
removed trailing whitespaces causing warnings
2013-07-04 17:31:12 +04:00
Alexey Spizhevoy
cc85e86ee7
fixed Windows build
2013-07-04 17:22:36 +04:00
Alexey Spizhevoy
438a599288
added 'cmath' include
2013-07-04 16:57:20 +04:00
Alexey Spizhevoy
37ea872204
added handling of camera parameters estimation errors ( #3122 )
2013-07-03 15:20:14 +04:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
Ivan Korolev
58fa401b4d
Fixed a bug #2405
2013-06-14 10:43:20 +04:00
Roman Donchenko
41482fe56c
Erase MatchPairsBody's copy constructor.
...
It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).
2013-06-10 13:30:23 +04:00
Vladislav Vinogradov
4c9773d55f
renamed gpu headers (made it more consistent)
2013-06-10 12:40:30 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
29b13ec1de
Replaced most of the usages of parallel_for with that of parallel_for_.
...
This should allow many algorithms to take advantage of more parallelization
technologies.
2013-05-31 12:22:04 +04:00
Andrey Kamaev
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d
, reversing
changes made to 02131ffb62
.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
fdeec6896c
stitching module fixes
2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
84de6ce036
gpufilters module for image filtering
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6
gpuarithm module for arithmetics operations on matrices
2013-04-18 11:33:30 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
977562b614
Merge pull request #771 from gpsinghsandhu:surfFeatureFinder
2013-04-05 12:59:22 +04:00
Gurpinder Singh Sandhu
69127e4105
some typo
2013-04-04 22:54:27 +05:30
Gurpinder Singh Sandhu
2b1e13f8f4
changed surfFeaturesFinder::find() to allow CV_8UC1 type images
...
http://code.opencv.org/issues/2926
2013-04-04 22:52:07 +05:30
Andrey Kamaev
795a513ac4
Merge pull request #716 from asmorkalov:winrt
2013-04-03 15:39:58 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
2ad7b97f1c
All modules (except ocl and gpu) compiles and pass tests
2013-03-22 22:14:26 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Alexander Smorkalov
7ec2b6bad0
Highgui tests for GUI disabled for WinRT;
...
Warnings fix;
2013-03-21 16:18:19 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
55698548dd
Avoid assert in lapac.cpp if findHomography fails in BestOf2NearestMatcher::match
2013-03-12 22:49:40 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Andrey Kamaev
2fe7482b73
Add support for enums into rst ocv domain
2013-02-19 16:22:20 +04:00
Andrey Kamaev
61079547f0
Merge branch '2.4'
2013-02-01 14:59:40 +04:00
Anna Kogan
ed4c687d45
Increased time limits, eliminated extra params
2013-01-31 16:18:52 +04:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Anatoly Baksheev
94c310fc14
added Ptr::operator==
2012-12-15 22:48:50 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Andrey Kamaev
5a407153bd
Fix sanity checks in stitching test
2012-12-12 20:29:23 +04:00
Andrey Kamaev
6e244c83cd
Corrected sanity checks in several perf tests
...
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
2012-12-12 01:00:47 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
Andrey Kamaev
afc79e2a02
Fix warnings from MSVC 9 64-bit
2012-10-23 18:20:07 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
marina.kolpakova
e5437e5486
Fix binary compatibility of opencv_gpu
2012-10-17 02:09:40 +04:00
Andrey Kamaev
971d02cde6
Fix binary compatibility of opencv_stitching
2012-10-17 02:09:26 +04:00
Andrey Kamaev
4a53199e7a
Quiet logs in stitching module
2012-10-09 19:28:15 +04:00
Andrey Kamaev
7cc67701a6
Add sanity checks to stitching perf tests
2012-10-09 19:17:58 +04:00
Alexey Spizhevoy
cb705aad1a
updated DP seaming to support 4 channel images
2012-10-08 14:29:10 +04:00
Vadim Pisarevsky
06a13d9ba0
replaced jpegs with png's. Accuracy tests pass; performance tests were not tried yet
2012-10-02 23:07:46 +04:00
Alexey Spizhevoy
eafb024112
fixed one of the log messages in the stitching module
2012-09-28 14:37:38 +04:00
Alexey Spizhevoy
317a27e9eb
fixed the bug #2385
2012-09-25 16:08:43 +04:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Vsevolod Glumov
5648e49d59
Merge remote-tracking branch 'origin/master'
2012-08-23 14:58:41 +04:00
Vsevolod Glumov
fc307c87dc
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
2012-08-23 14:56:02 +04:00
Andrey Kamaev
1a621c2916
Fix build warnings
2012-08-19 19:36:43 +04:00
Daniil Osokin
f4d4b0d742
disabled perf test on distance transform
2012-08-14 12:13:42 +04:00
Alexey Spizhevoy
27eb5d07cf
Added getScale/setScale for image warpers (stitching module)
2012-08-13 14:39:47 +04:00
Daniil Osokin
45c49a9088
Added perf test
2012-08-10 17:37:48 +04:00
Daniil Osokin
e37b9469da
Added perf tests
2012-08-10 17:17:09 +04:00
marina.kolpakova
634c9dae46
added performance test fot CCL
2012-08-09 12:42:27 +04:00
Andrey Kamaev
0ceb9b6a00
Fixed division by zero case in SphericalProjector::mapForward
2012-08-08 20:57:12 +04:00
Alexey Spizhevoy
8c3984c5ff
Refactored the DP based seam finder
2012-08-07 23:55:06 +04:00
alexey.spizhevoy
43d46c0e8b
Minor fix in the DP based seam estimator
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
7222f2724f
Fixed bug
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
85d1c463b9
Minor changes
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
897c2bbd14
Added support of 8UC3
2012-08-07 16:24:21 +04:00
alexey.spizhevoy
a39bce204d
implemented DP-based seam estimation method
2012-08-07 16:24:21 +04:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +00:00
Andrey Kamaev
2b6b6f12e2
Debug message is turned off
2012-06-29 08:47:38 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
47a4e87784
Ignored warnings from gtest with precompiled headers enabled
2012-06-08 14:54:17 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Anatoly Baksheev
0395f7c63f
fixed relative path for stitching/details headers
2012-06-07 13:42:59 +00:00
Andrey Kamaev
cf25f572a6
Documentation: improved correctness checking for superclasses
2012-05-29 14:51:59 +00:00
Andrey Kamaev
dad75658f2
Documentation: added support for multiple superclasses
2012-05-29 14:18:43 +00:00
Andrey Kamaev
6ca618277c
More fixes for documentation.
2012-05-28 20:11:38 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Andrey Kamaev
eb2f1f81ed
Fixed hundreds of documentation problems
2012-05-28 07:36:14 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
44eaeee865
refactored gpu BruteForceMather (made it similar to BFMatcher)
2012-04-24 07:56:33 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
5c615ec28f
added optional dependency stitching->nonfree. When nonfree is available, make sure linker does not throw it away.
2012-03-31 17:25:19 +00:00
Andrey Kamaev
ec793df30f
#1205 fixed more bugs/typos in parameters
2012-03-29 08:07:57 +00:00
Alexander Mordvintsev
6848c6d69a
reverted revision 7676 ( #1725 )
2012-03-28 09:44:54 +00:00
Alexander Mordvintsev
13045dec1d
working on python wrappers for stitching
2012-03-28 05:00:41 +00:00
Alexey Spizhevoy
e87a07e2aa
Fixed bug #1693 . Also corrected default parameters for stitching.
2012-03-19 11:51:18 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Ivan Korolev
6e2507c197
Added some new warpers.
2012-03-14 12:59:23 +00:00
Andrey Kamaev
3df41c1d62
Tegra version of cv::detail::
2012-03-12 11:24:27 +00:00
Andrey Kamaev
4ebb66362c
Tegra version of cv::detail::createLaplacePyr
2012-03-11 14:53:13 +00:00
Alexander Shishkov
466345e936
fixed stitching compilation
2012-03-08 08:10:04 +00:00
Andrey Kamaev
49207ce1a0
Minor fix in blender mask conversion.
2012-03-07 20:33:35 +00:00
Andrey Kamaev
679f1dad99
Stitching: added CV_16S weights support to the multiband blender
2012-03-07 14:23:55 +00:00
Leonid Beynenson
9794f5977c
Changed the class OrbFeaturesFinder to make it work with CV_8UC4 and CV_8UC1 images.
2012-02-27 17:46:53 +00:00
Leonid Beynenson
4a299acd48
Added PlanePortraitWarper class.
2012-02-24 13:48:41 +00:00
Leonid Beynenson
b8eeb019db
Added spherical and cylindrical warpers, which work in the portrait mode -- when poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points.
2012-02-22 15:44:39 +00:00
Vladislav Vinogradov
2d30480982
created wrappers for new NPP functions
...
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
2012-02-22 10:00:53 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Alexey Spizhevoy
d8fa374167
Fixed the multi-band blending test
2012-02-01 10:00:38 +00:00
Alexey Spizhevoy
c09eae4969
Updated the multi-band blending test
2012-01-31 14:36:55 +00:00
Alexey Spizhevoy
7ddb706b29
Added a test for the multi-band blender
2012-01-30 10:31:10 +00:00
Alexey Spizhevoy
ed038ef9dc
Updated the stitching module docs
2012-01-30 07:06:35 +00:00
Alexey Spizhevoy
f5ed96f40c
Updated the stitching module docs
2012-01-30 06:53:50 +00:00
Alexey Spizhevoy
70d137269a
Updated the stitching pipeline image
2012-01-28 15:49:35 +00:00
Alexey Spizhevoy
aba37e54b3
Updated the stitching module docs
2012-01-27 07:40:23 +00:00
Alexey Spizhevoy
9187739d18
Updated the stitching module docs
2012-01-26 13:28:04 +00:00
Alexey Spizhevoy
f0b9c90f79
Updated the stitching module docs
2012-01-26 12:44:32 +00:00
Alexey Spizhevoy
bee271a15c
Updated the stitching module docs
2012-01-26 12:02:45 +00:00
Alexey Spizhevoy
a7e7226a02
Updated the stitching module docs
2012-01-26 11:47:33 +00:00
Andrey Kamaev
ea5d01558c
Updating opencv module definition in cmake (continued)
2012-01-25 13:41:12 +00:00
Andrey Kamaev
9d5c24cdc8
Updating opencv module definition in cmake (continued)
2012-01-25 09:04:49 +00:00
Vladislav Vinogradov
79cc05d062
minor fix
2012-01-25 07:31:56 +00:00
Leonid Beynenson
2395654cbf
Made changes in the stitching log macros: now the function stitchingLogLevel() may be used to make the stitching classes more/less verbose.
2012-01-24 11:56:32 +00:00
Alexey Spizhevoy
a9d19b1394
Updated the stitching module docs
2012-01-20 09:07:52 +00:00
Alexey Spizhevoy
0733689583
Updated the stitching module docs
2012-01-20 09:06:53 +00:00
Alexey Spizhevoy
aaace6332f
Updated the stitching module docs
2012-01-19 12:56:03 +00:00
Alexey Spizhevoy
8e8beb070e
Updated the stitching modudle docs
2012-01-19 12:08:09 +00:00
Alexey Spizhevoy
9fa6edf281
Updated the stitching module docs
2012-01-19 09:48:33 +00:00
Alexey Spizhevoy
69b670bdaa
Updated the stitching module docs
2012-01-19 09:43:13 +00:00
Alexey Spizhevoy
2bdd395357
Added the first version of the stitching module docs
2012-01-18 13:43:34 +00:00
Andrey Kamaev
65f5343ed5
Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests
2011-12-29 16:46:16 +00:00
Leonid Beynenson
6d8f4c6b82
Added small debug insertion.
2011-12-26 12:34:28 +00:00
Alexey Spizhevoy
b4f17ab79e
Updated motions estimators in the stitching module to be able to set camera intrinsics manually
2011-12-22 09:59:03 +00:00
Leonid Beynenson
54adb3c9cf
Removed unrequired dependency to the header "cvconfig.h".
2011-12-19 18:31:20 +00:00
Andrey Kamaev
0744092b21
Fixed build with gcc compiler; couple minor improvements in perf testing framework
2011-12-16 04:42:34 +00:00
Leonid Beynenson
0b907d088d
Made changes in BundleAdjusterBase class to pass a termination criteria to the Levenberg–Marquardt algorithm.
2011-12-01 13:35:07 +00:00
Leonid Beynenson
782ccc1844
Made changes in the stitching module to make correct logging on Android.
2011-11-28 20:44:41 +00:00
Vladislav Vinogradov
09ba133ddf
prepared GpuMat for moving to core module
2011-10-31 08:51:00 +00:00
Andrey Kamaev
b720eddd9e
Tegra-optimized features matching for Stitching
2011-10-27 14:06:06 +00:00
Alexey Spizhevoy
0b192cb4ea
Fixed warning in the ORB features finder
2011-10-27 09:00:28 +00:00
Andrey Kamaev
f1cb2431b8
Fixed small bugs in Stitcher class
2011-10-25 12:42:08 +00:00
Alexey Spizhevoy
28e006ad4f
Fixed median focal length estimation in the stitching module
2011-10-24 12:35:11 +00:00
Alexey Spizhevoy
b74e9c101a
Fixed bug in the stitching module (some images appeared at result pano center)
2011-10-24 11:52:36 +00:00
Andrey Kamaev
5656a9dd6b
Better default grid size for ORB-based stitching
2011-10-21 15:38:38 +00:00
Alexey Spizhevoy
b8304ce764
Updated stitcher a little bit
2011-10-21 10:47:48 +00:00
Andrey Kamaev
94f72ae876
Stitching: added grid option to OrbFeaturesFinder
2011-10-21 08:40:10 +00:00
Andrey Kamaev
f299bde3a9
Added ORB features finder into stitching module
2011-10-19 10:48:45 +00:00
Vladislav Vinogradov
d3c4e90760
new optimized implementation of BruteForceMatcher_GPU (~2-3x faster)
2011-10-12 10:23:03 +00:00
Alexey Spizhevoy
9047ef2cdf
Renamed warp of point method into warpPoint
2011-10-07 08:51:01 +00:00
Alexey Spizhevoy
a7fbcad283
Added warp method into the RotationWarper interface, added find() into VoronoiSeamFinder which uses only source image sizes
2011-10-07 08:17:55 +00:00
Alexey Spizhevoy
74561c5b8e
Added createWightMaps function into FeatherBlender (stitching)
2011-10-03 09:44:30 +00:00
Andrey Kamaev
ee413b8026
Avoid duplicated surf extraction step when same parameters are used for detection and descriptors calculation
2011-10-03 08:44:28 +00:00
Alexey Spizhevoy
dce50b67fc
Fixed support of translation in the GPU-based plane warper
2011-10-03 07:42:16 +00:00